[josm] 01/08: Imported Upstream version 0.0.svn11427+dfsg
Bas Couwenberg
sebastic at debian.org
Sat Jan 7 23:34:12 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 8354f25e1b7cd475a248f6501a88676f13b2eebe
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Jan 7 23:18:43 2017 +0100
Imported Upstream version 0.0.svn11427+dfsg
---
.classpath | 4 +-
README | 7 +-
REVISION | 8 +-
build.xml | 19 +-
data/boundaries.osm | 43887 +++++++++++++++++++
data/defaultpresets.xml | 58 +-
data/left-right-hand-traffic.osm | 1090 -
data/validator/combinations.mapcss | 117 +-
data/validator/deprecated.mapcss | 83 +-
data/validator/geometry.mapcss | 9 +
data/validator/highway.mapcss | 36 +-
data/validator/ignoretags.cfg | 1 +
data/validator/numeric.mapcss | 20 +
data/validator/religion.mapcss | 2 +-
data/validator/speed_limits.json | 234 -
data/validator/territories.mapcss | 7 +
data_nodist/trans/ast.lang | Bin 8864 -> 8864 bytes
data_nodist/trans/be.lang | Bin 18102 -> 18451 bytes
data_nodist/trans/bg.lang | Bin 2427 -> 2427 bytes
data_nodist/trans/ca-valencia.lang | Bin 7807 -> 7807 bytes
data_nodist/trans/ca.lang | Bin 10526 -> 10526 bytes
data_nodist/trans/cs.lang | Bin 11233 -> 11260 bytes
data_nodist/trans/da.lang | Bin 10543 -> 10550 bytes
data_nodist/trans/de.lang | Bin 11857 -> 11879 bytes
data_nodist/trans/el.lang | Bin 1429 -> 1429 bytes
data_nodist/trans/en.lang | Bin 9671 -> 9694 bytes
data_nodist/trans/en_AU.lang | Bin 1514 -> 1514 bytes
data_nodist/trans/en_GB.lang | Bin 2146 -> 2106 bytes
data_nodist/trans/es.lang | Bin 12604 -> 12549 bytes
data_nodist/trans/et.lang | Bin 1406 -> 1406 bytes
data_nodist/trans/fi.lang | Bin 3027 -> 3027 bytes
data_nodist/trans/fr.lang | Bin 11444 -> 11393 bytes
data_nodist/trans/gl.lang | Bin 2977 -> 2977 bytes
data_nodist/trans/hu.lang | Bin 12634 -> 12588 bytes
data_nodist/trans/id.lang | Bin 6717 -> 6717 bytes
data_nodist/trans/it.lang | Bin 10471 -> 10416 bytes
data_nodist/trans/ja.lang | Bin 11732 -> 11732 bytes
data_nodist/trans/km.lang | Bin 16887 -> 16887 bytes
data_nodist/trans/lt.lang | Bin 2028 -> 2035 bytes
data_nodist/trans/nb.lang | Bin 1705 -> 1705 bytes
data_nodist/trans/nl.lang | Bin 12376 -> 12338 bytes
data_nodist/trans/pl.lang | Bin 2861 -> 2861 bytes
data_nodist/trans/pt.lang | Bin 13637 -> 13586 bytes
data_nodist/trans/pt_BR.lang | Bin 10176 -> 10176 bytes
data_nodist/trans/ru.lang | Bin 18464 -> 18495 bytes
data_nodist/trans/sk.lang | Bin 10510 -> 10522 bytes
data_nodist/trans/sv.lang | Bin 1328 -> 1328 bytes
data_nodist/trans/uk.lang | Bin 18832 -> 18831 bytes
data_nodist/trans/vi.lang | Bin 10753 -> 10753 bytes
data_nodist/trans/zh_CN.lang | Bin 7616 -> 7586 bytes
data_nodist/trans/zh_TW.lang | Bin 4666 -> 4822 bytes
i18n/build.xml | 2 +-
i18n/po/af.po | 963 +-
i18n/po/am.po | 963 +-
i18n/po/ar.po | 971 +-
i18n/po/ast.po | 1054 +-
i18n/po/az.po | 969 +-
i18n/po/be.po | 1501 +-
i18n/po/bg.po | 1025 +-
i18n/po/bn.po | 963 +-
i18n/po/br.po | 963 +-
i18n/po/bs.po | 963 +-
i18n/po/ca.po | 1092 +-
i18n/po/ca at valencia.po | 1059 +-
i18n/po/cs.po | 1095 +-
i18n/po/cy.po | 963 +-
i18n/po/da.po | 1156 +-
i18n/po/de.po | 1108 +-
i18n/po/de_DE.po | 967 +-
i18n/po/el.po | 1041 +-
i18n/po/en_AU.po | 1051 +-
i18n/po/en_CA.po | 967 +-
i18n/po/en_GB.po | 1081 +-
i18n/po/eo.po | 967 +-
i18n/po/es.po | 1627 +-
i18n/po/et.po | 1035 +-
i18n/po/eu.po | 1040 +-
i18n/po/fa.po | 967 +-
i18n/po/fi.po | 1051 +-
i18n/po/fil.po | 963 +-
i18n/po/fo.po | 963 +-
i18n/po/fr.po | 1429 +-
i18n/po/ga.po | 963 +-
i18n/po/gl.po | 1055 +-
i18n/po/he.po | 969 +-
i18n/po/hi.po | 963 +-
i18n/po/hr.po | 1045 +-
i18n/po/ht.po | 963 +-
i18n/po/hu.po | 1079 +-
i18n/po/hy.po | 963 +-
i18n/po/ia.po | 963 +-
i18n/po/id.po | 1057 +-
i18n/po/is.po | 1031 +-
i18n/po/it.po | 1197 +-
i18n/po/ja.po | 1101 +-
i18n/po/ka.po | 967 +-
i18n/po/km.po | 1087 +-
i18n/po/ko.po | 967 +-
i18n/po/ky.po | 963 +-
i18n/po/lb.po | 963 +-
i18n/po/lo.po | 963 +-
i18n/po/lt.po | 1287 +-
i18n/po/lv.po | 967 +-
i18n/po/mk.po | 963 +-
i18n/po/mr.po | 1045 +-
i18n/po/ms.po | 963 +-
i18n/po/nb.po | 1038 +-
i18n/po/nds.po | 963 +-
i18n/po/nl.po | 1112 +-
i18n/po/nn.po | 963 +-
i18n/po/oc.po | 1025 +-
i18n/po/pa.po | 963 +-
i18n/po/pl.po | 2464 +-
i18n/po/pt.po | 1083 +-
i18n/po/pt_BR.po | 1158 +-
i18n/po/rm.po | 963 +-
i18n/po/ro.po | 967 +-
i18n/po/ru.po | 1117 +-
i18n/po/sk.po | 1114 +-
i18n/po/sl.po | 969 +-
i18n/po/sq.po | 963 +-
i18n/po/sr.po | 967 +-
i18n/po/sv.po | 1043 +-
i18n/po/ta.po | 1043 +-
i18n/po/te.po | 963 +-
i18n/po/th.po | 963 +-
i18n/po/tr.po | 969 +-
i18n/po/ug.po | 963 +-
i18n/po/uk.po | 1141 +-
i18n/po/ur.po | 963 +-
i18n/po/vi.po | 1066 +-
i18n/po/wae.po | 963 +-
i18n/po/zh_CN.po | 1051 +-
i18n/po/zh_TW.po | 1169 +-
images/presets/accommodation/apartment.svg | 131 +
images/presets/accommodation/chalet.svg | 158 +-
images/presets/accommodation/guest_house.svg | 79 +-
images/presets/misc/watering_place.svg | 47 +
images/presets/shop/groceries/dairy.svg | 101 +
linux/latest/usr/share/man/man1/josm-latest.1 | 19 +-
linux/tested/usr/share/man/man1/josm.1 | 19 +-
netbeans/nbproject/project.properties | 4 +-
scripts/BuildProjectionDefinitions.java | 7 +-
scripts/SyncEditorImageryIndex.groovy | 300 +-
scripts/TagInfoExtract.groovy | 12 +-
src/org/apache/commons/jcs/JCS.java | 51 +-
.../jcs/auxiliary/disk/AbstractDiskCache.java | 69 +-
.../commons/jcs/auxiliary/disk/LRUMapJCS.java | 75 -
.../auxiliary/disk/indexed/IndexedDiskCache.java | 11 -
.../jcs/engine/AbstractCacheEventQueue.java | 119 +-
.../apache/commons/jcs/engine/CacheEventQueue.java | 255 +-
.../commons/jcs/engine/CacheWatchRepairable.java | 92 +-
.../commons/jcs/engine/PooledCacheEventQueue.java | 47 +-
.../jcs/engine/behavior/ICacheEventQueue.java | 17 +-
.../jcs/engine/control/CompositeCacheManager.java | 41 +-
.../AbstractDoubleLinkedListMemoryCache.java | 68 +-
.../jcs/engine/memory/AbstractMemoryCache.java | 80 +-
.../jcs/engine/memory/lru/LHMLRUMemoryCache.java | 87 +-
.../memory/soft/SoftReferenceMemoryCache.java | 54 +-
.../commons/jcs/utils/struct/AbstractLRUMap.java | 172 +-
.../apache/commons/jcs/utils/struct/LRUMap.java | 13 +-
src/org/openstreetmap/josm/Main.java | 93 +-
.../josm/actions/AbstractInfoAction.java | 9 +-
.../josm/actions/AddImageryLayerAction.java | 30 +-
.../josm/actions/AutoScaleAction.java | 10 +-
.../josm/actions/CombineWayAction.java | 2 +-
.../josm/actions/CopyCoordinatesAction.java | 2 +-
.../josm/actions/ExpertToggleAction.java | 99 +-
.../josm/actions/FullscreenToggleAction.java | 26 +-
.../josm/actions/JoinAreasAction.java | 128 +-
.../openstreetmap/josm/actions/JumpToAction.java | 94 +-
.../josm/actions/MergeLayerAction.java | 11 +-
.../josm/actions/OpenLocationAction.java | 114 +-
.../josm/actions/OrthogonalizeAction.java | 14 +-
.../openstreetmap/josm/actions/PurgeAction.java | 107 +-
.../josm/actions/RenameLayerAction.java | 20 +-
.../josm/actions/SearchNotesDownloadAction.java | 2 +-
.../josm/actions/SelectByInternalPointAction.java | 26 +-
.../josm/actions/SimplifyWayAction.java | 18 +-
.../openstreetmap/josm/actions/SplitWayAction.java | 34 +-
.../josm/actions/UnJoinNodeWayAction.java | 19 +-
.../openstreetmap/josm/actions/UploadAction.java | 6 +-
.../josm/actions/UploadSelectionAction.java | 6 +-
.../openstreetmap/josm/actions/ZoomToAction.java | 2 +-
.../actions/downloadtasks/DownloadGeoUrlTask.java | 30 -
.../actions/downloadtasks/DownloadOsmUrlTask.java | 5 +-
.../josm/actions/mapmode/ExtrudeAction.java | 26 +-
.../actions/mapmode/ImproveWayAccuracyAction.java | 2 +-
.../josm/actions/mapmode/MapMode.java | 2 +-
.../josm/actions/mapmode/ParallelWays.java | 12 +-
.../josm/actions/mapmode/PlayHeadDragMode.java | 3 +-
.../josm/actions/mapmode/SelectAction.java | 16 +-
.../actions/relation/RecentRelationsAction.java | 14 +-
.../josm/actions/search/PushbackTokenizer.java | 19 +-
.../josm/actions/search/SearchAction.java | 3 +-
.../josm/actions/search/SearchCompiler.java | 16 +-
src/org/openstreetmap/josm/command/AddCommand.java | 12 +
.../josm/command/AddPrimitivesCommand.java | 13 +-
.../openstreetmap/josm/command/ChangeCommand.java | 15 +
.../josm/command/ChangePropertyCommand.java | 44 +-
.../josm/command/ChangePropertyKeyCommand.java | 48 +-
src/org/openstreetmap/josm/command/Command.java | 25 +-
.../openstreetmap/josm/command/DeleteCommand.java | 30 +-
.../openstreetmap/josm/command/PurgeCommand.java | 59 +-
.../DeletedStateConflictResolveCommand.java | 2 +-
.../RelationMemberConflictResolverCommand.java | 41 +-
src/org/openstreetmap/josm/data/AutosaveTask.java | 5 +-
src/org/openstreetmap/josm/data/Bounds.java | 8 +
.../josm/data/CustomConfigurator.java | 31 +-
src/org/openstreetmap/josm/data/Preferences.java | 61 +-
.../openstreetmap/josm/data/UndoRedoHandler.java | 15 +-
.../josm/data/cache/BufferedImageCacheEntry.java | 2 +-
.../josm/data/cache/HostLimitQueue.java | 11 +-
.../josm/data/cache/JCSCacheManager.java | 3 -
.../josm/data/cache/JCSCachedTileLoaderJob.java | 26 +-
.../openstreetmap/josm/data/coor/QuadTiling.java | 4 +-
src/org/openstreetmap/josm/data/gpx/GpxData.java | 52 +-
.../CachedAttributionBingAerialTileSource.java | 3 +-
.../josm/data/imagery/CachedTileLoaderFactory.java | 5 +-
.../josm/data/imagery/DefaultLayer.java | 32 +
.../josm/data/imagery/ImageryInfo.java | 14 +-
.../josm/data/imagery/ImageryLayerInfo.java | 20 +-
.../josm/data/imagery/TMSCachedTileLoaderJob.java | 11 +-
.../josm/data/imagery/WMTSDefaultLayer.java | 28 +
.../josm/data/imagery/WMTSTileSource.java | 56 +-
.../josm/data/osm/AbstractPrimitive.java | 80 +-
src/org/openstreetmap/josm/data/osm/BBox.java | 199 +-
src/org/openstreetmap/josm/data/osm/Changeset.java | 121 +-
.../josm/data/osm/ChangesetCache.java | 76 +-
src/org/openstreetmap/josm/data/osm/DataSet.java | 21 +-
.../openstreetmap/josm/data/osm/DataSetMerger.java | 5 +-
.../openstreetmap/josm/data/osm/FilterMatcher.java | 8 +-
src/org/openstreetmap/josm/data/osm/Node.java | 52 +-
.../openstreetmap/josm/data/osm/OsmPrimitive.java | 124 +-
.../josm/data/osm/OsmPrimitiveType.java | 10 +-
.../openstreetmap/josm/data/osm/QuadBuckets.java | 213 +-
src/org/openstreetmap/josm/data/osm/Relation.java | 71 +-
src/org/openstreetmap/josm/data/osm/Storage.java | 104 +-
.../openstreetmap/josm/data/osm/TagCollection.java | 7 +-
src/org/openstreetmap/josm/data/osm/UserInfo.java | 60 +
src/org/openstreetmap/josm/data/osm/Way.java | 15 +-
.../openstreetmap/josm/data/osm/WaySegment.java | 15 +-
.../osm/visitor/paint/AbstractMapRenderer.java | 6 +-
.../data/osm/visitor/paint/StyledMapRenderer.java | 45 +-
.../osm/visitor/paint/relations/Multipolygon.java | 21 +-
.../josm/data/preferences/ListListSetting.java | 27 -
.../josm/data/preferences/ListSetting.java | 14 -
.../josm/data/preferences/MapListSetting.java | 41 -
.../josm/data/preferences/Setting.java | 4 +-
.../josm/data/preferences/StringSetting.java | 14 -
.../josm/data/projection/Projections.java | 3 +-
.../projection/datum/NTV2GridShiftFileWrapper.java | 3 +-
.../data/projection/proj/ClassProjFactory.java | 4 +-
.../data/projection/proj/SwissObliqueMercator.java | 3 +-
.../josm/data/validation/TestError.java | 225 +-
.../data/validation/routines/DomainValidator.java | 28 +-
.../data/validation/routines/UrlValidator.java | 8 +-
.../josm/data/validation/tests/Addresses.java | 8 +-
.../josm/data/validation/tests/DuplicateNode.java | 28 +-
.../data/validation/tests/MapCSSTagChecker.java | 5 +-
.../data/validation/tests/MultipolygonTest.java | 647 +-
.../josm/data/validation/tests/PowerLines.java | 22 +-
.../josm/data/validation/tests/TagChecker.java | 110 +-
.../josm/data/validation/tests/UntaggedNode.java | 10 +-
.../josm/data/validation/tests/UntaggedWay.java | 4 +-
.../openstreetmap/josm/gui/IconToggleButton.java | 7 +-
src/org/openstreetmap/josm/gui/ImageryMenu.java | 32 +-
.../openstreetmap/josm/gui/MainApplication.java | 23 +-
src/org/openstreetmap/josm/gui/MainFrame.java | 14 +-
src/org/openstreetmap/josm/gui/MapFrame.java | 30 +-
src/org/openstreetmap/josm/gui/MapStatus.java | 38 +-
src/org/openstreetmap/josm/gui/MapView.java | 20 +-
.../josm/gui/NavigatableComponent.java | 83 +-
.../josm/gui/NotificationManager.java | 20 +-
.../openstreetmap/josm/gui/PopupMenuHandler.java | 8 +-
.../josm/gui/bbox/SlippyMapControler.java | 13 +-
...MergeModel.java => AbstractListMergeModel.java} | 64 +-
.../{ListMerger.java => AbstractListMerger.java} | 40 +-
.../josm/gui/conflict/pair/ConflictResolver.java | 17 +-
.../josm/gui/conflict/pair/ListRole.java | 2 +-
.../josm/gui/conflict/pair/PairTable.java | 5 +-
.../conflict/pair/nodes/NodeListMergeModel.java | 16 +-
.../gui/conflict/pair/nodes/NodeListMerger.java | 5 +-
.../gui/conflict/pair/nodes/NodeListTable.java | 10 +-
.../pair/nodes/NodeListTableCellRenderer.java | 12 +-
.../relation/RelationMemberListMergeModel.java | 30 +-
.../pair/relation/RelationMemberMerger.java | 5 +-
.../pair/relation/RelationMemberTable.java | 10 +-
.../relation/RelationMemberTableCellRenderer.java | 16 +-
.../josm/gui/conflict/pair/tags/TagMerger.java | 6 +-
.../tags/RelationMemberConflictResolver.java | 10 +-
.../RelationMemberConflictResolverColumnModel.java | 58 +-
.../gui/datatransfer/importers/OsmLinkPaster.java | 51 +-
.../gui/datatransfer/importers/TextTagPaster.java | 5 +-
.../josm/gui/dialogs/ConflictDialog.java | 54 +-
.../DeleteFromRelationConfirmationDialog.java | 30 +-
.../josm/gui/dialogs/DialogsPanel.java | 19 +-
.../josm/gui/dialogs/FilterDialog.java | 41 +-
.../josm/gui/dialogs/LayerListDialog.java | 7 +-
.../josm/gui/dialogs/MapPaintDialog.java | 6 +
.../josm/gui/dialogs/MenuItemSearchDialog.java | 12 +-
.../josm/gui/dialogs/NotesDialog.java | 6 +-
.../josm/gui/dialogs/RelationListDialog.java | 48 +-
.../josm/gui/dialogs/SelectionListDialog.java | 19 +-
.../josm/gui/dialogs/ToggleDialog.java | 19 +-
.../josm/gui/dialogs/UserListDialog.java | 4 +-
.../josm/gui/dialogs/ValidatorDialog.java | 11 +-
.../changeset/ChangesetCacheManagerModel.java | 16 +-
.../gui/dialogs/changeset/ChangesetListModel.java | 14 +-
.../query/AdvancedChangesetQueryPanel.java | 905 +-
.../changeset/query/BBoxRestrictionPanel.java | 70 +
.../changeset/query/BasicChangesetQueryPanel.java | 18 +-
.../changeset/query/ChangesetQueryDialog.java | 14 +
.../gui/dialogs/changeset/query/DateValidator.java | 103 +
.../query/OpenAndCloseStateRestrictionPanel.java | 138 +
.../dialogs/changeset/query/RestrictionPanel.java | 28 +
.../changeset/query/TimeRestrictionPanel.java | 346 +
.../gui/dialogs/changeset/query/TimeValidator.java | 108 +
.../changeset/query/UidInputFieldValidator.java | 74 +
.../changeset/query/UrlBasedQueryPanel.java | 7 +
.../changeset/query/UserRestrictionPanel.java | 309 +
.../gui/dialogs/properties/PresetListPanel.java | 36 +-
.../gui/dialogs/properties/PropertiesDialog.java | 169 +-
.../dialogs/properties/RecentTagCollection.java | 32 +-
.../josm/gui/dialogs/properties/TagEditHelper.java | 68 +-
.../gui/dialogs/relation/MemberTableModel.java | 9 +-
.../gui/dialogs/validator/ValidatorTreePanel.java | 69 +-
.../josm/gui/download/DownloadDialog.java | 42 +-
.../openstreetmap/josm/gui/draw/MapViewPath.java | 5 +-
src/org/openstreetmap/josm/gui/help/HelpUtil.java | 18 +-
.../gui/history/HistoryBrowserDialogManager.java | 51 +-
.../josm/gui/history/HistoryBrowserModel.java | 25 +-
.../josm/gui/history/NodeListViewer.java | 57 +-
.../josm/gui/history/VersionInfoPanel.java | 6 +-
.../josm/gui/history/VersionTable.java | 1 +
.../josm/gui/history/VersionTableColumnModel.java | 7 +
.../josm/gui/io/BasicUploadSettingsPanel.java | 31 +-
.../josm/gui/io/RecentlyOpenedFilesMenu.java | 33 +-
.../josm/gui/io/SaveLayersDialog.java | 40 +-
.../openstreetmap/josm/gui/io/UploadDialog.java | 22 +-
.../openstreetmap/josm/gui/io/UploadLayerTask.java | 6 +-
.../josm/gui/io/UploadSelectionDialog.java | 27 +-
.../josm/gui/layer/AbstractTileSourceLayer.java | 2 +-
.../josm/gui/layer/AlignImageryPanel.java | 10 +-
src/org/openstreetmap/josm/gui/layer/GpxLayer.java | 2 +
.../openstreetmap/josm/gui/layer/LayerManager.java | 2 +-
.../josm/gui/layer/NativeScaleLayer.java | 12 +-
.../openstreetmap/josm/gui/layer/OsmDataLayer.java | 26 +-
.../gui/layer/geoimage/CorrelateGpxWithImages.java | 33 +-
.../josm/gui/layer/geoimage/GeoImageLayer.java | 36 +-
.../gui/layer/gpx/ChooseTrackVisibilityAction.java | 2 +
.../gui/layer/gpx/ConvertToDataLayerAction.java | 8 +-
.../josm/gui/layer/gpx/ImportAudioAction.java | 25 +-
.../josm/gui/layer/markerlayer/MarkerLayer.java | 18 +-
.../josm/gui/layer/markerlayer/PlayHeadMarker.java | 5 +-
.../openstreetmap/josm/gui/mappaint/Cascade.java | 32 +-
.../josm/gui/mappaint/ElemStyles.java | 45 +-
.../josm/gui/mappaint/MapPaintStyles.java | 68 +-
.../josm/gui/mappaint/MultiCascade.java | 2 +-
src/org/openstreetmap/josm/gui/mappaint/Range.java | 2 +-
.../josm/gui/mappaint/mapcss/ConditionFactory.java | 3 +-
.../gui/mappaint/mapcss/ExpressionFactory.java | 51 +-
.../josm/gui/mappaint/mapcss/MapCSSParser.jj | 17 +-
.../gui/mappaint/mapcss/MapCSSStyleSource.java | 16 +-
.../josm/gui/mappaint/mapcss/Selector.java | 34 +-
.../gui/mappaint/styleelement/AreaElement.java | 30 +
.../gui/oauth/OsmOAuthAuthorizationClient.java | 4 +-
.../gui/preferences/PreferenceSettingFactory.java | 8 +
.../josm/gui/preferences/PreferenceTabbedPane.java | 40 +-
.../josm/gui/preferences/SourceEditor.java | 157 +-
.../josm/gui/preferences/ToolbarPreferences.java | 70 +
.../gui/preferences/display/ColorPreference.java | 6 +-
.../gui/preferences/display/LafPreference.java | 19 +-
.../gui/preferences/imagery/AddImageryPanel.java | 2 +-
.../gui/preferences/imagery/AddTMSLayerPanel.java | 7 +-
.../gui/preferences/imagery/AddWMSLayerPanel.java | 4 +-
.../gui/preferences/imagery/AddWMTSLayerPanel.java | 1 +
.../gui/preferences/imagery/WMSSettingsPanel.java | 12 +-
.../gui/preferences/plugin/PluginListPanel.java | 20 +-
.../gui/preferences/plugin/PluginPreference.java | 9 +-
.../projection/ProjectionPreference.java | 3 +-
.../preferences/server/ProxyPreferencesPanel.java | 25 +-
.../ValidatorTagCheckerRulesPreference.java | 1 +
.../gui/progress/PleaseWaitProgressMonitor.java | 22 +-
.../josm/gui/tagging/TagCellRenderer.java | 18 +-
.../gui/tagging/ac/AutoCompletingComboBox.java | 62 +-
.../josm/gui/tagging/ac/AutoCompletionManager.java | 6 +-
.../gui/tagging/presets/TaggingPresetReader.java | 6 +-
.../gui/tagging/presets/TaggingPresetSelector.java | 11 +-
.../josm/gui/tagging/presets/TaggingPresets.java | 8 +-
.../tagging/presets/items/ComboMultiSelect.java | 4 +-
.../josm/gui/tagging/presets/items/KeyedItem.java | 2 +-
.../josm/gui/tagging/presets/items/PresetLink.java | 20 +-
.../josm/gui/util/AdvancedKeyPressDetector.java | 24 +-
src/org/openstreetmap/josm/gui/util/GuiHelper.java | 6 +-
.../widgets/AbstractTextComponentValidator.java | 7 +-
.../josm/gui/widgets/JosmTextArea.java | 13 +
.../openstreetmap/josm/gui/widgets/UrlLabel.java | 16 +-
.../josm/io/BoundingBoxDownloader.java | 3 +-
.../openstreetmap/josm/io/CacheCustomContent.java | 13 +-
src/org/openstreetmap/josm/io/CachedFile.java | 20 +-
src/org/openstreetmap/josm/io/ChangesetQuery.java | 2 +-
src/org/openstreetmap/josm/io/GpxReader.java | 5 +-
src/org/openstreetmap/josm/io/GpxWriter.java | 3 +-
src/org/openstreetmap/josm/io/MessageNotifier.java | 2 +-
.../josm/io/MultiFetchServerObjectReader.java | 10 +-
src/org/openstreetmap/josm/io/NmeaReader.java | 3 +-
src/org/openstreetmap/josm/io/OsmApi.java | 14 +-
src/org/openstreetmap/josm/io/OsmExporter.java | 14 +-
.../josm/io/OsmServerHistoryReader.java | 6 +-
src/org/openstreetmap/josm/io/OsmServerWriter.java | 9 +-
.../josm/io/OverpassDownloadReader.java | 31 +-
.../josm/io/imagery/ImageryReader.java | 11 +-
.../openstreetmap/josm/io/imagery/WMSImagery.java | 2 +-
.../josm/io/remotecontrol/AddTagsDialog.java | 22 +-
.../io/remotecontrol/RemoteControlHttpsServer.java | 23 +-
.../josm/io/session/SessionReader.java | 12 +-
.../josm/io/session/SessionWriter.java | 7 +-
.../openstreetmap/josm/plugins/PluginHandler.java | 25 +-
.../josm/plugins/PluginListParser.java | 10 +-
.../josm/plugins/PluginPreferenceFactory.java | 8 +
src/org/openstreetmap/josm/tools/AudioPlayer.java | 31 +-
.../josm/tools/DefaultGeoProperty.java | 62 +
src/org/openstreetmap/josm/tools/Diff.java | 2 +-
.../openstreetmap/josm/tools/ExceptionUtil.java | 3 +-
src/org/openstreetmap/josm/tools/ExifReader.java | 3 +-
src/org/openstreetmap/josm/tools/FontsManager.java | 2 +-
src/org/openstreetmap/josm/tools/GeoProperty.java | 30 +
.../openstreetmap/josm/tools/GeoPropertyIndex.java | 32 +-
.../openstreetmap/josm/tools/GeoUrlToBounds.java | 2 +
src/org/openstreetmap/josm/tools/Geometry.java | 43 +-
src/org/openstreetmap/josm/tools/HttpClient.java | 72 +-
.../openstreetmap/josm/tools/ImageProvider.java | 17 +-
.../josm/tools/JosmRuntimeException.java | 54 +
src/org/openstreetmap/josm/tools/ListenerList.java | 47 +-
src/org/openstreetmap/josm/tools/Logging.java | 6 +-
.../josm/tools/MultiLineFlowLayout.java | 2 +-
.../josm/tools/MultikeyActionsHandler.java | 42 +-
.../openstreetmap/josm/tools/OsmUrlToBounds.java | 87 +-
.../josm/tools/RightAndLefthandTraffic.java | 180 +-
src/org/openstreetmap/josm/tools/Shortcut.java | 7 +-
src/org/openstreetmap/josm/tools/Territories.java | 109 +
src/org/openstreetmap/josm/tools/Utils.java | 43 +-
.../openstreetmap/josm/tools/WindowGeometry.java | 2 +-
.../openstreetmap/josm/tools/XmlObjectParser.java | 3 +-
.../openstreetmap/josm/tools/date/DateUtils.java | 3 +-
styles/standard/elemstyles.mapcss | 35 +-
...iple-tile-matrices-for-one-layer-projection.xml | 377 +
.../openstreetmap/josm/data/BoundariesTestIT.java | 66 +
.../josm/data/imagery/ImageryCompareTestIT.java | 56 +
.../josm/gui/mappaint/StyleCacheTest.java | 2 +-
.../josm/io/MultiFetchServerObjectReaderTest.java | 18 +-
.../josm/io/OsmServerBackreferenceReaderTest.java | 3 +
.../openstreetmap/josm/tools/HttpClientTest.java | 85 +
.../openstreetmap/josm/PerformanceTestUtils.java | 1 +
.../josm/data/osm/KeyValuePerformanceTest.java | 3 +-
.../josm/data/osm/OsmDataGenerator.java | 10 +-
.../gui/mappaint/MapRendererPerformanceTest.java | 2 -
test/unit/org/openstreetmap/josm/TestUtils.java | 9 +-
.../josm/actions/CreateCircleActionTest.java | 49 +-
.../josm/actions/ExpertToggleActionTest.java | 87 +
.../josm/actions/FullscreenToggleActionTest.java | 31 +
.../actions/SelectByInternalPointActionTest.java | 3 +
.../josm/actions/search/SearchCompilerTest.java | 3 +
.../openstreetmap/josm/data/AutosaveTaskTest.java | 18 +-
.../josm/data/cache/JCSCacheManagerTest.java | 4 +-
.../josm/data/imagery/WMTSTileSourceTest.java | 21 +-
.../org/openstreetmap/josm/data/osm/BBoxTest.java | 37 +
.../openstreetmap/josm/data/osm/ChangesetTest.java | 1 +
.../openstreetmap/josm/data/osm/NodeDataTest.java | 3 +
.../org/openstreetmap/josm/data/osm/NodeTest.java | 61 +
.../josm/data/osm/QuadBucketsTest.java | 75 +
.../openstreetmap/josm/data/osm/RelationTest.java | 25 +
.../data/osm/{BBoxTest.java => StorageTest.java} | 10 +-
.../openstreetmap/josm/data/osm/WayDataTest.java | 4 +
.../org/openstreetmap/josm/data/osm/WayTest.java | 73 +
.../ListListSettingTest.java} | 18 +-
.../ListSettingTest.java} | 18 +-
.../MapListSettingTest.java} | 18 +-
.../StringSettingTest.java} | 18 +-
.../josm/data/projection/EllipsoidTest.java | 3 +-
.../josm/data/projection/ProjectionRefTest.java | 17 +-
.../data/projection/ProjectionRegressionTest.java | 3 +-
.../josm/data/projection/ProjectionTest.java | 3 +-
.../validation/tests/ConditionalKeysTest.groovy | 43 -
.../data/validation/tests/ConditionalKeysTest.java | 63 +
.../josm/data/validation/tests/HighwaysTest.groovy | 77 -
.../josm/data/validation/tests/HighwaysTest.java | 98 +
.../josm/data/validation/tests/LanesTest.groovy | 69 -
.../josm/data/validation/tests/LanesTest.java | 96 +
.../validation/tests/MultipolygonTestTest.java | 5 +-
.../validation/tests/RelationCheckerTest.groovy | 142 -
.../data/validation/tests/RelationCheckerTest.java | 166 +
.../validation/tests/SimilarNamedWaysTest.groovy | 107 -
.../validation/tests/SimilarNamedWaysTest.java | 121 +
.../josm/gui/MainApplicationTest.java | 18 +-
.../josm/gui/NavigatableComponentTest.java | 2 +-
.../datatransfer/importers/OsmLinkPasterTest.java | 31 +-
.../openstreetmap/josm/gui/layer/GpxLayerTest.java | 9 +
.../josm/gui/layer/MainLayerManagerTest.java | 2 +-
.../josm/gui/layer/OsmDataLayerTest.java | 28 +-
.../josm/gui/layer/geoimage/GeoImageLayerTest.java | 10 +
.../josm/io/remotecontrol/RemoteControlTest.java | 13 +-
.../josm/io/session/SessionReaderTest.java | 2 +-
.../josm/testutils/JOSMTestRules.java | 9 +-
.../josm/tools/AlphanumComparatorTest.groovy | 18 -
.../josm/tools/AlphanumComparatorTest.java | 36 +
.../org/openstreetmap/josm/tools/I18nTest.groovy | 10 -
.../org/openstreetmap/josm/tools/I18nTest.java | 22 +
.../org/openstreetmap/josm/tools/LoggingTest.java | 5 +
.../josm/tools/OsmUrlToBoundsTest.java | 35 +
.../josm/tools/RightAndLefthandTrafficTest.java | 126 +
.../openstreetmap/josm/tools/TerritoriesTest.java | 37 +
.../org/openstreetmap/josm/tools/UtilsTest.java | 15 +
tools/findbugs/josm-filter.xml | 22 +
515 files changed, 112778 insertions(+), 34428 deletions(-)
diff --git a/.classpath b/.classpath
index d3dca0d..858a778 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/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 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 kind="lib" path="test/lib/equalsverifier-2.1.6.jar"/>
+ <classpathentry kind="lib" path="test/lib/equalsverifier-2.1.8.jar"/>
<classpathentry kind="lib" path="test/lib/reflections/reflections-0.9.10.jar"/>
<classpathentry kind="lib" path="test/lib/reflections/guava-19.0.jar"/>
<classpathentry kind="lib" path="test/lib/reflections/javassist-3.20.0-GA.jar"/>
diff --git a/README b/README
index 8a3a6d3..bc57819 100644
--- a/README
+++ b/README
@@ -83,11 +83,12 @@ This is an overview of the files and directories in the JOSM code repository:
- projection-regression-test-data.csv
regression data for projection tests
(see test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java)
-- geticons.pl tool, to find all used icons and allows deleting unused icons
+- geticons.pl tool to find all used icons and allows deleting unused icons
+ searches also for images with incompatible svg code
- gpl-2.0.txt, gpl-3.0.txt full text of the GNU General Public License
- images/ images distributed with the JOSM binary
- icons images for the Potlatch 2 style
- - styles/standard images for the main map style (external repository)
+ - presets images for the main mappaint style and the internal presets
- images_nodist/ images, which are not for distribution, but may be useful later (e.g. high
resolution and vector versions)
- josm.jnlp Java Web Start launcher file (used on the website for the tested version)
@@ -120,7 +121,7 @@ This is an overview of the files and directories in the JOSM code repository:
- checkstyle/ libs and config files for checkstyle (automatically detects code style
problems in source code); can be launched as an ant target in build.xml
- commons-cli-1.3.1.jar dependency of Groovy Ant task
- - error_prone_ant-2.0.13.jar
+ - error_prone_ant-2.0.14.jar
used to detect code errors during compilation
- findbugs/ libs and config files for findbugs (automatically detects common bugs and potential
problems in source code); can be launched as an ant target in build.xml
diff --git a/REVISION b/REVISION
index f0b3e26..890604f 100644
--- a/REVISION
+++ b/REVISION
@@ -2,7 +2,7 @@
<info>
<entry
path="trunk"
- revision="11223"
+ revision="11427"
kind="dir">
<url>https://josm.openstreetmap.de/svn/trunk</url>
<relative-url>^/trunk</relative-url>
@@ -11,9 +11,9 @@
<uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
</repository>
<commit
- revision="11223">
-<author>simon04</author>
-<date>2016-11-06T19:18:38.809650Z</date>
+ revision="11427">
+<author>Don-vip</author>
+<date>2017-01-01T23:53:29.375771Z</date>
</commit>
</entry>
</info>
diff --git a/build.xml b/build.xml
index 70ed195..b4a953d 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="proj-build.dir" location="${base.dir}/build2"/>
<property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
<property name="groovy.jar" location="${base.dir}/tools/groovy-all-2.4.7.jar"/>
- <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.13.jar"/>
+ <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.14.jar"/>
<property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
<!-- build parameter: compression level (ant -Dclevel=N)
N ranges from 0 (no compression) to 9 (maximum compression)
@@ -229,6 +229,7 @@ Build-Date: ${build.tstamp}
<exclude name="org/apache/commons/compress/compressors/lzma/**"/>
<exclude name="org/apache/commons/compress/compressors/xz/**"/>
<exclude name="org/apache/commons/compress/compressors/CompressorStreamFactory.java"/>
+ <exclude name="org/apache/commons/compress/compressors/CompressorStreamProvider.java"/>
<exclude name="org/apache/commons/compress/compressors/CompressorException.java"/>
<exclude name="org/apache/commons/compress/compressors/FileNameUtil.java"/>
<exclude name="org/apache/commons/compress/compressors/deflate/**"/>
@@ -661,7 +662,7 @@ Build-Date: ${build.tstamp}
<attribute name="output"/>
<sequential>
<echo message="Generating Taginfo for type @{type} to @{output}"/>
- <groovy src="${taginfoextract}" classpath="${dist.dir}/josm-custom.jar">
+ <groovy src="${taginfoextract}" classpath="${dist.dir}/josm-custom.jar:tools/findbugs/annotations.jar">
<arg value="-t"/>
<arg value="@{type}"/>
<arg value="--noexit"/>
@@ -687,7 +688,7 @@ Build-Date: ${build.tstamp}
<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${groovy.jar};tools/commons-cli-1.3.1.jar"/>
<echo message="Checking editor imagery difference"/>
<groovy src="scripts/SyncEditorImageryIndex.groovy" classpath="${dist.dir}/josm-custom.jar">
- <arg value="-nomissingeii"/>
+ <!--<arg value="-nomissingeii"/>-->
</groovy>
</target>
@@ -699,9 +700,15 @@ Build-Date: ${build.tstamp}
<arg value="--unlink"/>
</exec>
<exec append="false" executable="wget" failifexecutionfails="true">
- <arg value="https://raw.githubusercontent.com/osmlab/editor-imagery-index/gh-pages/imagery.json"/>
+ <arg value="https://josm.openstreetmap.de/wiki/ImageryCompareIgnores?format=txt"/>
<arg value="-O"/>
- <arg value="imagery.json"/>
+ <arg value="maps_ignores.txt"/>
+ <arg value="--unlink"/>
+ </exec>
+ <exec append="false" executable="wget" failifexecutionfails="true">
+ <arg value="https://raw.githubusercontent.com/osmlab/editor-imagery-index/gh-pages/imagery.geojson"/>
+ <arg value="-O"/>
+ <arg value="imagery.geojson"/>
<arg value="--unlink"/>
</exec>
<antcall target="imageryindex"/>
@@ -709,7 +716,7 @@ Build-Date: ${build.tstamp}
<target name="checkstyle" depends="init-properties">
<taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
- classpath="tools/checkstyle/checkstyle-7.2-all.jar"/>
+ classpath="tools/checkstyle/checkstyle-7.3-all.jar"/>
<checkstyle config="tools/checkstyle/josm_checks.xml">
<fileset dir="${base.dir}/src/org/openstreetmap/josm" includes="**/*.java"
excludes="gui/mappaint/mapcss/parsergen/*.java"/>
diff --git a/data/boundaries.osm b/data/boundaries.osm
new file mode 100644
index 0000000..f81bb9f
--- /dev/null
+++ b/data/boundaries.osm
@@ -0,0 +1,43887 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' upload='false' generator='JOSM'>
+ <node id='-30517' lat='-4.80838' lon='14.83101' />
+ <node id='-30519' lat='-4.77818' lon='13.50305' />
+ <node id='-30521' lat='-4.72601' lon='13.70417' />
+ <node id='-30523' lat='-4.89897' lon='13.41764' />
+ <node id='-30525' lat='-4.5942' lon='13.11182' />
+ <node id='-30527' lat='-4.50906' lon='13.9108' />
+ <node id='-30529' lat='-4.41842' lon='13.81162' />
+ <node id='-30531' lat='-4.44864' lon='13.71794' />
+ <node id='-30533' lat='-4.56125' lon='14.37366' />
+ <node id='-30535' lat='-4.36623' lon='14.3957' />
+ <node id='-30537' lat='-4.42941' lon='14.47284' />
+ <node id='-30539' lat='-4.22062' lon='15.48121' />
+ <node id='-30541' lat='-4.28381' lon='15.41785' />
+ <node id='-30543' lat='-4.27282' lon='15.32693' />
+ <node id='-30545' lat='-4.31403' lon='15.20846' />
+ <node id='-30547' lat='-4.84956' lon='14.5059' />
+ <node id='-30549' lat='-4.92093' lon='14.67948' />
+ <node id='-30551' lat='-4.8825' lon='14.41499' />
+ <node id='-30553' lat='-4.28381' lon='14.40672' />
+ <node id='-30555' lat='-4.042' lon='15.53081' />
+ <node id='-30557' lat='-3.2969' lon='16.21407' />
+ <node id='-30559' lat='-3.9513' lon='15.89448' />
+ <node id='-30561' lat='-2.59528' lon='16.22785' />
+ <node id='-30563' lat='-3.25014' lon='16.1755' />
+ <node id='-30565' lat='-1.8795' lon='16.50336' />
+ <node id='-30567' lat='-0.52707' lon='17.72112' />
+ <node id='-30569' lat='-0.99265' lon='17.32438' />
+ <node id='-30571' lat='-1.12762' lon='16.97999' />
+ <node id='-30573' lat='-1.45815' lon='16.70724' />
+ <node id='-30575' lat='0.32424' lon='17.93877' />
+ <node id='-30577' lat='0.48128' lon='17.95255' />
+ <node id='-30579' lat='0.23884' lon='17.81204' />
+ <node id='-30581' lat='0.58873' lon='17.86989' />
+ <node id='-30583' lat='1.04327' lon='17.85887' />
+ <node id='-30585' lat='1.55008' lon='18.06551' />
+ <node id='-30587' lat='3.19342' lon='18.63857' />
+ <node id='-30589' lat='2.26876' lon='18.10683' />
+ <node id='-30591' lat='-0.26535' lon='17.66051' />
+ <node id='-30593' lat='-2.16586' lon='16.16173' />
+ <node id='-30595' lat='-4.94632' lon='12.63465' />
+ <node id='-30597' lat='-5.01715' lon='12.60251' />
+ <node id='-30599' lat='-4.95505' lon='12.70868' />
+ <node id='-30601' lat='-4.74346' lon='12.8733' />
+ <node id='-30603' lat='-4.67745' lon='13.11195' />
+ <node id='-30605' lat='-5.14658' lon='12.53586' />
+ <node id='-30607' lat='-5.1332' lon='12.51589' />
+ <node id='-30609' lat='-5.14058' lon='12.49815' />
+ <node id='-30611' lat='-5.1618' lon='12.53599' />
+ <node id='-30613' lat='-5.09408' lon='12.46297' />
+ <node id='-30615' lat='-5.17481' lon='12.52301' />
+ <node id='-30617' lat='-4.47907' lon='12.91489' />
+ <node id='-30619' lat='-4.40315' lon='12.87096' />
+ <node id='-30621' lat='-4.38709' lon='12.76844' />
+ <node id='-30623' lat='-4.55937' lon='12.64835' />
+ <node id='-30625' lat='-4.60609' lon='12.40964' />
+ <node id='-30627' lat='-4.79437' lon='12.25587' />
+ <node id='-30629' lat='-4.78415' lon='12.32324' />
+ <node id='-30631' lat='-4.75642' lon='12.20901' />
+ <node id='-30633' lat='-4.90089' lon='12.16068' />
+ <node id='-30635' lat='7.79302' lon='15.50743' />
+ <node id='-30637' lat='8.65982' lon='15.09484' />
+ <node id='-30639' lat='8.80557' lon='14.83566' />
+ <node id='-30641' lat='9.2954' lon='14.37094' />
+ <node id='-30643' lat='9.73169' lon='14.01793' />
+ <node id='-30645' lat='9.99246' lon='15.14043' />
+ <node id='-30647' lat='9.94845' lon='15.05999' />
+ <node id='-30649' lat='9.99246' lon='15.24618' />
+ <node id='-30651' lat='9.97926' lon='14.95722' />
+ <node id='-30653' lat='9.93818' lon='14.80082' />
+ <node id='-30655' lat='10.1098' lon='15.50535' />
+ <node id='-30657' lat='10.31063' lon='15.30874' />
+ <node id='-30659' lat='10.47764' lon='15.23724' />
+ <node id='-30661' lat='10.62846' lon='15.15532' />
+ <node id='-30663' lat='10.53915' lon='15.14936' />
+ <node id='-30665' lat='10.87431' lon='15.09127' />
+ <node id='-30667' lat='11.04101' lon='15.10021' />
+ <node id='-30669' lat='11.02347' lon='15.04957' />
+ <node id='-30671' lat='11.40481' lon='15.0585' />
+ <node id='-30673' lat='11.5537' lon='15.13149' />
+ <node id='-30675' lat='11.71126' lon='15.06595' />
+ <node id='-30677' lat='11.8731' lon='15.04808' />
+ <node id='-30679' lat='12.07272' lon='15.05254' />
+ <node id='-30681' lat='12.12079' lon='15.01829' />
+ <node id='-30683' lat='12.09603' lon='14.96764' />
+ <node id='-30685' lat='12.16593' lon='14.89019' />
+ <node id='-30687' lat='12.91036' lon='14.56101' />
+ <node id='-30689' lat='12.78256' lon='14.55058' />
+ <node id='-30691' lat='12.41916' lon='14.17523' />
+ <node id='-30693' lat='12.53405' lon='14.20204' />
+ <node id='-30695' lat='12.17466' lon='14.6474' />
+ <node id='-30697' lat='11.7798' lon='14.61612' />
+ <node id='-30699' lat='11.72001' lon='14.55207' />
+ <node id='-30701' lat='11.66166' lon='14.64591' />
+ <node id='-30703' lat='11.23831' lon='14.17821' />
+ <node id='-30705' lat='11.00593' lon='13.7403' />
+ <node id='-30707' lat='10.94451' lon='13.70753' />
+ <node id='-30709' lat='10.9255' lon='13.73434' />
+ <node id='-30711' lat='11.00154' lon='13.78945' />
+ <node id='-30713' lat='10.61236' lon='13.54964' />
+ <node id='-30715' lat='10.53183' lon='13.5705' />
+ <node id='-30717' lat='10.13326' lon='13.43644' />
+ <node id='-30719' lat='10.12299' lon='13.34111' />
+ <node id='-30721' lat='10.03647' lon='13.25025' />
+ <node id='-30723' lat='9.9822' lon='13.286' />
+ <node id='-30725' lat='9.93232' lon='13.27409' />
+ <node id='-30727' lat='9.91031' lon='13.24132' />
+ <node id='-30729' lat='9.86042' lon='13.25025' />
+ <node id='-30731' lat='9.76795' lon='13.25472' />
+ <node id='-30733' lat='9.8296' lon='13.29941' />
+ <node id='-30735' lat='9.49334' lon='13.02385' />
+ <node id='-30737' lat='9.57266' lon='13.22642' />
+ <node id='-30739' lat='10.00127' lon='13.25323' />
+ <node id='-30741' lat='9.33905' lon='12.91958' />
+ <node id='-30743' lat='9.11411' lon='12.90022' />
+ <node id='-30745' lat='8.91992' lon='12.81085' />
+ <node id='-30747' lat='8.75361' lon='12.79' />
+ <node id='-30749' lat='8.7595' lon='12.71701' />
+ <node id='-30751' lat='8.65938' lon='12.68722' />
+ <node id='-30753' lat='8.6152' lon='12.44146' />
+ <node id='-30755' lat='8.52536' lon='12.4489' />
+ <node id='-30757' lat='8.17904' lon='12.24782' />
+ <node id='-30759' lat='8.10826' lon='12.19271' />
+ <node id='-30761' lat='8.43696' lon='12.26123' />
+ <node id='-30763' lat='7.97553' lon='12.20909' />
+ <node id='-30765' lat='6.60892' lon='11.51499' />
+ <node id='-30767' lat='6.5882' lon='11.42264' />
+ <node id='-30769' lat='6.74059' lon='11.57755' />
+ <node id='-30771' lat='6.86186' lon='11.55818' />
+ <node id='-30773' lat='6.9905' lon='11.63117' />
+ <node id='-30775' lat='7.47812' lon='11.93205' />
+ <node id='-30777' lat='7.52981' lon='12.01844' />
+ <node id='-30779' lat='7.26098' lon='11.84864' />
+ <node id='-30781' lat='7.09398' lon='11.87396' />
+ <node id='-30783' lat='7.67302' lon='11.99908' />
+ <node id='-30785' lat='6.69325' lon='10.94302' />
+ <node id='-30787' lat='6.51717' lon='11.09495' />
+ <node id='-30789' lat='6.68437' lon='11.09644' />
+ <node id='-30791' lat='6.83377' lon='10.8179' />
+ <node id='-30793' lat='6.9358' lon='10.83727' />
+ <node id='-30795' lat='7.14719' lon='10.59746' />
+ <node id='-30797' lat='7.06885' lon='10.60789' />
+ <node id='-30799' lat='7.16345' lon='10.57214' />
+ <node id='-30801' lat='6.88996' lon='10.21466' />
+ <node id='-30803' lat='6.93432' lon='10.53639' />
+ <node id='-30805' lat='6.79088' lon='9.77824' />
+ <node id='-30807' lat='6.77756' lon='9.86314' />
+ <node id='-30809' lat='6.43874' lon='9.51757' />
+ <node id='-30811' lat='6.51717' lon='9.70674' />
+ <node id='-30813' lat='5.78857' lon='8.88156' />
+ <node id='-30815' lat='5.68483' lon='8.83687' />
+ <node id='-30817' lat='5.1243' lon='8.78027' />
+ <node id='-30819' lat='5.58403' lon='8.92029' />
+ <node id='-30821' lat='4.87353' lon='8.60302' />
+ <node id='-30823' lat='11.51283' lon='14.6124' />
+ <node id='-30825' lat='11.30258' lon='13.97489' />
+ <node id='-30827' lat='12.35223' lon='14.4843' />
+ <node id='-30829' lat='12.36533' lon='14.22215' />
+ <node id='-30831' lat='6.53789' lon='11.42041' />
+ <node id='-30833' lat='9.36698' lon='12.85628' />
+ <node id='-30835' lat='5.82562' lon='8.84209' />
+ <node id='-30837' lat='7.03781' lon='10.15135' />
+ <node id='-30839' lat='9.04654' lon='34.14304' />
+ <node id='-30841' lat='8.4842' lon='33.89579' />
+ <node id='-30843' lat='8.50041' lon='34.01346' />
+ <node id='-30845' lat='8.41938' lon='33.87195' />
+ <node id='-30847' lat='8.47094' lon='33.54575' />
+ <node id='-30849' lat='8.45474' lon='33.3119' />
+ <node id='-30851' lat='8.3678' lon='33.71407' />
+ <node id='-30853' lat='8.44442' lon='33.66938' />
+ <node id='-30855' lat='8.60204' lon='34.14453' />
+ <node id='-30857' lat='8.29264' lon='33.1853' />
+ <node id='-30859' lat='8.13047' lon='33.18083' />
+ <node id='-30861' lat='8.05822' lon='33.08401' />
+ <node id='-30863' lat='7.90333' lon='33.0006' />
+ <node id='-30865' lat='8.40317' lon='33.19721' />
+ <node id='-30867' lat='7.77939' lon='33.24637' />
+ <node id='-30869' lat='7.65983' lon='33.71407' />
+ <node id='-30871' lat='7.7543' lon='33.44745' />
+ <node id='-30873' lat='7.71297' lon='33.32531' />
+ <node id='-30875' lat='7.5491' lon='33.87642' />
+ <node id='-30877' lat='7.27437' lon='34.03878' />
+ <node id='-30879' lat='7.36449' lon='34.02984' />
+ <node id='-30881' lat='6.91963' lon='34.35753' />
+ <node id='-30883' lat='7.04382' lon='34.19369' />
+ <node id='-30885' lat='7.12807' lon='34.19369' />
+ <node id='-30887' lat='6.91076' lon='34.47669' />
+ <node id='-30889' lat='6.82794' lon='34.53925' />
+ <node id='-30891' lat='7.25664' lon='34.01495' />
+ <node id='-30893' lat='5.68937' lon='35.12611' />
+ <node id='-30895' lat='5.62118' lon='35.13058' />
+ <node id='-30897' lat='6.26415' lon='34.96227' />
+ <node id='-30899' lat='5.89387' lon='35.00546' />
+ <node id='-30901' lat='6.60161' lon='34.87736' />
+ <node id='-30903' lat='6.72589' lon='34.65096' />
+ <node id='-30905' lat='6.5957' lon='34.77459' />
+ <node id='-30907' lat='6.46991' lon='35.01738' />
+ <node id='-30909' lat='6.74808' lon='34.53776' />
+ <node id='-30911' lat='7.78989' lon='33.04944' />
+ <node id='-30913' lat='13.95666' lon='36.44653' />
+ <node id='-30915' lat='13.56459' lon='36.38993' />
+ <node id='-30917' lat='13.83954' lon='36.48824' />
+ <node id='-30919' lat='12.92665' lon='36.13374' />
+ <node id='-30921' lat='12.88019' lon='36.16651' />
+ <node id='-30923' lat='12.72478' lon='36.01458' />
+ <node id='-30925' lat='12.70879' lon='36.14268' />
+ <node id='-30927' lat='13.36759' lon='36.24545' />
+ <node id='-30929' lat='11.85156' lon='35.11492' />
+ <node id='-30931' lat='11.71158' lon='35.05832' />
+ <node id='-30933' lat='11.56278' lon='35.09556' />
+ <node id='-30935' lat='11.24448' lon='34.95704' />
+ <node id='-30937' lat='11.91132' lon='35.24302' />
+ <node id='-30939' lat='12.67101' lon='35.70476' />
+ <node id='-30941' lat='10.74588' lon='34.86618' />
+ <node id='-30943' lat='10.69027' lon='34.77532' />
+ <node id='-30945' lat='10.78832' lon='34.86916' />
+ <node id='-30947' lat='10.86147' lon='34.97491' />
+ <node id='-30949' lat='10.91559' lon='34.97789' />
+ <node id='-30951' lat='10.74588' lon='34.77383' />
+ <node id='-30953' lat='10.95946' lon='34.93172' />
+ <node id='-30955' lat='10.89072' lon='34.59062' />
+ <node id='-30957' lat='9.7492' lon='34.13186' />
+ <node id='-30959' lat='9.9033' lon='34.20484' />
+ <node id='-30961' lat='9.55243' lon='34.08717' />
+ <node id='-30963' lat='10.11599' lon='34.32102' />
+ <node id='-30965' lat='10.23914' lon='34.34783' />
+ <node id='-30967' lat='10.02506' lon='34.22718' />
+ <node id='-30969' lat='10.781' lon='34.4372' />
+ <node id='-30971' lat='10.53508' lon='34.2823' />
+ <node id='-30973' lat='11.19626' lon='35.01215' />
+ <node id='-30975' lat='3.40737' lon='30.93486' />
+ <node id='-30977' lat='3.50847' lon='30.94081' />
+ <node id='-30979' lat='3.26908' lon='30.84251' />
+ <node id='-30981' lat='2.9508' lon='30.8574' />
+ <node id='-30983' lat='3.04897' lon='30.77101' />
+ <node id='-30985' lat='2.5863' lon='30.75612' />
+ <node id='-30987' lat='2.83923' lon='30.8857' />
+ <node id='-30989' lat='2.42559' lon='30.83059' />
+ <node id='-30991' lat='2.30207' lon='31.07934' />
+ <node id='-30993' lat='2.35862' lon='31.06593' />
+ <node id='-30995' lat='2.27676' lon='31.12104' />
+ <node id='-30997' lat='2.2217' lon='31.20148' />
+ <node id='-30999' lat='2.29462' lon='31.1985' />
+ <node id='-31001' lat='2.41071' lon='30.96911' />
+ <node id='-31003' lat='2.33332' lon='30.91102' />
+ <node id='-31005' lat='2.43601' lon='30.74271' />
+ <node id='-31007' lat='-0.47969' lon='29.67474' />
+ <node id='-31009' lat='-0.55714' lon='29.67176' />
+ <node id='-31011' lat='-0.71055' lon='29.62708' />
+ <node id='-31013' lat='-0.8997' lon='29.63006' />
+ <node id='-31015' lat='-0.89821' lon='29.58388' />
+ <node id='-31017' lat='-0.46777' lon='29.65091' />
+ <node id='-31019' lat='0.16675' lon='29.77454' />
+ <node id='-31021' lat='0.07291' lon='29.7224' />
+ <node id='-31023' lat='0.64486' lon='29.95477' />
+ <node id='-31025' lat='0.52124' lon='29.97413' />
+ <node id='-31027' lat='0.39166' lon='29.87284' />
+ <node id='-31029' lat='0.16824' lon='29.81922' />
+ <node id='-31031' lat='0.99635' lon='30.22139' />
+ <node id='-31033' lat='1.14974' lon='30.24671' />
+ <node id='-31035' lat='0.89805' lon='30.1484' />
+ <node id='-31037' lat='0.84295' lon='29.98307' />
+ <node id='-31039' lat='-0.08051' lon='29.72687' />
+ <node id='-31041' lat='2.11006' lon='31.30127' />
+ <node id='-31043' lat='2.17853' lon='31.28042' />
+ <node id='-31045' lat='1.21675' lon='30.48503' />
+ <node id='-31047' lat='3.81339' lon='32.89746' />
+ <node id='-31049' lat='3.77327' lon='32.72021' />
+ <node id='-31051' lat='3.748' lon='32.41337' />
+ <node id='-31053' lat='3.6053' lon='32.20782' />
+ <node id='-31055' lat='3.50867' lon='32.19888' />
+ <node id='-31057' lat='3.53543' lon='32.08866' />
+ <node id='-31059' lat='3.59192' lon='32.04398' />
+ <node id='-31061' lat='3.57408' lon='31.95907' />
+ <node id='-31063' lat='3.78664' lon='31.86821' />
+ <node id='-31065' lat='3.6499' lon='31.96205' />
+ <node id='-31067' lat='3.74354' lon='31.72075' />
+ <node id='-31069' lat='3.63652' lon='31.50776' />
+ <node id='-31071' lat='3.67814' lon='31.50478' />
+ <node id='-31073' lat='3.8015' lon='31.29476' />
+ <node id='-31075' lat='3.82083' lon='31.81459' />
+ <node id='-31077' lat='3.693' lon='30.97601' />
+ <node id='-31079' lat='3.79853' lon='31.16666' />
+ <node id='-31081' lat='3.94079' lon='41.1754' />
+ <node id='-31083' lat='3.47834' lon='39.19954' />
+ <node id='-31085' lat='3.5267' lon='39.07736' />
+ <node id='-31087' lat='3.51198' lon='38.91938' />
+ <node id='-31089' lat='3.62551' lon='38.52336' />
+ <node id='-31091' lat='3.45521' lon='39.49444' />
+ <node id='-31093' lat='3.40895' lon='39.51551' />
+ <node id='-31095' lat='3.39634' lon='39.55132' />
+ <node id='-31097' lat='3.67058' lon='39.76808' />
+ <node id='-31099' lat='3.47434' lon='39.58339' />
+ <node id='-31101' lat='3.86974' lon='39.86043' />
+ <node id='-31103' lat='4.27683' lon='40.77498' />
+ <node id='-31105' lat='4.33503' lon='37.07724' />
+ <node id='-31107' lat='4.53244' lon='35.95449' />
+ <node id='-31109' lat='5.10757' lon='35.81968' />
+ <node id='-31111' lat='5.33413' lon='35.8576' />
+ <node id='-31113' lat='5.42431' lon='35.50792' />
+ <node id='-31115' lat='5.34042' lon='35.29938' />
+ <node id='-31117' lat='4.90402' lon='35.30992' />
+ <node id='-31119' lat='4.91872' lon='35.47843' />
+ <node id='-31121' lat='4.76969' lon='35.42366' />
+ <node id='-31123' lat='5.02364' lon='35.34151' />
+ <node id='-31125' lat='4.61643' lon='35.51424' />
+ <node id='-31127' lat='4.15235' lon='34.06046' />
+ <node id='-31129' lat='4.00526' lon='34.06641' />
+ <node id='-31131' lat='3.95474' lon='34.13195' />
+ <node id='-31133' lat='3.83734' lon='34.22579' />
+ <node id='-31135' lat='3.88192' lon='34.21685' />
+ <node id='-31137' lat='3.85815' lon='34.09323' />
+ <node id='-31139' lat='3.80464' lon='34.15429' />
+ <node id='-31141' lat='3.44342' lon='34.41794' />
+ <node id='-31143' lat='3.48802' lon='34.39112' />
+ <node id='-31145' lat='3.51627' lon='34.44922' />
+ <node id='-31147' lat='3.11478' lon='34.56242' />
+ <node id='-31149' lat='3.18319' lon='34.45815' />
+ <node id='-31151' lat='3.37949' lon='34.40006' />
+ <node id='-31153' lat='3.67385' lon='34.45815' />
+ <node id='-31155' lat='2.8753' lon='34.65774' />
+ <node id='-31157' lat='2.85447' lon='34.73967' />
+ <node id='-31159' lat='2.76223' lon='34.78137' />
+ <node id='-31161' lat='2.70272' lon='34.77244' />
+ <node id='-31163' lat='2.47209' lon='34.95267' />
+ <node id='-31165' lat='2.93034' lon='34.60114' />
+ <node id='-31167' lat='1.26626' lon='34.82606' />
+ <node id='-31169' lat='1.30944' lon='34.82606' />
+ <node id='-31171' lat='1.21265' lon='34.67562' />
+ <node id='-31173' lat='1.14712' lon='34.58029' />
+ <node id='-31175' lat='1.22754' lon='34.80223' />
+ <node id='-31177' lat='1.56109' lon='34.92734' />
+ <node id='-31179' lat='1.6668' lon='34.9899' />
+ <node id='-31181' lat='1.5596' lon='34.87819' />
+ <node id='-31183' lat='1.36752' lon='34.7918' />
+ <node id='-31185' lat='1.97348' lon='34.98692' />
+ <node id='-31187' lat='2.42447' lon='34.90947' />
+ <node id='-31189' lat='1.10692' lon='34.52369' />
+ <node id='-31191' lat='0.81502' lon='34.40453' />
+ <node id='-31193' lat='0.75693' lon='34.31516' />
+ <node id='-31195' lat='0.62289' lon='34.20196' />
+ <node id='-31197' lat='0.48884' lon='34.11408' />
+ <node id='-31199' lat='0.58118' lon='34.13493' />
+ <node id='-31201' lat='0.63182' lon='34.27345' />
+ <node id='-31203' lat='0.44713' lon='34.08727' />
+ <node id='-31205' lat='0.36372' lon='34.10067' />
+ <node id='-31207' lat='-0.54188' lon='33.9264' />
+ <node id='-31209' lat='-0.13079' lon='33.98449' />
+ <node id='-31211' lat='0.10581' lon='33.90936' />
+ <node id='-31213' lat='1.09868' lon='34.57427' />
+ <node id='-31215' lat='-13.12671' lon='32.98289' />
+ <node id='-31217' lat='-13.19492' lon='33.0078' />
+ <node id='-31219' lat='-12.88707' lon='33.02181' />
+ <node id='-31221' lat='-12.88251' lon='32.96733' />
+ <node id='-31223' lat='-12.54692' lon='33.28177' />
+ <node id='-31225' lat='-12.61377' lon='33.18837' />
+ <node id='-31227' lat='-12.54085' lon='33.37517' />
+ <node id='-31229' lat='-12.59554' lon='33.05917' />
+ <node id='-31231' lat='-12.76868' lon='32.94397' />
+ <node id='-31233' lat='-11.91252' lon='33.33937' />
+ <node id='-31235' lat='-11.59248' lon='33.32692' />
+ <node id='-31237' lat='-12.14242' lon='33.25998' />
+ <node id='-31239' lat='-12.32498' lon='33.47636' />
+ <node id='-31241' lat='-12.34931' lon='33.3705' />
+ <node id='-31243' lat='-12.35996' lon='33.54485' />
+ <node id='-31245' lat='-11.40637' lon='33.23663' />
+ <node id='-31247' lat='-11.43536' lon='33.29267' />
+ <node id='-31249' lat='-11.3789' lon='33.29267' />
+ <node id='-31251' lat='-11.15296' lon='33.39697' />
+ <node id='-31253' lat='-10.36077' lon='33.54797' />
+ <node id='-31255' lat='-10.20148' lon='33.53863' />
+ <node id='-31257' lat='-10.78465' lon='33.47636' />
+ <node id='-31259' lat='-10.56896' lon='33.70675' />
+ <node id='-31261' lat='-10.84428' lon='33.28022' />
+ <node id='-31263' lat='-10.88862' lon='33.25998' />
+ <node id='-31265' lat='-9.61316' lon='33.05485' />
+ <node id='-31267' lat='-9.66525' lon='33.10163' />
+ <node id='-31269' lat='-9.58929' lon='33.12144' />
+ <node id='-31271' lat='-9.5133' lon='33.00476' />
+ <node id='-31273' lat='-9.63053' lon='33.00256' />
+ <node id='-31275' lat='-9.9104' lon='33.37902' />
+ <node id='-31277' lat='-9.81063' lon='33.36581' />
+ <node id='-31279' lat='-9.82364' lon='33.31517' />
+ <node id='-31281' lat='-9.61099' lon='33.2095' />
+ <node id='-31283' lat='-10.05133' lon='33.31297' />
+ <node id='-31285' lat='-11.59302' lon='33.24252' />
+ <node id='-31287' lat='-9.31963' lon='32.76233' />
+ <node id='-31289' lat='-9.28583' lon='32.75611' />
+ <node id='-31291' lat='-9.24281' lon='32.53661' />
+ <node id='-31293' lat='-9.14754' lon='32.49147' />
+ <node id='-31295' lat='-9.07069' lon='31.98866' />
+ <node id='-31297' lat='-9.04609' lon='32.08206' />
+ <node id='-31299' lat='-9.13371' lon='32.25486' />
+ <node id='-31301' lat='-9.05993' lon='32.16146' />
+ <node id='-31303' lat='-9.11988' lon='32.43543' />
+ <node id='-31305' lat='-9.02303' lon='31.94196' />
+ <node id='-31307' lat='-8.60769' lon='31.37533' />
+ <node id='-31309' lat='-8.58615' lon='31.00796' />
+ <node id='-31311' lat='-8.70619' lon='31.57147' />
+ <node id='-31313' lat='-8.91386' lon='31.71158' />
+ <node id='-31315' lat='-8.88618' lon='31.81587' />
+ <node id='-31317' lat='-8.81388' lon='31.57147' />
+ <node id='-31319' lat='-8.93846' lon='31.94663' />
+ <node id='-31321' lat='-11.39799' lon='34.91153' />
+ <node id='-31323' lat='-11.32245' lon='34.79375' />
+ <node id='-31325' lat='-11.11731' lon='34.63305' />
+ <node id='-31327' lat='-10.93796' lon='34.67047' />
+ <node id='-31329' lat='-10.6828' lon='34.65946' />
+ <node id='-31331' lat='-10.56271' lon='34.57581' />
+ <node id='-31333' lat='-10.0678' lon='34.54499' />
+ <node id='-31335' lat='-9.58516' lon='33.76677' />
+ <node id='-31337' lat='-9.62206' lon='33.9638' />
+ <node id='-31339' lat='-9.54066' lon='33.95829' />
+ <node id='-31341' lat='-9.71647' lon='33.93298' />
+ <node id='-31343' lat='-9.49398' lon='34.03865' />
+ <node id='-31345' lat='-9.48554' lon='33.31581' />
+ <node id='-31347' lat='-9.49322' lon='33.14925' />
+ <node id='-31349' lat='49.1816' lon='110.64493' />
+ <node id='-31351' lat='49.16676' lon='110.24373' />
+ <node id='-31353' lat='49.22859' lon='109.51325' />
+ <node id='-31355' lat='49.34709' lon='109.18017' />
+ <node id='-31357' lat='49.25083' lon='110.39891' />
+ <node id='-31359' lat='49.53167' lon='108.27937' />
+ <node id='-31361' lat='49.66659' lon='107.95387' />
+ <node id='-31363' lat='50.04239' lon='107.1174' />
+ <node id='-31365' lat='50.30177' lon='106.80326' />
+ <node id='-31367' lat='50.1977' lon='107.00007' />
+ <node id='-31369' lat='50.34044' lon='106.58373' />
+ <node id='-31371' lat='50.34044' lon='106.0917' />
+ <node id='-31373' lat='50.39838' lon='106.08034' />
+ <node id='-31375' lat='50.13952' lon='103.70343' />
+ <node id='-31377' lat='50.38873' lon='102.71178' />
+ <node id='-31379' lat='50.67982' lon='102.32194' />
+ <node id='-31381' lat='51.50467' lon='101.5044' />
+ <node id='-31383' lat='51.45753' lon='101.39085' />
+ <node id='-31385' lat='51.74903' lon='99.89203' />
+ <node id='-31387' lat='51.73028' lon='100.61116' />
+ <node id='-31389' lat='51.96876' lon='99.27888' />
+ <node id='-31391' lat='51.90108' lon='99.75578' />
+ <node id='-31393' lat='52.14563' lon='98.87768' />
+ <node id='-31395' lat='51.8637' lon='98.74142' />
+ <node id='-31397' lat='50.61262' lon='98.06393' />
+ <node id='-31399' lat='50.78044' lon='97.9693' />
+ <node id='-31401' lat='50.86652' lon='98.01472' />
+ <node id='-31403' lat='51.00248' lon='97.83305' />
+ <node id='-31405' lat='51.46696' lon='98.05257' />
+ <node id='-31407' lat='49.99861' lon='97.76871' />
+ <node id='-31409' lat='49.92801' lon='97.56432' />
+ <node id='-31411' lat='49.84265' lon='97.56811' />
+ <node id='-31413' lat='50.33561' lon='98.29481' />
+ <node id='-31415' lat='49.91339' lon='97.85197' />
+ <node id='-31417' lat='50.4996' lon='98.31373' />
+ <node id='-31419' lat='49.88413' lon='96.97388' />
+ <node id='-31421' lat='50.04239' lon='95.80056' />
+ <node id='-31423' lat='49.97915' lon='95.74757' />
+ <node id='-31425' lat='49.96941' lon='95.02465' />
+ <node id='-31427' lat='50.04725' lon='94.97166' />
+ <node id='-31429' lat='50.17832' lon='94.49477' />
+ <node id='-31431' lat='50.04239' lon='94.6121' />
+ <node id='-31433' lat='49.74737' lon='97.24639' />
+ <node id='-31435' lat='50.22193' lon='94.39258' />
+ <node id='-31437' lat='50.78762' lon='92.44714' />
+ <node id='-31439' lat='50.79001' lon='93.01109' />
+ <node id='-31441' lat='50.63183' lon='92.99595' />
+ <node id='-31443' lat='50.73734' lon='91.86048' />
+ <node id='-31445' lat='49.90851' lon='89.59711' />
+ <node id='-31447' lat='49.44808' lon='88.82499' />
+ <node id='-31449' lat='49.72535' lon='89.70687' />
+ <node id='-31451' lat='48.11302' lon='88.8011' />
+ <node id='-31453' lat='48.10263' lon='88.93186' />
+ <node id='-31455' lat='48.21893' lon='88.58316' />
+ <node id='-31457' lat='48.34531' lon='88.58939' />
+ <node id='-31459' lat='48.58478' lon='87.96361' />
+ <node id='-31461' lat='48.71436' lon='88.0788' />
+ <node id='-31463' lat='47.41826' lon='90.48854' />
+ <node id='-31465' lat='47.30438' lon='90.48542' />
+ <node id='-31467' lat='47.68303' lon='90.33598' />
+ <node id='-31469' lat='47.7375' lon='90.10871' />
+ <node id='-31471' lat='47.88177' lon='90.06512' />
+ <node id='-31473' lat='47.82745' lon='89.76624' />
+ <node id='-31475' lat='48.0423' lon='89.55453' />
+ <node id='-31477' lat='46.72916' lon='91.03649' />
+ <node id='-31479' lat='46.58171' lon='91.0147' />
+ <node id='-31481' lat='46.99525' lon='90.84035' />
+ <node id='-31483' lat='46.57315' lon='91.07696' />
+ <node id='-31485' lat='46.04194' lon='91.03026' />
+ <node id='-31487' lat='46.30711' lon='90.89639' />
+ <node id='-31489' lat='45.07408' lon='91.64048' />
+ <node id='-31491' lat='44.35284' lon='94.71959' />
+ <node id='-31493' lat='44.71016' lon='94.10003' />
+ <node id='-31495' lat='44.95964' lon='93.51161' />
+ <node id='-31497' lat='42.67087' lon='100.84979' />
+ <node id='-31499' lat='42.68231' lon='100.33297' />
+ <node id='-31501' lat='42.15137' lon='102.42826' />
+ <node id='-31503' lat='41.89696' lon='103.3685' />
+ <node id='-31505' lat='42.22519' lon='102.07645' />
+ <node id='-31507' lat='42.14675' lon='102.72403' />
+ <node id='-31509' lat='41.64619' lon='104.91272' />
+ <node id='-31511' lat='42.41395' lon='107.29755' />
+ <node id='-31513' lat='42.36107' lon='107.24774' />
+ <node id='-31515' lat='42.46221' lon='107.49681' />
+ <node id='-31517' lat='42.28741' lon='106.76517' />
+ <node id='-31519' lat='42.45532' lon='108.23156' />
+ <node id='-31521' lat='42.44842' lon='109.452' />
+ <node id='-31523' lat='42.45302' lon='109.00679' />
+ <node id='-31525' lat='42.40246' lon='108.84489' />
+ <node id='-31527' lat='42.78293' lon='110.4327' />
+ <node id='-31529' lat='43.51207' lon='111.59087' />
+ <node id='-31531' lat='43.3289' lon='111.0149' />
+ <node id='-31533' lat='42.6411' lon='110.08401' />
+ <node id='-31535' lat='43.81596' lon='111.96289' />
+ <node id='-31537' lat='44.86297' lon='112.74662' />
+ <node id='-31539' lat='45.06858' lon='112.4164' />
+ <node id='-31541' lat='45.27189' lon='114.5166' />
+ <node id='-31543' lat='44.92847' lon='114.08071' />
+ <node id='-31545' lat='44.91444' lon='113.909' />
+ <node id='-31547' lat='45.39106' lon='115.35757' />
+ <node id='-31549' lat='45.96479' lon='116.26678' />
+ <node id='-31551' lat='46.33083' lon='116.75551' />
+ <node id='-31553' lat='46.35818' lon='117.07252' />
+ <node id='-31555' lat='46.61132' lon='119.37306' />
+ <node id='-31557' lat='46.6083' lon='119.30261' />
+ <node id='-31559' lat='46.64761' lon='119.24978' />
+ <node id='-31561' lat='46.77139' lon='118.89974' />
+ <node id='-31563' lat='46.72765' lon='118.92616' />
+ <node id='-31565' lat='46.74273' lon='119.00541' />
+ <node id='-31567' lat='46.77742' lon='118.8337' />
+ <node id='-31569' lat='46.65516' lon='119.10448' />
+ <node id='-31571' lat='46.68689' lon='118.78747' />
+ <node id='-31573' lat='46.73519' lon='118.30534' />
+ <node id='-31575' lat='46.50991' lon='117.69554' />
+ <node id='-31577' lat='46.59771' lon='117.60748' />
+ <node id='-31579' lat='46.90091' lon='119.91242' />
+ <node id='-31581' lat='46.92196' lon='119.85518' />
+ <node id='-31583' lat='47.19192' lon='119.71209' />
+ <node id='-31585' lat='47.24575' lon='119.62403' />
+ <node id='-31587' lat='47.24874' lon='119.56019' />
+ <node id='-31589' lat='47.29505' lon='119.54918' />
+ <node id='-31591' lat='46.66423' lon='119.89261' />
+ <node id='-31593' lat='46.62947' lon='119.77373' />
+ <node id='-31595' lat='46.67631' lon='119.80455' />
+ <node id='-31597' lat='46.59015' lon='119.68127' />
+ <node id='-31599' lat='46.62342' lon='119.65265' />
+ <node id='-31601' lat='48.03486' lon='118.22609' />
+ <node id='-31603' lat='48.03633' lon='118.10941' />
+ <node id='-31605' lat='48.00246' lon='118.29654' />
+ <node id='-31607' lat='48.00982' lon='118.03676' />
+ <node id='-31609' lat='47.77216' lon='117.50181' />
+ <node id='-31611' lat='47.89039' lon='116.67405' />
+ <node id='-31613' lat='37.21549' lon='44.75986' />
+ <node id='-31615' lat='37.2915' lon='44.81021' />
+ <node id='-31617' lat='37.6429' lon='44.56887' />
+ <node id='-31619' lat='37.60165' lon='44.61401' />
+ <node id='-31621' lat='37.45018' lon='44.58449' />
+ <node id='-31623' lat='37.85433' lon='44.3883' />
+ <node id='-31625' lat='37.783' lon='44.55498' />
+ <node id='-31627' lat='37.77065' lon='44.45948' />
+ <node id='-31629' lat='37.71985' lon='44.62096' />
+ <node id='-31631' lat='38.36117' lon='44.38309' />
+ <node id='-31633' lat='38.38295' lon='44.44386' />
+ <node id='-31635' lat='38.25763' lon='44.42476' />
+ <node id='-31637' lat='38.71427' lon='44.26155' />
+ <node id='-31639' lat='38.93881' lon='44.18863' />
+ <node id='-31641' lat='39.13975' lon='44.20946' />
+ <node id='-31643' lat='38.81581' lon='44.30322' />
+ <node id='-31645' lat='38.6465' lon='44.28065' />
+ <node id='-31647' lat='38.62752' lon='44.32058' />
+ <node id='-31649' lat='38.37887' lon='44.3119' />
+ <node id='-31651' lat='38.33939' lon='44.50115' />
+ <node id='-31653' lat='37.88859' lon='44.22509' />
+ <node id='-31655' lat='39.4131' lon='44.37921' />
+ <node id='-31657' lat='39.4169' lon='44.22452' />
+ <node id='-31659' lat='39.378' lon='44.29818' />
+ <node id='-31661' lat='39.61579' lon='44.48111' />
+ <node id='-31663' lat='39.56659' lon='44.41849' />
+ <node id='-31665' lat='39.4131' lon='44.42832' />
+ <node id='-31667' lat='39.39223' lon='44.03667' />
+ <node id='-31669' lat='39.71124' lon='44.71806' />
+ <node id='-31671' lat='39.72163' lon='44.65422' />
+ <node id='-31673' lat='39.78393' lon='44.6137' />
+ <node id='-31675' lat='42.10152' lon='27.22376' />
+ <node id='-31677' lat='42.08735' lon='27.08486' />
+ <node id='-31679' lat='42.06028' lon='27.19251' />
+ <node id='-31681' lat='42.10409' lon='27.27411' />
+ <node id='-31683' lat='41.99709' lon='27.83492' />
+ <node id='-31685' lat='41.94803' lon='27.81235' />
+ <node id='-31687' lat='41.97515' lon='27.69949' />
+ <node id='-31689' lat='41.97902' lon='27.91479' />
+ <node id='-31691' lat='41.90928' lon='27.55191' />
+ <node id='-31693' lat='42.0809' lon='27.03277' />
+ <node id='-31695' lat='41.97386' lon='26.79143' />
+ <node id='-31697' lat='42.00741' lon='26.95638' />
+ <node id='-31699' lat='41.90024' lon='26.57961' />
+ <node id='-31701' lat='41.92995' lon='26.56051' />
+ <node id='-31703' lat='41.97644' lon='26.62996' />
+ <node id='-31705' lat='41.82653' lon='26.53968' />
+ <node id='-31707' lat='41.82265' lon='26.36952' />
+ <node id='-31709' lat='43.19651' lon='42.75889' />
+ <node id='-31711' lat='43.08883' lon='43.03322' />
+ <node id='-31713' lat='43.02413' lon='43.0419' />
+ <node id='-31715' lat='42.74297' lon='43.81453' />
+ <node id='-31717' lat='42.62043' lon='43.73119' />
+ <node id='-31719' lat='42.74934' lon='44.88754' />
+ <node id='-31721' lat='42.61277' lon='44.80941' />
+ <node id='-31723' lat='42.74679' lon='44.70002' />
+ <node id='-31725' lat='42.70598' lon='45.15318' />
+ <node id='-31727' lat='42.55268' lon='45.36501' />
+ <node id='-31729' lat='42.48358' lon='45.78692' />
+ <node id='-31731' lat='42.75699' lon='44.54202' />
+ <node id='-31733' lat='42.55396' lon='43.95517' />
+ <node id='-31735' lat='42.20768' lon='45.61676' />
+ <node id='-31737' lat='43.57344' lon='40.10657' />
+ <node id='-31739' lat='43.23226' lon='42.40563' />
+ <node id='-31741' lat='43.22331' lon='41.64935' />
+ <node id='-31743' lat='43.56212' lon='40.65957' />
+ <node id='-31745' lat='43.13917' lon='42.66667' />
+ <node id='-31747' lat='41.17666' lon='43.44973' />
+ <node id='-31749' lat='41.2028' lon='43.36118' />
+ <node id='-31751' lat='41.25242' lon='43.1945' />
+ <node id='-31753' lat='41.17536' lon='43.23096' />
+ <node id='-31755' lat='41.25503' lon='43.13373' />
+ <node id='-31757' lat='41.37891' lon='43.02956' />
+ <node id='-31759' lat='41.50516' lon='42.8785' />
+ <node id='-31761' lat='41.30331' lon='43.21707' />
+ <node id='-31763' lat='41.47265' lon='42.84899' />
+ <node id='-31765' lat='41.50126' lon='42.78995' />
+ <node id='-31767' lat='41.59092' lon='42.8351' />
+ <node id='-31769' lat='41.58183' lon='42.59202' />
+ <node id='-31771' lat='41.49346' lon='42.26387' />
+ <node id='-31773' lat='41.52466' lon='41.95134' />
+ <node id='-31775' lat='41.43621' lon='41.81939' />
+ <node id='-31777' lat='20.92138' lon='15.57248' />
+ <node id='-31779' lat='14.64013' lon='13.67878' />
+ <node id='-31781' lat='14.55276' lon='13.68573' />
+ <node id='-31783' lat='14.72915' lon='13.809' />
+ <node id='-31785' lat='14.87519' lon='13.78991' />
+ <node id='-31787' lat='14.46704' lon='13.48259' />
+ <node id='-31789' lat='13.71195' lon='13.33213' />
+ <node id='-31791' lat='13.53984' lon='13.05085' />
+ <node id='-31793' lat='13.29157' lon='12.6793' />
+ <node id='-31795' lat='13.27805' lon='12.58033' />
+ <node id='-31797' lat='13.48919' lon='12.87376' />
+ <node id='-31799' lat='13.52802' lon='13.19844' />
+ <node id='-31801' lat='13.10056' lon='12.16189' />
+ <node id='-31803' lat='13.14452' lon='12.04209' />
+ <node id='-31805' lat='13.12423' lon='12.19315' />
+ <node id='-31807' lat='13.2527' lon='11.88236' />
+ <node id='-31809' lat='13.06673' lon='12.47095' />
+ <node id='-31811' lat='13.28819' lon='10.46731' />
+ <node id='-31813' lat='13.36422' lon='10.66004' />
+ <node id='-31815' lat='13.37773' lon='11.4535' />
+ <node id='-31817' lat='13.18171' lon='10.00373' />
+ <node id='-31819' lat='12.83661' lon='8.97413' />
+ <node id='-31821' lat='12.80614' lon='9.65995' />
+ <node id='-31823' lat='13.01768' lon='8.60431' />
+ <node id='-31825' lat='13.07519' lon='8.49493' />
+ <node id='-31827' lat='12.93985' lon='8.64251' />
+ <node id='-31829' lat='13.02445' lon='7.12676' />
+ <node id='-31831' lat='13.1293' lon='7.22399' />
+ <node id='-31833' lat='13.00076' lon='7.0521' />
+ <node id='-31835' lat='13.20369' lon='8.25185' />
+ <node id='-31837' lat='13.30847' lon='8.07997' />
+ <node id='-31839' lat='13.34902' lon='7.81085' />
+ <node id='-31841' lat='13.09717' lon='7.39241' />
+ <node id='-31843' lat='13.06166' lon='8.41853' />
+ <node id='-31845' lat='13.27129' lon='10.19993' />
+ <node id='-31847' lat='13.6006' lon='6.43053' />
+ <node id='-31849' lat='13.34057' lon='6.69617' />
+ <node id='-31851' lat='12.99825' lon='6.94445' />
+ <node id='-31853' lat='11.88495' lon='3.31613' />
+ <node id='-31855' lat='12.01467' lon='3.25352' />
+ <node id='-31857' lat='11.86092' lon='3.48187' />
+ <node id='-31859' lat='12.10952' lon='2.39657' />
+ <node id='-31861' lat='12.30631' lon='2.6593' />
+ <node id='-31863' lat='12.40585' lon='2.83978' />
+ <node id='-31865' lat='13.83567' lon='5.35437' />
+ <node id='-31867' lat='13.75474' lon='5.27797' />
+ <node id='-31869' lat='13.7345' lon='4.9368' />
+ <node id='-31871' lat='13.75052' lon='5.07396' />
+ <node id='-31873' lat='13.33968' lon='1.24516' />
+ <node id='-31875' lat='13.37853' lon='1.21217' />
+ <node id='-31877' lat='13.35488' lon='1.28509' />
+ <node id='-31879' lat='13.39373' lon='1.24429' />
+ <node id='-31881' lat='13.38951' lon='1.20088' />
+ <node id='-31883' lat='13.31771' lon='1.18873' />
+ <node id='-31885' lat='13.5668' lon='0.99514' />
+ <node id='-31887' lat='13.64442' lon='0.77637' />
+ <node id='-31889' lat='13.46635' lon='1.02813' />
+ <node id='-31891' lat='13.6866' lon='0.77377' />
+ <node id='-31893' lat='13.37515' lon='0.99253' />
+ <node id='-31895' lat='13.10727' lon='0.99167' />
+ <node id='-31897' lat='14.05575' lon='0.38051' />
+ <node id='-31899' lat='13.68491' lon='0.61924' />
+ <node id='-31901' lat='11.98672' lon='2.45824' />
+ <node id='-31903' lat='11.04719' lon='1.03409' />
+ <node id='-31905' lat='11.08876' lon='0.9813' />
+ <node id='-31907' lat='11.68254' lon='2.29983' />
+ <node id='-31909' lat='11.42227' lon='2.00988' />
+ <node id='-31911' lat='11.46822' lon='1.42823' />
+ <node id='-31913' lat='-3.52798' lon='11.57949' />
+ <node id='-31915' lat='-3.51089' lon='11.48764' />
+ <node id='-31917' lat='-3.69888' lon='11.22301' />
+ <node id='-31919' lat='-3.30267' lon='11.96554' />
+ <node id='-31921' lat='-3.0773' lon='11.70558' />
+ <node id='-31923' lat='-3.00424' lon='11.80365' />
+ <node id='-31925' lat='-2.81146' lon='11.64798' />
+ <node id='-31927' lat='-2.85654' lon='11.5359' />
+ <node id='-31929' lat='-2.61865' lon='11.64487' />
+ <node id='-31931' lat='-2.39936' lon='11.74605' />
+ <node id='-31933' lat='-2.33559' lon='11.96866' />
+ <node id='-31935' lat='-1.91091' lon='12.82172' />
+ <node id='-31937' lat='-1.8129' lon='12.61312' />
+ <node id='-31939' lat='-1.92025' lon='12.44656' />
+ <node id='-31941' lat='-2.32626' lon='12.47925' />
+ <node id='-31943' lat='-2.15671' lon='14.23518' />
+ <node id='-31945' lat='-2.23916' lon='14.16202' />
+ <node id='-31947' lat='-2.33715' lon='14.23829' />
+ <node id='-31949' lat='-2.49268' lon='14.10442' />
+ <node id='-31951' lat='-2.46935' lon='13.85846' />
+ <node id='-31953' lat='-2.35581' lon='13.92073' />
+ <node id='-31955' lat='-2.09293' lon='13.75884' />
+ <node id='-31957' lat='-0.38261' lon='14.2165' />
+ <node id='-31959' lat='-0.20826' lon='14.06862' />
+ <node id='-31961' lat='-0.44799' lon='14.41887' />
+ <node id='-31963' lat='0.58563' lon='14.10909' />
+ <node id='-31965' lat='0.26652' lon='13.88648' />
+ <node id='-31967' lat='1.4261' lon='13.89582' />
+ <node id='-31969' lat='1.57238' lon='13.13461' />
+ <node id='-31971' lat='1.32339' lon='13.25447' />
+ <node id='-31973' lat='2.25716' lon='13.28534' />
+ <node id='-31975' lat='10.69273' lon='-8.32614' />
+ <node id='-31977' lat='10.91762' lon='-8.2667' />
+ <node id='-31979' lat='10.24677' lon='-7.3707' />
+ <node id='-31981' lat='10.44602' lon='-7.44555' />
+ <node id='-31983' lat='10.4655' lon='-7.52261' />
+ <node id='-31985' lat='10.40921' lon='-7.54462' />
+ <node id='-31987' lat='10.46334' lon='-7.63048' />
+ <node id='-31989' lat='10.15577' lon='-7.92107' />
+ <node id='-31991' lat='10.46767' lon='-5.65135' />
+ <node id='-31993' lat='10.43952' lon='-5.78124' />
+ <node id='-31995' lat='10.19694' lon='-5.99478' />
+ <node id='-31997' lat='10.46983' lon='-6.1731' />
+ <node id='-31999' lat='10.24244' lon='-6.18851' />
+ <node id='-32001' lat='10.35074' lon='-6.68164' />
+ <node id='-32003' lat='10.35291' lon='-6.93921' />
+ <node id='-32005' lat='10.25111' lon='-7.01186' />
+ <node id='-32007' lat='10.21644' lon='-6.97444' />
+ <node id='-32009' lat='10.15794' lon='-7.00966' />
+ <node id='-32011' lat='10.59104' lon='-6.52974' />
+ <node id='-32013' lat='10.68624' lon='-6.325' />
+ <node id='-32015' lat='10.69922' lon='-6.40646' />
+ <node id='-32017' lat='10.5694' lon='-6.42847' />
+ <node id='-32019' lat='10.74248' lon='-6.24795' />
+ <node id='-32021' lat='10.66893' lon='-6.63541' />
+ <node id='-32023' lat='10.14711' lon='-7.0603' />
+ <node id='-32025' lat='10.84628' lon='-5.41579' />
+ <node id='-32027' lat='10.75329' lon='-5.47083' />
+ <node id='-32029' lat='10.56074' lon='-5.46643' />
+ <node id='-32031' lat='11.43811' lon='-5.20665' />
+ <node id='-32033' lat='11.36905' lon='-5.25509' />
+ <node id='-32035' lat='11.60421' lon='-5.22867' />
+ <node id='-32037' lat='11.24816' lon='-5.25949' />
+ <node id='-32039' lat='11.21578' lon='-5.32553' />
+ <node id='-32041' lat='11.13371' lon='-5.32994' />
+ <node id='-32043' lat='11.07538' lon='-5.49284' />
+ <node id='-32045' lat='11.61715' lon='-5.29251' />
+ <node id='-32047' lat='11.84778' lon='-5.26389' />
+ <node id='-32049' lat='11.75728' lon='-5.26389' />
+ <node id='-32051' lat='11.8327' lon='-5.40258' />
+ <node id='-32053' lat='11.97918' lon='-5.07897' />
+ <node id='-32055' lat='12.01579' lon='-4.72893' />
+ <node id='-32057' lat='12.31922' lon='-4.41412' />
+ <node id='-32059' lat='12.19875' lon='-4.57703' />
+ <node id='-32061' lat='12.1385' lon='-4.54841' />
+ <node id='-32063' lat='12.13204' lon='-4.62546' />
+ <node id='-32065' lat='12.06531' lon='-4.62987' />
+ <node id='-32067' lat='12.06746' lon='-4.70692' />
+ <node id='-32069' lat='12.71467' lon='-4.238' />
+ <node id='-32071' lat='12.71252' lon='-4.47356' />
+ <node id='-32073' lat='12.95722' lon='-4.21819' />
+ <node id='-32075' lat='13.1781' lon='-3.54454' />
+ <node id='-32077' lat='13.38164' lon='-3.96282' />
+ <node id='-32079' lat='13.44375' lon='-3.90558' />
+ <node id='-32081' lat='13.36665' lon='-3.7911' />
+ <node id='-32083' lat='14.14713' lon='-2.66175' />
+ <node id='-32085' lat='13.81174' lon='-2.90831' />
+ <node id='-32087' lat='14.05532' lon='-2.84667' />
+ <node id='-32089' lat='13.64921' lon='-2.88189' />
+ <node id='-32091' lat='14.96961' lon='0.06588' />
+ <node id='-32093' lat='15.07805' lon='-0.24673' />
+ <node id='-32095' lat='15.08655' lon='-0.72004' />
+ <node id='-32097' lat='14.95898' lon='0.72632' />
+ <node id='-32099' lat='15.34571' lon='3.01806' />
+ <node id='-32101' lat='17.00118' lon='4.21787' />
+ <node id='-32103' lat='28.63371' lon='80.37188' />
+ <node id='-32105' lat='28.82346' lon='80.12125' />
+ <node id='-32107' lat='28.63098' lon='80.44504' />
+ <node id='-32109' lat='29.20327' lon='80.28626' />
+ <node id='-32111' lat='29.13938' lon='80.26602' />
+ <node id='-32113' lat='29.21414' lon='80.24112' />
+ <node id='-32115' lat='29.11626' lon='80.23178' />
+ <node id='-32117' lat='29.1353' lon='80.17262' />
+ <node id='-32119' lat='28.91479' lon='80.05743' />
+ <node id='-32121' lat='29.30784' lon='80.31428' />
+ <node id='-32123' lat='29.43672' lon='80.24734' />
+ <node id='-32125' lat='29.63581' lon='80.41858' />
+ <node id='-32127' lat='29.88176' lon='80.56957' />
+ <node id='-32129' lat='29.80345' lon='80.42636' />
+ <node id='-32131' lat='29.79939' lon='80.48551' />
+ <node id='-32133' lat='29.95732' lon='80.67076' />
+ <node id='-32135' lat='29.95732' lon='80.60226' />
+ <node id='-32137' lat='30.13384' lon='80.8778' />
+ <node id='-32139' lat='30.17018' lon='80.86846' />
+ <node id='-32141' lat='30.22535' lon='80.91983' />
+ <node id='-32143' lat='30.18229' lon='80.93695' />
+ <node id='-32145' lat='29.7467' lon='80.36409' />
+ <node id='-32147' lat='28.6706' lon='80.50575' />
+ <node id='-32149' lat='28.54897' lon='80.52443' />
+ <node id='-32151' lat='28.47237' lon='80.89648' />
+ <node id='-32153' lat='28.68972' lon='80.55245' />
+ <node id='-32155' lat='28.17638' lon='81.38683' />
+ <node id='-32157' lat='28.13521' lon='81.32923' />
+ <node id='-32159' lat='28.12148' lon='81.48179' />
+ <node id='-32161' lat='28.08303' lon='81.47867' />
+ <node id='-32163' lat='28.36284' lon='81.19847' />
+ <node id='-32165' lat='27.33885' lon='83.35136' />
+ <node id='-32167' lat='27.32778' lon='83.29999' />
+ <node id='-32169' lat='27.36235' lon='83.2673' />
+ <node id='-32171' lat='27.39276' lon='83.38872' />
+ <node id='-32173' lat='27.47013' lon='83.61288' />
+ <node id='-32175' lat='27.4798' lon='83.39495' />
+ <node id='-32177' lat='27.38309' lon='83.27197' />
+ <node id='-32179' lat='27.45632' lon='83.19413' />
+ <node id='-32181' lat='27.46737' lon='82.94818' />
+ <node id='-32183' lat='27.50328' lon='82.93261' />
+ <node id='-32185' lat='27.50052' lon='82.74737' />
+ <node id='-32187' lat='27.92222' lon='82.06554' />
+ <node id='-32189' lat='27.6716' lon='82.46405' />
+ <node id='-32191' lat='27.72122' lon='82.70378' />
+ <node id='-32193' lat='27.93322' lon='81.97214' />
+ <node id='-32195' lat='27.85618' lon='81.90365' />
+ <node id='-32197' lat='27.45218' lon='84.21376' />
+ <node id='-32199' lat='27.44941' lon='84.25735' />
+ <node id='-32201' lat='27.52399' lon='84.10791' />
+ <node id='-32203' lat='27.43836' lon='84.02229' />
+ <node id='-32205' lat='27.38032' lon='83.88063' />
+ <node id='-32207' lat='27.42731' lon='83.83393' />
+ <node id='-32209' lat='27.44527' lon='83.84483' />
+ <node id='-32211' lat='27.39' lon='84.29315' />
+ <node id='-32213' lat='27.21294' lon='84.69166' />
+ <node id='-32215' lat='27.33885' lon='84.62161' />
+ <node id='-32217' lat='26.9149' lon='84.97186' />
+ <node id='-32219' lat='26.95931' lon='84.97342' />
+ <node id='-32221' lat='27.02034' lon='84.83487' />
+ <node id='-32223' lat='26.99261' lon='84.85511' />
+ <node id='-32225' lat='27.00648' lon='84.75548' />
+ <node id='-32227' lat='26.88991' lon='85.05592' />
+ <node id='-32229' lat='26.85381' lon='85.02635' />
+ <node id='-32231' lat='26.80519' lon='85.18046' />
+ <node id='-32233' lat='26.86909' lon='85.19291' />
+ <node id='-32235' lat='26.74543' lon='85.33301' />
+ <node id='-32237' lat='26.75933' lon='85.21159' />
+ <node id='-32239' lat='27.04669' lon='84.64496' />
+ <node id='-32241' lat='26.63417' lon='85.76732' />
+ <node id='-32243' lat='26.60216' lon='85.84205' />
+ <node id='-32245' lat='26.57153' lon='85.8545' />
+ <node id='-32247' lat='26.80936' lon='85.73152' />
+ <node id='-32249' lat='26.67034' lon='85.72374' />
+ <node id='-32251' lat='26.45592' lon='86.76983' />
+ <node id='-32253' lat='26.50468' lon='86.90214' />
+ <node id='-32255' lat='26.43919' lon='86.82898' />
+ <node id='-32257' lat='26.47125' lon='86.88813' />
+ <node id='-32259' lat='26.58685' lon='87.04691' />
+ <node id='-32261' lat='26.53115' lon='87.00955' />
+ <node id='-32263' lat='26.52558' lon='86.9504' />
+ <node id='-32265' lat='26.54508' lon='86.52698' />
+ <node id='-32267' lat='26.42386' lon='86.74025' />
+ <node id='-32269' lat='26.61886' lon='86.26235' />
+ <node id='-32271' lat='26.59381' lon='86.22343' />
+ <node id='-32273' lat='26.66756' lon='86.02729' />
+ <node id='-32275' lat='26.42386' lon='87.53727' />
+ <node id='-32277' lat='26.40294' lon='87.66803' />
+ <node id='-32279' lat='26.44058' lon='87.83926' />
+ <node id='-32281' lat='26.46288' lon='87.79101' />
+ <node id='-32283' lat='26.40573' lon='87.75209' />
+ <node id='-32285' lat='26.43501' lon='87.67893' />
+ <node id='-32287' lat='26.46706' lon='87.88752' />
+ <node id='-32289' lat='26.38342' lon='87.59175' />
+ <node id='-32291' lat='26.44058' lon='87.46566' />
+ <node id='-32293' lat='26.41549' lon='87.36915' />
+ <node id='-32295' lat='26.37645' lon='87.26796' />
+ <node id='-32297' lat='26.41549' lon='87.26485' />
+ <node id='-32299' lat='26.40294' lon='87.15744' />
+ <node id='-32301' lat='26.4587' lon='87.08739' />
+ <node id='-32303' lat='26.34995' lon='87.33957' />
+ <node id='-32305' lat='26.58685' lon='87.07338' />
+ <node id='-32307' lat='26.87325' lon='85.63189' />
+ <node id='-32309' lat='27.34852' lon='83.86351' />
+ <node id='-32311' lat='27.79285' lon='88.19107' />
+ <node id='-32313' lat='27.43007' lon='88.07277' />
+ <node id='-32315' lat='27.49223' lon='88.04008' />
+ <node id='-32317' lat='27.85067' lon='88.1973' />
+ <node id='-32319' lat='26.98151' lon='88.12414' />
+ <node id='-32321' lat='26.75516' lon='88.19107' />
+ <node id='-32323' lat='26.50608' lon='88.09456' />
+ <node id='-32325' lat='26.46288' lon='88.10546' />
+ <node id='-32327' lat='27.11045' lon='87.9887' />
+ <node id='-32329' lat='27.91672' lon='87.88752' />
+ <node id='-32331' lat='27.84517' lon='87.56996' />
+ <node id='-32333' lat='27.84104' lon='87.11696' />
+ <node id='-32335' lat='27.94835' lon='87.03757' />
+ <node id='-32337' lat='27.80938' lon='87.72718' />
+ <node id='-32339' lat='27.95248' lon='87.82681' />
+ <node id='-32341' lat='28.10912' lon='86.68421' />
+ <node id='-32343' lat='28.07067' lon='86.62505' />
+ <node id='-32345' lat='28.04182' lon='86.75582' />
+ <node id='-32347' lat='28.10638' lon='86.74181' />
+ <node id='-32349' lat='28.11599' lon='86.56746' />
+ <node id='-32351' lat='27.96623' lon='86.51609' />
+ <node id='-32353' lat='27.91122' lon='86.42736' />
+ <node id='-32355' lat='27.9786' lon='86.22966' />
+ <node id='-32357' lat='28.38475' lon='85.69105' />
+ <node id='-32359' lat='28.25045' lon='85.60854' />
+ <node id='-32361' lat='28.30529' lon='85.59765' />
+ <node id='-32363' lat='28.32996' lon='85.4233' />
+ <node id='-32365' lat='28.28336' lon='85.38127' />
+ <node id='-32367' lat='28.54076' lon='85.18668' />
+ <node id='-32369' lat='28.39571' lon='85.1213' />
+ <node id='-32371' lat='28.45594' lon='85.10262' />
+ <node id='-32373' lat='28.34092' lon='85.10729' />
+ <node id='-32375' lat='28.68562' lon='85.11975' />
+ <node id='-32377' lat='28.62825' lon='85.19135' />
+ <node id='-32379' lat='28.05144' lon='85.90743' />
+ <node id='-32381' lat='28.18187' lon='85.84672' />
+ <node id='-32383' lat='28.23126' lon='85.74864' />
+ <node id='-32385' lat='28.09127' lon='86.11913' />
+ <node id='-32387' lat='28.09264' lon='86.088' />
+ <node id='-32389' lat='28.02121' lon='86.08333' />
+ <node id='-32391' lat='27.93047' lon='86.12069' />
+ <node id='-32393' lat='27.90021' lon='86.06309' />
+ <node id='-32395' lat='27.9401' lon='85.94946' />
+ <node id='-32397' lat='27.99372' lon='85.97436' />
+ <node id='-32399' lat='28.38064' lon='85.71907' />
+ <node id='-32401' lat='28.17364' lon='86.18607' />
+ <node id='-32403' lat='29.30513' lon='83.44787' />
+ <node id='-32405' lat='29.42045' lon='83.40896' />
+ <node id='-32407' lat='29.42858' lon='83.37627' />
+ <node id='-32409' lat='29.76427' lon='82.73803' />
+ <node id='-32411' lat='29.62498' lon='83.12875' />
+ <node id='-32413' lat='29.61957' lon='83.07116' />
+ <node id='-32415' lat='29.70749' lon='82.92327' />
+ <node id='-32417' lat='29.68992' lon='82.84544' />
+ <node id='-32419' lat='28.59545' lon='84.97342' />
+ <node id='-32421' lat='28.58041' lon='84.85511' />
+ <node id='-32423' lat='28.63371' lon='84.70723' />
+ <node id='-32425' lat='28.73887' lon='84.62317' />
+ <node id='-32427' lat='28.74023' lon='84.47528' />
+ <node id='-32429' lat='28.863' lon='84.39589' />
+ <node id='-32431' lat='29.0496' lon='84.1873' />
+ <node id='-32433' lat='29.02783' lon='84.24801' />
+ <node id='-32435' lat='29.23451' lon='84.18107' />
+ <node id='-32437' lat='29.33091' lon='83.97559' />
+ <node id='-32439' lat='29.30513' lon='83.82303' />
+ <node id='-32441' lat='29.16249' lon='83.63156' />
+ <node id='-32443' lat='28.89571' lon='84.2231' />
+ <node id='-32445' lat='29.50583' lon='83.32334' />
+ <node id='-32447' lat='29.50177' lon='83.2782' />
+ <node id='-32449' lat='29.54918' lon='83.25952' />
+ <node id='-32451' lat='29.21685' lon='83.52726' />
+ <node id='-32453' lat='29.76967' lon='82.68666' />
+ <node id='-32455' lat='29.87096' lon='82.63373' />
+ <node id='-32457' lat='29.81695' lon='82.73024' />
+ <node id='-32459' lat='29.85341' lon='82.69911' />
+ <node id='-32461' lat='29.83856' lon='82.63062' />
+ <node id='-32463' lat='29.9735' lon='82.5341' />
+ <node id='-32465' lat='29.95057' lon='82.49519' />
+ <node id='-32467' lat='30.02608' lon='82.38622' />
+ <node id='-32469' lat='30.23745' lon='82.10757' />
+ <node id='-32471' lat='30.16884' lon='82.19475' />
+ <node id='-32473' lat='30.33423' lon='81.99082' />
+ <node id='-32475' lat='30.44703' lon='81.62033' />
+ <node id='-32477' lat='30.41347' lon='81.60788' />
+ <node id='-32479' lat='30.35439' lon='82.10135' />
+ <node id='-32481' lat='30.43092' lon='81.55807' />
+ <node id='-32483' lat='30.37319' lon='81.54717' />
+ <node id='-32485' lat='30.21862' lon='81.39928' />
+ <node id='-32487' lat='30.15942' lon='81.3339' />
+ <node id='-32489' lat='30.08806' lon='81.29032' />
+ <node id='-32491' lat='30.14596' lon='81.2623' />
+ <node id='-32493' lat='30.0126' lon='81.24362' />
+ <node id='-32495' lat='30.01395' lon='81.12842' />
+ <node id='-32497' lat='30.42153' lon='81.41018' />
+ <node id='-32499' lat='30.0692' lon='82.16984' />
+ <node id='-32501' lat='29.56813' lon='83.28131' />
+ <node id='-32503' lat='28.68562' lon='85.06059' />
+ <node id='-32505' lat='46.38282' lon='16.18824' />
+ <node id='-32507' lat='46.40429' lon='16.1431' />
+ <node id='-32509' lat='46.39141' lon='16.05281' />
+ <node id='-32511' lat='46.30652' lon='15.97965' />
+ <node id='-32513' lat='46.3463' lon='16.07616' />
+ <node id='-32515' lat='46.09103' lon='15.62317' />
+ <node id='-32517' lat='46.14714' lon='15.59515' />
+ <node id='-32519' lat='46.19134' lon='15.65119' />
+ <node id='-32521' lat='46.22473' lon='15.67765' />
+ <node id='-32523' lat='46.21719' lon='15.78817' />
+ <node id='-32525' lat='46.25811' lon='15.79284' />
+ <node id='-32527' lat='46.21396' lon='15.6434' />
+ <node id='-32529' lat='45.82915' lon='15.64185' />
+ <node id='-32531' lat='45.85193' lon='15.5718' />
+ <node id='-32533' lat='45.86819' lon='15.68232' />
+ <node id='-32535' lat='45.8465' lon='15.70411' />
+ <node id='-32537' lat='46.04891' lon='15.72746' />
+ <node id='-32539' lat='45.6303' lon='15.31027' />
+ <node id='-32541' lat='45.60961' lon='15.28537' />
+ <node id='-32543' lat='45.65207' lon='15.40056' />
+ <node id='-32545' lat='45.71623' lon='15.34919' />
+ <node id='-32547' lat='45.53224' lon='15.30249' />
+ <node id='-32549' lat='45.45258' lon='15.33051' />
+ <node id='-32551' lat='45.46678' lon='15.27758' />
+ <node id='-32553' lat='45.48752' lon='15.38188' />
+ <node id='-32555' lat='45.49079' lon='15.05187' />
+ <node id='-32557' lat='45.48533' lon='15.02385' />
+ <node id='-32559' lat='45.42309' lon='15.16862' />
+ <node id='-32561' lat='45.47769' lon='14.90554' />
+ <node id='-32563' lat='45.45913' lon='14.81992' />
+ <node id='-32565' lat='45.53442' lon='14.71718' />
+ <node id='-32567' lat='45.49515' lon='14.80124' />
+ <node id='-32569' lat='45.52788' lon='14.92266' />
+ <node id='-32571' lat='45.69014' lon='15.30872' />
+ <node id='-32573' lat='45.53006' lon='14.68605' />
+ <node id='-32575' lat='45.57366' lon='14.69694' />
+ <node id='-32577' lat='45.62812' lon='14.59576' />
+ <node id='-32579' lat='45.66403' lon='14.60977' />
+ <node id='-32581' lat='45.45258' lon='13.97309' />
+ <node id='-32583' lat='45.45149' lon='13.90771' />
+ <node id='-32585' lat='45.42637' lon='13.88124' />
+ <node id='-32587' lat='45.47551' lon='13.99488' />
+ <node id='-32589' lat='45.43729' lon='13.81742' />
+ <node id='-32591' lat='45.54424' lon='14.49769' />
+ <node id='-32593' lat='45.6205' lon='14.53816' />
+ <node id='-32595' lat='45.60852' lon='14.5008' />
+ <node id='-32597' lat='45.48642' lon='14.36693' />
+ <node id='-32599' lat='45.47878' lon='14.26886' />
+ <node id='-32601' lat='45.50607' lon='14.24239' />
+ <node id='-32603' lat='45.50388' lon='14.22371' />
+ <node id='-32605' lat='45.48752' lon='14.07116' />
+ <node id='-32607' lat='45.46896' lon='14.20348' />
+ <node id='-32609' lat='45.52352' lon='14.00578' />
+ <node id='-32611' lat='45.50825' lon='13.96063' />
+ <node id='-32613' lat='45.67165' lon='14.57397' />
+ <node id='-32615' lat='45.46787' lon='13.7785' />
+ <node id='-32617' lat='45.72275' lon='15.25423' />
+ <node id='-32619' lat='46.49653' lon='16.23961' />
+ <node id='-32621' lat='46.55008' lon='16.37193' />
+ <node id='-32623' lat='46.52331' lon='16.44354' />
+ <node id='-32625' lat='46.47831' lon='16.52604' />
+ <node id='-32627' lat='46.5051' lon='16.52604' />
+ <node id='-32629' lat='46.63673' lon='16.39217' />
+ <node id='-32631' lat='46.6549' lon='16.38594' />
+ <node id='-32633' lat='46.66238' lon='16.41863' />
+ <node id='-32635' lat='46.69975' lon='16.37816' />
+ <node id='-32637' lat='46.69228' lon='16.42641' />
+ <node id='-32639' lat='46.7787' lon='16.30966' />
+ <node id='-32641' lat='46.80215' lon='16.31278' />
+ <node id='-32643' lat='46.80641' lon='16.3408' />
+ <node id='-32645' lat='46.83836' lon='16.34547' />
+ <node id='-32647' lat='46.87137' lon='16.2941' />
+ <node id='-32649' lat='46.87775' lon='16.2365' />
+ <node id='-32651' lat='46.85434' lon='16.15711' />
+ <node id='-32653' lat='46.82772' lon='15.99054' />
+ <node id='-32655' lat='46.74991' lon='15.98432' />
+ <node id='-32657' lat='46.68694' lon='16.04347' />
+ <node id='-32659' lat='46.67947' lon='15.99988' />
+ <node id='-32661' lat='46.6549' lon='16.04036' />
+ <node id='-32663' lat='46.7211' lon='15.87691' />
+ <node id='-32665' lat='46.71897' lon='15.8162' />
+ <node id='-32667' lat='46.69869' lon='15.77261' />
+ <node id='-32669' lat='46.69548' lon='15.72279' />
+ <node id='-32671' lat='46.70616' lon='15.6543' />
+ <node id='-32673' lat='46.69228' lon='15.6543' />
+ <node id='-32675' lat='46.67947' lon='15.62317' />
+ <node id='-32677' lat='46.68908' lon='15.59826' />
+ <node id='-32679' lat='46.66985' lon='15.54533' />
+ <node id='-32681' lat='46.63138' lon='15.53599' />
+ <node id='-32683' lat='46.6581' lon='15.42703' />
+ <node id='-32685' lat='46.63994' lon='15.23711' />
+ <node id='-32687' lat='46.61321' lon='15.46906' />
+ <node id='-32689' lat='46.66131' lon='15.14215' />
+ <node id='-32691' lat='46.641' lon='15.01451' />
+ <node id='-32693' lat='46.60786' lon='14.9787' />
+ <node id='-32695' lat='46.61214' lon='14.92266' />
+ <node id='-32697' lat='46.63459' lon='14.96002' />
+ <node id='-32699' lat='46.56614' lon='14.83549' />
+ <node id='-32701' lat='46.61' lon='14.87129' />
+ <node id='-32703' lat='46.44936' lon='14.66892' />
+ <node id='-32705' lat='46.49974' lon='14.72185' />
+ <node id='-32707' lat='46.51046' lon='14.81836' />
+ <node id='-32709' lat='46.43434' lon='14.5942' />
+ <node id='-32711' lat='46.41717' lon='14.45877' />
+ <node id='-32713' lat='46.42576' lon='14.52571' />
+ <node id='-32715' lat='46.37208' lon='14.56463' />
+ <node id='-32717' lat='46.43327' lon='14.314' />
+ <node id='-32719' lat='46.44614' lon='14.42608' />
+ <node id='-32721' lat='46.44185' lon='14.27975' />
+ <node id='-32723' lat='46.43327' lon='14.15989' />
+ <node id='-32725' lat='46.47724' lon='14.12097' />
+ <node id='-32727' lat='46.49117' lon='14.04002' />
+ <node id='-32729' lat='46.48474' lon='14.00422' />
+ <node id='-32731' lat='46.52331' lon='13.89837' />
+ <node id='-32733' lat='26.88883' lon='89.094' />
+ <node id='-32735' lat='26.85689' lon='89.36798' />
+ <node id='-32737' lat='26.81661' lon='89.12825' />
+ <node id='-32739' lat='27.144' lon='88.74219' />
+ <node id='-32741' lat='27.10937' lon='88.86984' />
+ <node id='-32743' lat='26.97488' lon='88.8714' />
+ <node id='-32745' lat='26.71932' lon='89.98287' />
+ <node id='-32747' lat='26.77215' lon='90.67715' />
+ <node id='-32749' lat='27.07334' lon='92.03457' />
+ <node id='-32751' lat='26.893' lon='92.11863' />
+ <node id='-32753' lat='27.26861' lon='92.04702' />
+ <node id='-32755' lat='27.27829' lon='92.12019' />
+ <node id='-32757' lat='27.48287' lon='91.65007' />
+ <node id='-32759' lat='27.93903' lon='91.48973' />
+ <node id='-32761' lat='27.88538' lon='91.62828' />
+ <node id='-32763' lat='27.84823' lon='91.5629' />
+ <node id='-32765' lat='28.0064' lon='91.46327' />
+ <node id='-32767' lat='28.07509' lon='91.25779' />
+ <node id='-32769' lat='28.19178' lon='90.13387' />
+ <node id='-32771' lat='28.14924' lon='90.05447' />
+ <node id='-32773' lat='28.02838' lon='90.58842' />
+ <node id='-32775' lat='28.07784' lon='90.69894' />
+ <node id='-32777' lat='27.98715' lon='91.20019' />
+ <node id='-32779' lat='28.18355' lon='89.74314' />
+ <node id='-32781' lat='28.23979' lon='89.79762' />
+ <node id='-32783' lat='28.16433' lon='89.59525' />
+ <node id='-32785' lat='27.62502' lon='89.12825' />
+ <node id='-32787' lat='27.60985' lon='89.0582' />
+ <node id='-32789' lat='27.51877' lon='88.98037' />
+ <node id='-32791' lat='27.41518' lon='88.95235' />
+ <node id='-32793' lat='27.32532' lon='89.00216' />
+ <node id='-32795' lat='27.30319' lon='88.96947' />
+ <node id='-32797' lat='27.33777' lon='88.93678' />
+ <node id='-32799' lat='14.23873' lon='105.14012' />
+ <node id='-32801' lat='14.34432' lon='105.17748' />
+ <node id='-32803' lat='14.20402' lon='105.08408' />
+ <node id='-32805' lat='14.23722' lon='105.02804' />
+ <node id='-32807' lat='14.38806' lon='104.97667' />
+ <node id='-32809' lat='14.42726' lon='104.69335' />
+ <node id='-32811' lat='14.36091' lon='104.55014' />
+ <node id='-32813' lat='14.39861' lon='104.27616' />
+ <node id='-32815' lat='14.3398' lon='103.93836' />
+ <node id='-32817' lat='14.38052' lon='103.70175' />
+ <node id='-32819' lat='14.42575' lon='103.53518' />
+ <node id='-32821' lat='14.35639' lon='103.39353' />
+ <node id='-32823' lat='14.33075' lon='103.16469' />
+ <node id='-32825' lat='14.19044' lon='102.93275' />
+ <node id='-32827' lat='14.4348' lon='103.71109' />
+ <node id='-32829' lat='13.93374' lon='102.77864' />
+ <node id='-32831' lat='13.77806' lon='102.72727' />
+ <node id='-32833' lat='13.66162' lon='102.54358' />
+ <node id='-32835' lat='13.60867' lon='102.61986' />
+ <node id='-32837' lat='13.60111' lon='102.57471' />
+ <node id='-32839' lat='14.01531' lon='102.91251' />
+ <node id='-32841' lat='13.56933' lon='102.5358' />
+ <node id='-32843' lat='11.75613' lon='102.90973' />
+ <node id='-32845' lat='11.8519' lon='102.83957' />
+ <node id='-32847' lat='11.98746' lon='102.78427' />
+ <node id='-32849' lat='12.06815' lon='102.77026' />
+ <node id='-32851' lat='12.40284' lon='102.78116' />
+ <node id='-32853' lat='12.37091' lon='102.73134' />
+ <node id='-32855' lat='12.1686' lon='102.70176' />
+ <node id='-32857' lat='12.43781' lon='102.7796' />
+ <node id='-32859' lat='12.65358' lon='102.57567' />
+ <node id='-32861' lat='12.66117' lon='102.51963' />
+ <node id='-32863' lat='13.49967' lon='102.35774' />
+ <node id='-32865' lat='13.28312' lon='102.35151' />
+ <node id='-32867' lat='13.09973' lon='102.42779' />
+ <node id='-32869' lat='12.99813' lon='102.52275' />
+ <node id='-32871' lat='12.97537' lon='102.48694' />
+ <node id='-32873' lat='12.77506' lon='102.53053' />
+ <node id='-32875' lat='12.71736' lon='102.4994' />
+ <node id='-32877' lat='13.56198' lon='102.33743' />
+ <node id='-32879' lat='14.29416' lon='106.8497' />
+ <node id='-32881' lat='14.33639' lon='106.90574' />
+ <node id='-32883' lat='14.36806' lon='106.98825' />
+ <node id='-32885' lat='14.3198' lon='106.9649' />
+ <node id='-32887' lat='14.41782' lon='107.04585' />
+ <node id='-32889' lat='14.3937' lon='107.09722' />
+ <node id='-32891' lat='14.41782' lon='107.17038' />
+ <node id='-32893' lat='14.48716' lon='107.21241' />
+ <node id='-32895' lat='14.54292' lon='107.26534' />
+ <node id='-32897' lat='14.48716' lon='107.256' />
+ <node id='-32899' lat='14.54443' lon='107.37897' />
+ <node id='-32901' lat='14.58812' lon='107.3276' />
+ <node id='-32903' lat='14.52785' lon='107.44435' />
+ <node id='-32905' lat='14.61523' lon='107.47238' />
+ <node id='-32907' lat='14.58963' lon='107.29803' />
+ <node id='-32909' lat='14.45099' lon='107.03962' />
+ <node id='-32911' lat='14.31226' lon='106.80767' />
+ <node id='-32913' lat='14.42687' lon='106.73762' />
+ <node id='-32915' lat='14.44194' lon='106.63333' />
+ <node id='-32917' lat='14.50977' lon='106.59908' />
+ <node id='-32919' lat='14.50525' lon='106.57106' />
+ <node id='-32921' lat='14.59565' lon='106.54148' />
+ <node id='-32923' lat='14.58963' lon='106.50723' />
+ <node id='-32925' lat='14.55045' lon='106.45898' />
+ <node id='-32927' lat='14.50977' lon='106.47766' />
+ <node id='-32929' lat='14.52032' lon='106.43874' />
+ <node id='-32931' lat='14.45249' lon='106.40916' />
+ <node id='-32933' lat='14.44043' lon='106.32355' />
+ <node id='-32935' lat='14.48415' lon='106.25194' />
+ <node id='-32937' lat='14.36203' lon='106.21302' />
+ <node id='-32939' lat='14.30623' lon='106.02311' />
+ <node id='-32941' lat='14.32734' lon='105.99509' />
+ <node id='-32943' lat='14.36957' lon='106.00131' />
+ <node id='-32945' lat='14.20363' lon='106.04801' />
+ <node id='-32947' lat='14.18401' lon='106.10872' />
+ <node id='-32949' lat='14.11307' lon='106.11962' />
+ <node id='-32951' lat='14.06324' lon='106.18656' />
+ <node id='-32953' lat='14.01794' lon='106.16632' />
+ <node id='-32955' lat='13.98471' lon='106.10094' />
+ <node id='-32957' lat='13.9137' lon='106.10405' />
+ <node id='-32959' lat='13.92881' lon='105.90791' />
+ <node id='-32961' lat='14.02247' lon='105.78182' />
+ <node id='-32963' lat='14.08438' lon='105.78338' />
+ <node id='-32965' lat='14.10703' lon='105.44869' />
+ <node id='-32967' lat='14.15684' lon='105.5561' />
+ <node id='-32969' lat='14.09948' lon='105.36775' />
+ <node id='-32971' lat='14.17496' lon='105.2759' />
+ <node id='-32973' lat='21.54128' lon='107.9561' />
+ <node id='-32975' lat='21.54997' lon='108.02926' />
+ <node id='-32977' lat='21.58906' lon='107.92652' />
+ <node id='-32979' lat='21.5905' lon='107.90006' />
+ <node id='-32981' lat='21.65128' lon='107.86114' />
+ <node id='-32983' lat='21.66141' lon='107.80355' />
+ <node id='-32985' lat='21.60787' lon='107.66967' />
+ <node id='-32987' lat='21.61945' lon='107.56537' />
+ <node id='-32989' lat='21.5934' lon='107.54047' />
+ <node id='-32991' lat='21.59774' lon='107.49065' />
+ <node id='-32993' lat='21.62958' lon='107.49532' />
+ <node id='-32995' lat='21.6672' lon='107.47197' />
+ <node id='-32997' lat='21.64839' lon='107.41593' />
+ <node id='-32999' lat='21.59774' lon='107.38636' />
+ <node id='-33001' lat='21.60063' lon='107.35989' />
+ <node id='-33003' lat='21.6672' lon='107.35834' />
+ <node id='-33005' lat='21.74674' lon='107.29296' />
+ <node id='-33007' lat='21.7077' lon='107.24625' />
+ <node id='-33009' lat='21.71493' lon='107.20734' />
+ <node id='-33011' lat='21.79879' lon='107.10771' />
+ <node id='-33013' lat='21.81902' lon='107.02521' />
+ <node id='-33015' lat='21.85948' lon='107.00964' />
+ <node id='-33017' lat='21.88982' lon='107.06101' />
+ <node id='-33019' lat='21.92303' lon='107.05634' />
+ <node id='-33021' lat='21.95191' lon='106.99252' />
+ <node id='-33023' lat='21.92592' lon='106.97228' />
+ <node id='-33025' lat='21.93459' lon='106.92714' />
+ <node id='-33027' lat='21.97934' lon='106.81038' />
+ <node id='-33029' lat='21.97357' lon='106.9178' />
+ <node id='-33031' lat='22.00965' lon='106.74345' />
+ <node id='-33033' lat='21.96491' lon='106.69208' />
+ <node id='-33035' lat='22.15102' lon='106.6983' />
+ <node id='-33037' lat='22.1885' lon='106.67495' />
+ <node id='-33039' lat='22.02409' lon='106.70142' />
+ <node id='-33041' lat='22.22309' lon='106.69986' />
+ <node id='-33043' lat='21.99811' lon='106.68274' />
+ <node id='-33045' lat='22.33977' lon='106.6516' />
+ <node id='-33047' lat='22.37' lon='106.57221' />
+ <node id='-33049' lat='22.48511' lon='106.58155' />
+ <node id='-33051' lat='22.46498' lon='106.55665' />
+ <node id='-33053' lat='22.63606' lon='106.72321' />
+ <node id='-33055' lat='22.5757' lon='106.65316' />
+ <node id='-33057' lat='22.60301' lon='106.61269' />
+ <node id='-33059' lat='22.58432' lon='106.71698' />
+ <node id='-33061' lat='22.85571' lon='106.71231' />
+ <node id='-33063' lat='22.88296' lon='106.71387' />
+ <node id='-33065' lat='22.89587' lon='106.6734' />
+ <node id='-33067' lat='22.92311' lon='106.55976' />
+ <node id='-33069' lat='22.92884' lon='106.60179' />
+ <node id='-33071' lat='22.86862' lon='106.6516' />
+ <node id='-33073' lat='22.8098' lon='106.83685' />
+ <node id='-33075' lat='22.94891' lon='106.51306' />
+ <node id='-33077' lat='22.91164' lon='106.49749' />
+ <node id='-33079' lat='22.86718' lon='106.34961' />
+ <node id='-33081' lat='22.87722' lon='106.27022' />
+ <node id='-33083' lat='22.98475' lon='106.19705' />
+ <node id='-33085' lat='22.99334' lon='106.00403' />
+ <node id='-33087' lat='22.94748' lon='105.99002' />
+ <node id='-33089' lat='22.92598' lon='105.87793' />
+ <node id='-33091' lat='23.06641' lon='105.72382' />
+ <node id='-33093' lat='23.16806' lon='105.56037' />
+ <node id='-33095' lat='23.20669' lon='105.49966' />
+ <node id='-33097' lat='23.30824' lon='105.42805' />
+ <node id='-33099' lat='23.28107' lon='105.40782' />
+ <node id='-33101' lat='23.28679' lon='105.17276' />
+ <node id='-33103' lat='23.25247' lon='105.11672' />
+ <node id='-33105' lat='23.19382' lon='104.98129' />
+ <node id='-33107' lat='23.26248' lon='105.07002' />
+ <node id='-33109' lat='23.27249' lon='105.22569' />
+ <node id='-33111' lat='23.39684' lon='105.32376' />
+ <node id='-33113' lat='23.20669' lon='104.95949' />
+ <node id='-33115' lat='23.17235' lon='104.9486' />
+ <node id='-33117' lat='23.18666' lon='104.91435' />
+ <node id='-33119' lat='23.17378' lon='104.87855' />
+ <node id='-33121' lat='23.11939' lon='104.86765' />
+ <node id='-33123' lat='23.01484' lon='104.8334' />
+ <node id='-33125' lat='23.12082' lon='104.81161' />
+ <node id='-33127' lat='22.90017' lon='104.77114' />
+ <node id='-33129' lat='22.95178' lon='104.86765' />
+ <node id='-33131' lat='22.83419' lon='104.65283' />
+ <node id='-33133' lat='22.81841' lon='104.60457' />
+ <node id='-33135' lat='22.75813' lon='104.47225' />
+ <node id='-33137' lat='22.81984' lon='104.72755' />
+ <node id='-33139' lat='23.075' lon='105.57594' />
+ <node id='-33141' lat='22.85571' lon='104.58122' />
+ <node id='-33143' lat='22.34841' lon='106.55976' />
+ <node id='-33145' lat='22.43336' lon='102.16621' />
+ <node id='-33147' lat='22.77969' lon='102.51802' />
+ <node id='-33149' lat='22.7036' lon='102.57095' />
+ <node id='-33151' lat='22.69212' lon='102.42618' />
+ <node id='-33153' lat='22.77108' lon='102.46665' />
+ <node id='-33155' lat='22.67919' lon='102.38415' />
+ <node id='-33157' lat='22.64184' lon='102.41061' />
+ <node id='-33159' lat='22.4607' lon='102.25339' />
+ <node id='-33161' lat='22.41321' lon='102.26428' />
+ <node id='-33163' lat='22.48659' lon='102.9321' />
+ <node id='-33165' lat='22.60735' lon='102.8636' />
+ <node id='-33167' lat='22.73376' lon='102.60675' />
+ <node id='-33169' lat='22.50097' lon='103.07843' />
+ <node id='-33171' lat='22.68063' lon='103.28079' />
+ <node id='-33173' lat='22.64471' lon='103.18895' />
+ <node id='-33175' lat='22.59873' lon='103.15782' />
+ <node id='-33177' lat='22.55705' lon='103.17961' />
+ <node id='-33179' lat='22.69499' lon='103.56255' />
+ <node id='-33181' lat='22.65764' lon='103.57812' />
+ <node id='-33183' lat='22.70648' lon='103.43646' />
+ <node id='-33185' lat='22.75816' lon='103.43179' />
+ <node id='-33187' lat='22.59155' lon='103.52675' />
+ <node id='-33189' lat='22.8127' lon='103.32282' />
+ <node id='-33191' lat='22.44775' lon='103.0722' />
+ <node id='-33193' lat='22.79979' lon='103.64506' />
+ <node id='-33195' lat='22.50672' lon='103.95795' />
+ <node id='-33197' lat='22.72945' lon='104.03734' />
+ <node id='-33199' lat='22.51823' lon='104.01088' />
+ <node id='-33201' lat='22.80553' lon='104.1214' />
+ <node id='-33203' lat='22.8457' lon='104.27084' />
+ <node id='-33205' lat='22.76534' lon='104.25683' />
+ <node id='-33207' lat='22.69353' lon='104.35593' />
+ <node id='-33209' lat='14.87795' lon='107.59285' />
+ <node id='-33211' lat='14.79282' lon='107.51579' />
+ <node id='-33213' lat='14.93751' lon='107.48277' />
+ <node id='-33215' lat='15.00982' lon='107.46516' />
+ <node id='-33217' lat='15.13949' lon='107.61926' />
+ <node id='-33219' lat='15.0566' lon='107.61486' />
+ <node id='-33221' lat='15.20111' lon='107.58844' />
+ <node id='-33223' lat='15.2266' lon='107.62587' />
+ <node id='-33225' lat='15.37524' lon='107.60605' />
+ <node id='-33227' lat='15.42193' lon='107.62367' />
+ <node id='-33229' lat='15.40496' lon='107.53341' />
+ <node id='-33231' lat='15.48771' lon='107.50699' />
+ <node id='-33233' lat='15.49832' lon='107.3815' />
+ <node id='-33235' lat='15.62345' lon='107.34408' />
+ <node id='-33237' lat='15.62769' lon='107.27583' />
+ <node id='-33239' lat='15.71459' lon='107.27143' />
+ <node id='-33241' lat='15.74638' lon='107.21859' />
+ <node id='-33243' lat='15.89464' lon='107.34188' />
+ <node id='-33245' lat='15.83747' lon='107.21419' />
+ <node id='-33247' lat='16.01106' lon='107.46296' />
+ <node id='-33249' lat='15.88829' lon='107.39471' />
+ <node id='-33251' lat='16.08511' lon='107.44975' />
+ <node id='-33253' lat='16.05549' lon='107.33968' />
+ <node id='-33255' lat='16.13587' lon='107.25822' />
+ <node id='-33257' lat='16.17816' lon='107.14595' />
+ <node id='-33259' lat='16.26271' lon='107.15035' />
+ <node id='-33261' lat='16.3092' lon='107.09091' />
+ <node id='-33263' lat='16.31132' lon='107.02597' />
+ <node id='-33265' lat='16.30287' lon='106.95772' />
+ <node id='-33267' lat='16.34938' lon='106.96638' />
+ <node id='-33269' lat='16.43594' lon='106.88067' />
+ <node id='-33271' lat='16.52671' lon='106.88727' />
+ <node id='-33273' lat='16.55415' lon='106.84104' />
+ <node id='-33275' lat='16.41904' lon='106.74418' />
+ <node id='-33277' lat='16.47816' lon='106.65832' />
+ <node id='-33279' lat='16.56892' lon='106.66052' />
+ <node id='-33281' lat='16.86831' lon='106.55265' />
+ <node id='-33283' lat='16.87884' lon='106.52183' />
+ <node id='-33285' lat='16.92097' lon='106.51963' />
+ <node id='-33287' lat='16.92729' lon='106.54824' />
+ <node id='-33289' lat='16.68704' lon='106.55485' />
+ <node id='-33291' lat='17.01362' lon='106.43597' />
+ <node id='-33293' lat='16.9673' lon='106.50862' />
+ <node id='-33295' lat='17.20509' lon='106.31929' />
+ <node id='-33297' lat='17.3018' lon='106.29287' />
+ <node id='-33299' lat='17.24714' lon='106.24444' />
+ <node id='-33301' lat='17.0031' lon='106.55045' />
+ <node id='-33303' lat='17.89356' lon='105.60381' />
+ <node id='-33305' lat='17.96687' lon='105.64784' />
+ <node id='-33307' lat='18.22008' lon='105.46292' />
+ <node id='-33309' lat='18.15315' lon='105.38366' />
+ <node id='-33311' lat='18.58355' lon='105.1327' />
+ <node id='-33313' lat='18.43533' lon='105.10408' />
+ <node id='-33315' lat='18.70453' lon='105.12829' />
+ <node id='-33317' lat='18.85668' lon='104.64617' />
+ <node id='-33319' lat='18.97747' lon='104.5361' />
+ <node id='-33321' lat='19.70242' lon='104.23229' />
+ <node id='-33323' lat='19.61743' lon='104.05617' />
+ <node id='-33325' lat='19.51163' lon='104.10901' />
+ <node id='-33327' lat='19.43484' lon='104.06058' />
+ <node id='-33329' lat='19.31854' lon='103.87125' />
+ <node id='-33331' lat='18.64196' lon='105.19654' />
+ <node id='-33333' lat='19.72729' lon='104.68359' />
+ <node id='-33335' lat='19.80395' lon='104.8355' />
+ <node id='-33337' lat='19.91783' lon='104.8465' />
+ <node id='-33339' lat='20.09573' lon='104.9874' />
+ <node id='-33341' lat='20.15567' lon='104.91695' />
+ <node id='-33343' lat='20.14121' lon='104.86852' />
+ <node id='-33345' lat='19.62365' lon='104.64837' />
+ <node id='-33347' lat='19.61743' lon='104.53169' />
+ <node id='-33349' lat='19.70035' lon='104.41281' />
+ <node id='-33351' lat='20.37459' lon='104.47886' />
+ <node id='-33353' lat='20.24452' lon='104.61315' />
+ <node id='-33355' lat='20.36633' lon='104.62195' />
+ <node id='-33357' lat='20.40554' lon='104.72102' />
+ <node id='-33359' lat='20.47774' lon='104.66158' />
+ <node id='-33361' lat='20.3849' lon='104.40621' />
+ <node id='-33363' lat='20.47155' lon='104.38199' />
+ <node id='-33365' lat='20.91433' lon='104.27412' />
+ <node id='-33367' lat='20.6653' lon='104.63957' />
+ <node id='-33369' lat='20.96779' lon='104.11121' />
+ <node id='-33371' lat='20.8732' lon='103.82282' />
+ <node id='-33373' lat='20.66324' lon='103.68633' />
+ <node id='-33375' lat='20.82382' lon='103.45737' />
+ <node id='-33377' lat='20.79501' lon='103.38032' />
+ <node id='-33379' lat='20.6653' lon='103.74577' />
+ <node id='-33381' lat='19.66926' lon='104.06498' />
+ <node id='-33383' lat='21.73667' lon='102.82115' />
+ <node id='-33385' lat='21.83888' lon='102.81894' />
+ <node id='-33387' lat='21.66713' lon='102.74189' />
+ <node id='-33389' lat='21.65894' lon='102.67145' />
+ <node id='-33391' lat='21.91447' lon='102.62301' />
+ <node id='-33393' lat='21.99002' lon='102.49092' />
+ <node id='-33395' lat='22.02676' lon='102.51734' />
+ <node id='-33397' lat='22.30403' lon='102.18712' />
+ <node id='-33399' lat='21.3107' lon='102.88939' />
+ <node id='-33401' lat='21.46034' lon='102.94223' />
+ <node id='-33403' lat='21.4255' lon='102.86297' />
+ <node id='-33405' lat='21.58936' lon='102.98846' />
+ <node id='-33407' lat='21.74076' lon='102.97965' />
+ <node id='-33409' lat='21.71213' lon='102.86077' />
+ <node id='-33411' lat='21.84501' lon='102.85637' />
+ <node id='-33413' lat='21.23684' lon='102.89379' />
+ <node id='-33415' lat='21.25736' lon='102.80794' />
+ <node id='-33417' lat='21.05821' lon='102.97745' />
+ <node id='-33419' lat='21.05821' lon='103.03469' />
+ <node id='-33421' lat='20.89994' lon='103.12055' />
+ <node id='-33423' lat='11.66635' lon='105.8507' />
+ <node id='-33425' lat='11.60536' lon='105.80867' />
+ <node id='-33427' lat='11.56876' lon='105.81645' />
+ <node id='-33429' lat='11.67854' lon='105.88962' />
+ <node id='-33431' lat='11.7197' lon='106.00792' />
+ <node id='-33433' lat='11.63738' lon='105.95188' />
+ <node id='-33435' lat='11.77457' lon='106.02038' />
+ <node id='-33437' lat='11.77761' lon='106.06708' />
+ <node id='-33439' lat='11.74561' lon='106.10755' />
+ <node id='-33441' lat='11.72122' lon='106.26478' />
+ <node id='-33443' lat='11.75171' lon='106.18539' />
+ <node id='-33445' lat='11.67549' lon='106.30525' />
+ <node id='-33447' lat='11.69836' lon='106.37219' />
+ <node id='-33449' lat='11.66787' lon='106.44691' />
+ <node id='-33451' lat='11.68616' lon='106.45158' />
+ <node id='-33453' lat='11.76999' lon='106.41577' />
+ <node id='-33455' lat='11.8279' lon='106.44535' />
+ <node id='-33457' lat='11.86294' lon='106.44068' />
+ <node id='-33459' lat='11.86751' lon='106.4687' />
+ <node id='-33461' lat='12.33327' lon='107.34511' />
+ <node id='-33463' lat='12.27547' lon='107.15831' />
+ <node id='-33465' lat='12.08983' lon='106.99953' />
+ <node id='-33467' lat='12.06548' lon='106.92325' />
+ <node id='-33469' lat='12.0807' lon='106.79405' />
+ <node id='-33471' lat='11.96956' lon='106.70687' />
+ <node id='-33473' lat='11.97413' lon='106.4111' />
+ <node id='-33475' lat='12.52177' lon='107.5755' />
+ <node id='-33477' lat='12.7982' lon='107.55993' />
+ <node id='-33479' lat='12.88926' lon='107.49611' />
+ <node id='-33481' lat='12.29373' lon='107.4463' />
+ <node id='-33483' lat='12.36824' lon='107.55059' />
+ <node id='-33485' lat='12.24657' lon='107.42917' />
+ <node id='-33487' lat='14.41552' lon='107.44941' />
+ <node id='-33489' lat='14.32655' lon='107.39493' />
+ <node id='-33491' lat='14.24509' lon='107.40427' />
+ <node id='-33493' lat='14.11832' lon='107.33577' />
+ <node id='-33495' lat='14.07906' lon='107.37158' />
+ <node id='-33497' lat='14.02319' lon='107.35757' />
+ <node id='-33499' lat='14.54665' lon='107.52569' />
+ <node id='-33501' lat='14.59034' lon='107.52102' />
+ <node id='-33503' lat='14.628' lon='107.55371' />
+ <node id='-33505' lat='14.40346' lon='107.48521' />
+ <node id='-33507' lat='13.99147' lon='107.38247' />
+ <node id='-33509' lat='13.91593' lon='107.46498' />
+ <node id='-33511' lat='13.99751' lon='107.44318' />
+ <node id='-33513' lat='13.78897' lon='107.45252' />
+ <node id='-33515' lat='13.73908' lon='107.53503' />
+ <node id='-33517' lat='13.52577' lon='107.61909' />
+ <node id='-33519' lat='13.3668' lon='107.62843' />
+ <node id='-33521' lat='13.01215' lon='107.49144' />
+ <node id='-33523' lat='11.10476' lon='106.1527' />
+ <node id='-33525' lat='10.97795' lon='106.20095' />
+ <node id='-33527' lat='10.97031' lon='106.14336' />
+ <node id='-33529' lat='10.79451' lon='106.18539' />
+ <node id='-33531' lat='10.8098' lon='106.06708' />
+ <node id='-33533' lat='10.91529' lon='105.95188' />
+ <node id='-33535' lat='10.84191' lon='105.93009' />
+ <node id='-33537' lat='10.85873' lon='105.84603' />
+ <node id='-33539' lat='11.07879' lon='106.10444' />
+ <node id='-33541' lat='11.43605' lon='105.88962' />
+ <node id='-33543' lat='11.28343' lon='105.86782' />
+ <node id='-33545' lat='10.94586' lon='105.50045' />
+ <node id='-33547' lat='10.96878' lon='105.42884' />
+ <node id='-33549' lat='10.95656' lon='105.08326' />
+ <node id='-33551' lat='10.89236' lon='105.02722' />
+ <node id='-33553' lat='10.86179' lon='105.34011' />
+ <node id='-33555' lat='10.53445' lon='104.59602' />
+ <node id='-33557' lat='10.52833' lon='104.87933' />
+ <node id='-33559' lat='10.64003' lon='104.95094' />
+ <node id='-33561' lat='10.72722' lon='105.09571' />
+ <node id='-33563' lat='33.52774' lon='35.94465' />
+ <node id='-33565' lat='33.57904' lon='36.05723' />
+ <node id='-33567' lat='33.6596' lon='35.9341' />
+ <node id='-33569' lat='33.82927' lon='36.06778' />
+ <node id='-33571' lat='33.85118' lon='36.14517' />
+ <node id='-33573' lat='33.86579' lon='36.38263' />
+ <node id='-33575' lat='33.83365' lon='36.3967' />
+ <node id='-33577' lat='34.05982' lon='36.50576' />
+ <node id='-33579' lat='34.09916' lon='36.5128' />
+ <node id='-33581' lat='34.05253' lon='36.41078' />
+ <node id='-33583' lat='33.91981' lon='36.28589' />
+ <node id='-33585' lat='34.46541' lon='36.46179' />
+ <node id='-33587' lat='34.20251' lon='36.62537' />
+ <node id='-33589' lat='34.2316' lon='36.59195' />
+ <node id='-33591' lat='34.27667' lon='36.58667' />
+ <node id='-33593' lat='34.31009' lon='36.60778' />
+ <node id='-33595' lat='34.31881' lon='36.56556' />
+ <node id='-33597' lat='34.3798' lon='36.53039' />
+ <node id='-33599' lat='34.41609' lon='36.55853' />
+ <node id='-33601' lat='34.50165' lon='36.4442' />
+ <node id='-33603' lat='34.5002' lon='36.34745' />
+ <node id='-33605' lat='34.52629' lon='36.3369' />
+ <node id='-33607' lat='34.55672' lon='36.39846' />
+ <node id='-33609' lat='34.61175' lon='36.41429' />
+ <node id='-33611' lat='34.59438' lon='36.45299' />
+ <node id='-33613' lat='34.6378' lon='36.46003' />
+ <node id='-33615' lat='34.62505' lon='36.42941' />
+ <node id='-33617' lat='34.65447' lon='36.35384' />
+ <node id='-33619' lat='34.68516' lon='36.35135' />
+ <node id='-33621' lat='34.69334' lon='36.32399' />
+ <node id='-33623' lat='34.62991' lon='36.29165' />
+ <node id='-33625' lat='32.37908' lon='36.40959' />
+ <node id='-33627' lat='32.52751' lon='36.20379' />
+ <node id='-33629' lat='32.52158' lon='36.08418' />
+ <node id='-33631' lat='32.6594' lon='36.02789' />
+ <node id='-33633' lat='32.66237' lon='35.96633' />
+ <node id='-33635' lat='32.7201' lon='35.92587' />
+ <node id='-33637' lat='33.11921' lon='35.52573' />
+ <node id='-33639' lat='33.114' lon='35.50335' />
+ <node id='-33641' lat='33.09056' lon='35.50272' />
+ <node id='-33643' lat='33.09264' lon='35.448' />
+ <node id='-33645' lat='33.06659' lon='35.43059' />
+ <node id='-33647' lat='33.05617' lon='35.35223' />
+ <node id='-33649' lat='33.10515' lon='35.31429' />
+ <node id='-33651' lat='33.08743' lon='35.1924' />
+ <node id='-33653' lat='33.43183' lon='35.88668' />
+ <node id='-33655' lat='33.36354' lon='35.81324' />
+ <node id='-33657' lat='33.27278' lon='35.62019' />
+ <node id='-33659' lat='33.24226' lon='35.62283' />
+ <node id='-33661' lat='33.26653' lon='35.58502' />
+ <node id='-33663' lat='33.28381' lon='35.58326' />
+ <node id='-33665' lat='33.28969' lon='35.56523' />
+ <node id='-33667' lat='33.25844' lon='35.55555' />
+ <node id='-33669' lat='33.25513' lon='35.54544' />
+ <node id='-33671' lat='33.236' lon='35.54808' />
+ <node id='-33673' lat='33.23196' lon='35.5362' />
+ <node id='-33675' lat='33.27342' lon='35.77513' />
+ <node id='-33677' lat='33.24841' lon='35.81295' />
+ <node id='-33679' lat='33.19397' lon='35.83846' />
+ <node id='-33681' lat='33.16673' lon='35.84285' />
+ <node id='-33683' lat='33.1336' lon='35.81911' />
+ <node id='-33685' lat='33.2028' lon='35.81647' />
+ <node id='-33687' lat='33.11077' lon='35.81911' />
+ <node id='-33689' lat='32.82817' lon='35.83758' />
+ <node id='-33691' lat='32.8725' lon='35.84021' />
+ <node id='-33693' lat='32.91976' lon='35.87012' />
+ <node id='-33695' lat='32.77938' lon='35.78745' />
+ <node id='-33697' lat='32.9456' lon='35.89298' />
+ <node id='-33699' lat='32.98028' lon='35.87188' />
+ <node id='-33701' lat='32.64393' lon='35.56614' />
+ <node id='-33703' lat='32.48669' lon='35.57485' />
+ <node id='-33705' lat='32.42687' lon='35.55494' />
+ <node id='-33707' lat='32.21877' lon='35.57111' />
+ <node id='-33709' lat='32.04076' lon='35.52012' />
+ <node id='-33711' lat='31.96587' lon='35.54375' />
+ <node id='-33713' lat='31.9131' lon='35.52758' />
+ <node id='-33715' lat='31.12444' lon='35.43658' />
+ <node id='-33717' lat='30.95565' lon='35.41371' />
+ <node id='-33719' lat='30.8802' lon='35.33984' />
+ <node id='-33721' lat='30.81224' lon='35.33456' />
+ <node id='-33723' lat='30.62322' lon='35.22375' />
+ <node id='-33725' lat='30.07374' lon='35.14108' />
+ <node id='-33727' lat='30.43535' lon='35.16218' />
+ <node id='-33729' lat='29.66343' lon='35.02147' />
+ <node id='-33731' lat='31.25535' lon='35.40316' />
+ <node id='-33733' lat='6.35887' lon='-8.38453' />
+ <node id='-33735' lat='6.49977' lon='-8.45666' />
+ <node id='-33737' lat='6.43797' lon='-8.48652' />
+ <node id='-33739' lat='6.36381' lon='-8.3298' />
+ <node id='-33741' lat='5.80974' lon='-7.48155' />
+ <node id='-33743' lat='5.84934' lon='-7.46165' />
+ <node id='-33745' lat='5.94337' lon='-7.67309' />
+ <node id='-33747' lat='5.90625' lon='-7.70294' />
+ <node id='-33749' lat='5.84687' lon='-7.43677' />
+ <node id='-33751' lat='5.99037' lon='-7.78254' />
+ <node id='-33753' lat='6.07696' lon='-7.79747' />
+ <node id='-33755' lat='6.08932' lon='-7.8497' />
+ <node id='-33757' lat='6.20309' lon='-7.83478' />
+ <node id='-33759' lat='6.27728' lon='-7.90692' />
+ <node id='-33761' lat='6.31684' lon='-8.00642' />
+ <node id='-33763' lat='6.28222' lon='-8.17557' />
+ <node id='-33765' lat='4.94294' lon='-7.53876' />
+ <node id='-33767' lat='5.14118' lon='-7.48901' />
+ <node id='-33769' lat='5.08667' lon='-7.55369' />
+ <node id='-33771' lat='5.74787' lon='-7.43926' />
+ <node id='-33773' lat='5.61173' lon='-7.37209' />
+ <node id='-33775' lat='5.42355' lon='-7.43428' />
+ <node id='-33777' lat='5.32944' lon='-7.36463' />
+ <node id='-33779' lat='5.26256' lon='-7.46165' />
+ <node id='-33781' lat='4.8909' lon='-7.59349' />
+ <node id='-33783' lat='7.25794' lon='-8.37458' />
+ <node id='-33785' lat='7.51203' lon='-8.41935' />
+ <node id='-33787' lat='7.1691' lon='-8.29249' />
+ <node id='-33789' lat='6.82837' lon='-8.31736' />
+ <node id='-33791' lat='7.62525' lon='-8.55874' />
+ <node id='-33793' lat='7.70167' lon='-8.55874' />
+ <node id='-33795' lat='7.51429' lon='-8.72789' />
+ <node id='-33797' lat='7.69428' lon='-8.67814' />
+ <node id='-33799' lat='7.38109' lon='-9.20798' />
+ <node id='-33801' lat='7.30461' lon='-9.18311' />
+ <node id='-33803' lat='7.35149' lon='-8.8448' />
+ <node id='-33805' lat='7.2824' lon='-8.93435' />
+ <node id='-33807' lat='7.26019' lon='-8.85724' />
+ <node id='-33809' lat='7.1985' lon='-9.09107' />
+ <node id='-33811' lat='7.42056' lon='-9.305' />
+ <node id='-33813' lat='7.41809' lon='-9.41943' />
+ <node id='-33815' lat='7.37122' lon='-9.48161' />
+ <node id='-33817' lat='7.62032' lon='-9.37465' />
+ <node id='-33819' lat='7.74111' lon='-9.35724' />
+ <node id='-33821' lat='7.9284' lon='-9.44928' />
+ <node id='-33823' lat='8.02448' lon='-9.41445' />
+ <node id='-33825' lat='8.18455' lon='-9.50898' />
+ <node id='-33827' lat='8.35195' lon='-9.47415' />
+ <node id='-33829' lat='8.54633' lon='-9.77763' />
+ <node id='-33831' lat='8.42578' lon='-10.05873' />
+ <node id='-33833' lat='8.50697' lon='-10.05375' />
+ <node id='-33835' lat='8.52665' lon='-10.14579' />
+ <node id='-33837' lat='8.47991' lon='-10.203' />
+ <node id='-33839' lat='10.1021' lon='-8.01225' />
+ <node id='-33841' lat='10.04577' lon='-8.11921' />
+ <node id='-33843' lat='9.94288' lon='-8.15652' />
+ <node id='-33845' lat='9.86936' lon='-8.09434' />
+ <node id='-33847' lat='9.55062' lon='-8.14657' />
+ <node id='-33849' lat='9.39604' lon='-8.03463' />
+ <node id='-33851' lat='9.41812' lon='-7.85056' />
+ <node id='-33853' lat='9.20456' lon='-7.90777' />
+ <node id='-33855' lat='9.08422' lon='-7.73862' />
+ <node id='-33857' lat='8.99332' lon='-7.92518' />
+ <node id='-33859' lat='8.81146' lon='-7.95503' />
+ <node id='-33861' lat='8.66148' lon='-7.69882' />
+ <node id='-33863' lat='8.36873' lon='-7.65653' />
+ <node id='-33865' lat='8.50652' lon='-7.92518' />
+ <node id='-33867' lat='8.11023' lon='-7.99919' />
+ <node id='-33869' lat='8.00925' lon='-7.94695' />
+ <node id='-33871' lat='8.20134' lon='-7.98675' />
+ <node id='-33873' lat='8.16071' lon='-8.062' />
+ <node id='-33875' lat='8.04989' lon='-8.06449' />
+ <node id='-33877' lat='7.87991' lon='-8.13414' />
+ <node id='-33879' lat='7.78626' lon='-8.09931' />
+ <node id='-33881' lat='7.54466' lon='-8.21374' />
+ <node id='-33883' lat='7.6285' lon='-8.4003' />
+ <node id='-33885' lat='8.24196' lon='-8.2411' />
+ <node id='-33887' lat='8.48438' lon='-8.22991' />
+ <node id='-33889' lat='10.2703' lon='-7.9578' />
+ <node id='-33891' lat='10.44649' lon='-8.10207' />
+ <node id='-33893' lat='10.41722' lon='-8.22711' />
+ <node id='-33895' lat='11.06234' lon='-8.35083' />
+ <node id='-33897' lat='10.99397' lon='-8.66923' />
+ <node id='-33899' lat='11.37466' lon='-8.40058' />
+ <node id='-33901' lat='11.66715' lon='-8.80854' />
+ <node id='-33903' lat='12.34842' lon='-8.94784' />
+ <node id='-33905' lat='12.50875' lon='-9.13689' />
+ <node id='-33907' lat='12.48446' lon='-9.38067' />
+ <node id='-33909' lat='12.29009' lon='-9.32097' />
+ <node id='-33911' lat='12.18312' lon='-9.63938' />
+ <node id='-33913' lat='12.0226' lon='-9.714' />
+ <node id='-33915' lat='12.24634' lon='-10.30604' />
+ <node id='-33917' lat='11.91552' lon='-10.71897' />
+ <node id='-33919' lat='12.1053' lon='-10.80355' />
+ <node id='-33921' lat='12.24634' lon='-10.99758' />
+ <node id='-33923' lat='12.01286' lon='-11.24136' />
+ <node id='-33925' lat='12.17826' lon='-11.50006' />
+ <node id='-33927' lat='-11.91488' lon='26.01777' />
+ <node id='-33929' lat='-11.61312' lon='27.04351' />
+ <node id='-33931' lat='-12.01868' lon='26.88687' />
+ <node id='-33933' lat='-11.65767' lon='25.33058' />
+ <node id='-33935' lat='-11.06816' lon='24.34528' />
+ <node id='-33937' lat='-11.44975' lon='24.42612' />
+ <node id='-33939' lat='-11.19707' lon='25.34069' />
+ <node id='-33941' lat='-11.60323' lon='27.22541' />
+ <node id='-33943' lat='-13.41844' lon='29.65078' />
+ <node id='-33945' lat='-13.21685' lon='29.60531' />
+ <node id='-33947' lat='-13.41353' lon='29.01918' />
+ <node id='-33949' lat='-12.41375' lon='28.33199' />
+ <node id='-33951' lat='-12.22123' lon='27.59932' />
+ <node id='-33953' lat='-11.76157' lon='27.21025' />
+ <node id='-33955' lat='-12.23604' lon='29.48404' />
+ <node id='-33957' lat='-12.43843' lon='29.4992' />
+ <node id='-33959' lat='-12.37921' lon='29.18592' />
+ <node id='-33961' lat='-11.87532' lon='28.48357' />
+ <node id='-33963' lat='-11.57848' lon='28.37241' />
+ <node id='-33965' lat='-10.65133' lon='28.65032' />
+ <node id='-33967' lat='46.90895' lon='12.17486' />
+ <node id='-33969' lat='46.88651' lon='12.27591' />
+ <node id='-33971' lat='46.60953' lon='12.9151' />
+ <node id='-33973' lat='47.01241' lon='12.11675' />
+ <node id='-33975' lat='47.03996' lon='12.21781' />
+ <node id='-33977' lat='46.71529' lon='12.38708' />
+ <node id='-33979' lat='47.09331' lon='12.19254' />
+ <node id='-33981' lat='46.98484' lon='11.74789' />
+ <node id='-33983' lat='46.99862' lon='11.33355' />
+ <node id='-33985' lat='46.92966' lon='11.10618' />
+ <node id='-33987' lat='46.76896' lon='11.00764' />
+ <node id='-33989' lat='46.78972' lon='10.72974' />
+ <node id='-33991' lat='46.82258' lon='10.75753' />
+ <node id='-33993' lat='46.87614' lon='10.66405' />
+ <node id='-33995' lat='46.84505' lon='10.54783' />
+ <node id='-33997' lat='46.17392' lon='13.66472' />
+ <node id='-33999' lat='46.18966' lon='13.64451' />
+ <node id='-34001' lat='46.18703' lon='13.56682' />
+ <node id='-34003' lat='46.2054' lon='13.56114' />
+ <node id='-34005' lat='46.22725' lon='13.47587' />
+ <node id='-34007' lat='46.20758' lon='13.42218' />
+ <node id='-34009' lat='46.29668' lon='13.37671' />
+ <node id='-34011' lat='46.33507' lon='13.44808' />
+ <node id='-34013' lat='46.35992' lon='13.43418' />
+ <node id='-34015' lat='46.3621' lon='13.47019' />
+ <node id='-34017' lat='46.40915' lon='13.5763' />
+ <node id='-34019' lat='46.42613' lon='13.5763' />
+ <node id='-34021' lat='46.44137' lon='13.59777' />
+ <node id='-34023' lat='46.43881' lon='13.68684' />
+ <node id='-34025' lat='46.01832' lon='13.49702' />
+ <node id='-34027' lat='46.04498' lon='13.50998' />
+ <node id='-34029' lat='46.04839' lon='13.49568' />
+ <node id='-34031' lat='46.09022' lon='13.57072' />
+ <node id='-34033' lat='46.05986' lon='13.50104' />
+ <node id='-34035' lat='45.93607' lon='13.63815' />
+ <node id='-34037' lat='45.91836' lon='13.6194' />
+ <node id='-34039' lat='45.94942' lon='13.63235' />
+ <node id='-34041' lat='45.98326' lon='13.64307' />
+ <node id='-34043' lat='45.98947' lon='13.63458' />
+ <node id='-34045' lat='45.98388' lon='13.62074' />
+ <node id='-34047' lat='45.99009' lon='13.58903' />
+ <node id='-34049' lat='45.96991' lon='13.56759' />
+ <node id='-34051' lat='45.96588' lon='13.52963' />
+ <node id='-34053' lat='45.98078' lon='13.50104' />
+ <node id='-34055' lat='45.88666' lon='13.58992' />
+ <node id='-34057' lat='45.83503' lon='13.58858' />
+ <node id='-34059' lat='45.8425' lon='13.57563' />
+ <node id='-34061' lat='45.65207' lon='13.87933' />
+ <node id='-34063' lat='45.70855' lon='13.83332' />
+ <node id='-34065' lat='45.68703' lon='13.83422' />
+ <node id='-34067' lat='45.7176' lon='13.8235' />
+ <node id='-34069' lat='45.79955' lon='13.66986' />
+ <node id='-34071' lat='45.60835' lon='13.8695' />
+ <node id='-34073' lat='45.59898' lon='13.86771' />
+ <node id='-34075' lat='20.73533' lon='1.20992' />
+ <node id='-34077' lat='19.81703' lon='3.24648' />
+ <node id='-34079' lat='19.1366' lon='3.12501' />
+ <node id='-34081' lat='18.9745' lon='3.36082' />
+ <node id='-34083' lat='26.39148' lon='9.51696' />
+ <node id='-34085' lat='24.21456' lon='11.41061' />
+ <node id='-34087' lat='24.5595' lon='10.85323' />
+ <node id='-34089' lat='24.5465' lon='10.33159' />
+ <node id='-34091' lat='24.98124' lon='10.02432' />
+ <node id='-34093' lat='25.35635' lon='10.03146' />
+ <node id='-34095' lat='26.19288' lon='9.38834' />
+ <node id='-34097' lat='26.57696' lon='9.89569' />
+ <node id='-34099' lat='29.40961' lon='9.78136' />
+ <node id='-34101' lat='24.26669' lon='11.62498' />
+ <node id='-34103' lat='32.6307' lon='11.46037' />
+ <node id='-34105' lat='32.48013' lon='11.57828' />
+ <node id='-34107' lat='32.4138' lon='11.53898' />
+ <node id='-34109' lat='32.2145' lon='11.04234' />
+ <node id='-34111' lat='31.97235' lon='10.7315' />
+ <node id='-34113' lat='31.96629' lon='10.62788' />
+ <node id='-34115' lat='31.72956' lon='10.48497' />
+ <node id='-34117' lat='33.10175' lon='8.11433' />
+ <node id='-34119' lat='33.18851' lon='7.83028' />
+ <node id='-34121' lat='33.05086' lon='8.1179' />
+ <node id='-34123' lat='33.7726' lon='7.54088' />
+ <node id='-34125' lat='34.21841' lon='7.81242' />
+ <node id='-34127' lat='34.95378' lon='8.30727' />
+ <node id='-34129' lat='35.10007' lon='8.3555' />
+ <node id='-34131' lat='34.92009' lon='8.25189' />
+ <node id='-34133' lat='34.72798' lon='8.29655' />
+ <node id='-34135' lat='35.47774' lon='8.36086' />
+ <node id='-34137' lat='35.66373' lon='8.35371' />
+ <node id='-34139' lat='35.91733' lon='8.2626' />
+ <node id='-34141' lat='36.44939' lon='8.18936' />
+ <node id='-34143' lat='36.42208' lon='8.40731' />
+ <node id='-34145' lat='36.8364' lon='8.67706' />
+ <node id='-34147' lat='36.86499' lon='8.62972' />
+ <node id='-34149' lat='36.78062' lon='8.57613' />
+ <node id='-34151' lat='36.7706' lon='8.46537' />
+ <node id='-34153' lat='36.66607' lon='8.47609' />
+ <node id='-34155' lat='36.48817' lon='8.16167' />
+ <node id='-34157' lat='9.59205' lon='43.32613' />
+ <node id='-34159' lat='9.84605' lon='43.23518' />
+ <node id='-34161' lat='9.90579' lon='43.0937' />
+ <node id='-34163' lat='10.18441' lon='42.87643' />
+ <node id='-34165' lat='10.62672' lon='42.69452' />
+ <node id='-34167' lat='4.44032' lon='42.97746' />
+ <node id='-34169' lat='4.57923' lon='43.04177' />
+ <node id='-34171' lat='4.28357' lon='42.84526' />
+ <node id='-34173' lat='4.79289' lon='43.40263' />
+ <node id='-34175' lat='4.20518' lon='42.55853' />
+ <node id='-34177' lat='4.17667' lon='42.07619' />
+ <node id='-34179' lat='18.59899' lon='49.04884' />
+ <node id='-34181' lat='18.20584' lon='48.19996' />
+ <node id='-34183' lat='17.50366' lon='47.58351' />
+ <node id='-34185' lat='17.10808' lon='47.48245' />
+ <node id='-34187' lat='16.91481' lon='47.02769' />
+ <node id='-34189' lat='17.29151' lon='46.76494' />
+ <node id='-34191' lat='17.20464' lon='46.31018' />
+ <node id='-34193' lat='17.47475' lon='44.50126' />
+ <node id='-34195' lat='17.3301' lon='43.79386' />
+ <node id='-34197' lat='17.56148' lon='43.43005' />
+ <node id='-34199' lat='17.43618' lon='43.23804' />
+ <node id='-34201' lat='16.6439' lon='43.17741' />
+ <node id='-34203' lat='8.35326' lon='-10.63934' />
+ <node id='-34205' lat='8.48941' lon='-10.37257' />
+ <node id='-34207' lat='8.31174' lon='-10.54891' />
+ <node id='-34209' lat='8.5314' lon='-10.61422' />
+ <node id='-34211' lat='8.29235' lon='-10.70565' />
+ <node id='-34213' lat='8.67669' lon='-10.47707' />
+ <node id='-34215' lat='8.81225' lon='-10.56197' />
+ <node id='-34217' lat='9.06386' lon='-10.5783' />
+ <node id='-34219' lat='9.07998' lon='-10.74484' />
+ <node id='-34221' lat='9.29919' lon='-10.6534' />
+ <node id='-34223' lat='10.00098' lon='-11.2118' />
+ <node id='-34225' lat='8.15627' lon='-10.45023' />
+ <node id='-34227' lat='8.21283' lon='-10.29839' />
+ <node id='-34229' lat='8.28554' lon='-10.31635' />
+ <node id='-34231' lat='8.30008' lon='-10.30084' />
+ <node id='-34233' lat='8.15223' lon='-10.35227' />
+ <node id='-34235' lat='8.1393' lon='-10.51554' />
+ <node id='-34237' lat='6.97746' lon='-11.4027' />
+ <node id='-34239' lat='7.21576' lon='-11.29417' />
+ <node id='-34241' lat='6.92704' lon='-11.50429' />
+ <node id='-34243' lat='9.3133' lon='-12.76788' />
+ <node id='-34245' lat='9.26335' lon='-12.94095' />
+ <node id='-34247' lat='9.0409' lon='-13.08953' />
+ <node id='-34249' lat='9.0925' lon='-13.18586' />
+ <node id='-34251' lat='12.97808' lon='-11.39935' />
+ <node id='-34253' lat='13.39174' lon='-11.63025' />
+ <node id='-34255' lat='13.84505' lon='-11.93043' />
+ <node id='-34257' lat='13.33333' lon='-11.83345' />
+ <node id='-34259' lat='13.71049' lon='-12.06897' />
+ <node id='-34261' lat='12.44559' lon='-11.46267' />
+ <node id='-34263' lat='12.42008' lon='-11.91331' />
+ <node id='-34265' lat='12.51892' lon='-12.87336' />
+ <node id='-34267' lat='12.32758' lon='-12.35415' />
+ <node id='-34269' lat='12.49342' lon='-13.06603' />
+ <node id='-34271' lat='12.64003' lon='-13.05296' />
+ <node id='-34273' lat='-1.69663' lon='29.24458' />
+ <node id='-34275' lat='-1.40499' lon='29.53062' />
+ <node id='-34277' lat='-1.5054' lon='29.45038' />
+ <node id='-34279' lat='-1.50887' lon='29.36322' />
+ <node id='-34281' lat='-1.90576' lon='29.11847' />
+ <node id='-34283' lat='-2.12278' lon='29.17562' />
+ <node id='-34285' lat='-1.66826' lon='29.24323' />
+ <node id='-34287' lat='-2.70596' lon='29.00357' />
+ <node id='-34289' lat='-2.5608' lon='28.89254' />
+ <node id='-34291' lat='-2.50493' lon='28.88846' />
+ <node id='-34293' lat='-2.51839' lon='28.86519' />
+ <node id='-34295' lat='-2.44866' lon='28.86846' />
+ <node id='-34297' lat='-2.47557' lon='28.89132' />
+ <node id='-34299' lat='-2.53185' lon='28.86193' />
+ <node id='-34301' lat='-2.27043' lon='29.105' />
+ <node id='-34303' lat='-2.29001' lon='29.00051' />
+ <node id='-34305' lat='-2.37321' lon='28.95642' />
+ <node id='-34307' lat='-2.37321' lon='28.89601' />
+ <node id='-34309' lat='-2.41888' lon='28.86826' />
+ <node id='-34311' lat='-2.66763' lon='28.90703' />
+ <node id='-34313' lat='-1.34303' lon='30.16369' />
+ <node id='-34315' lat='-1.48269' lon='29.912' />
+ <node id='-34317' lat='-1.31187' lon='29.82657' />
+ <node id='-34319' lat='-0.9852' lon='30.76635' />
+ <node id='-34321' lat='-1.01175' lon='30.70631' />
+ <node id='-34323' lat='-1.06601' lon='30.64166' />
+ <node id='-34325' lat='-1.10641' lon='30.45116' />
+ <node id='-34327' lat='-1.16412' lon='30.50889' />
+ <node id='-34329' lat='-1.33264' lon='30.57123' />
+ <node id='-34331' lat='-1.64652' lon='30.84079' />
+ <node id='-34333' lat='-2.08223' lon='30.89303' />
+ <node id='-34335' lat='-2.35795' lon='30.83915' />
+ <node id='-34337' lat='-2.82933' lon='29.36805' />
+ <node id='-34339' lat='-2.6483' lon='29.32234' />
+ <node id='-34341' lat='-2.58632' lon='29.0562' />
+ <node id='-34343' lat='-2.43626' lon='30.14034' />
+ <node id='-34345' lat='-2.33348' lon='29.95911' />
+ <node id='-34347' lat='-2.75105' lon='29.88237' />
+ <node id='-34349' lat='-2.31064' lon='30.42933' />
+ <node id='-34351' lat='10.97586' lon='42.13691' />
+ <node id='-34353' lat='10.98493' lon='42.79037' />
+ <node id='-34355' lat='11.06992' lon='42.75111' />
+ <node id='-34357' lat='11.09711' lon='42.62989' />
+ <node id='-34359' lat='10.98493' lon='42.42669' />
+ <node id='-34361' lat='10.92599' lon='42.06302' />
+ <node id='-34363' lat='11.49902' lon='41.77727' />
+ <node id='-34365' lat='11.33606' lon='41.8096' />
+ <node id='-34367' lat='12.58747' lon='42.86195' />
+ <node id='-34369' lat='12.42629' lon='42.7996' />
+ <node id='-34371' lat='12.36201' lon='42.6957' />
+ <node id='-34373' lat='12.52661' lon='42.46941' />
+ <node id='-34375' lat='29.50584' lon='46.89695' />
+ <node id='-34377' lat='30.01044' lon='47.15166' />
+ <node id='-34379' lat='29.85763' lon='48.40479' />
+ <node id='-34381' lat='27.87827' lon='49.98877' />
+ <node id='-34383' lat='27.88961' lon='50.37318' />
+ <node id='-34385' lat='26.73086' lon='50.71771' />
+ <node id='-34387' lat='25.61443' lon='56.25341' />
+ <node id='-34389' lat='25.60643' lon='56.26636' />
+ <node id='-34391' lat='25.60211' lon='56.25365' />
+ <node id='-34393' lat='25.61119' lon='56.20473' />
+ <node id='-34395' lat='25.65508' lon='56.18363' />
+ <node id='-34397' lat='25.66351' lon='56.14826' />
+ <node id='-34399' lat='25.73524' lon='56.13579' />
+ <node id='-34401' lat='25.77239' lon='56.17416' />
+ <node id='-34403' lat='25.82765' lon='56.13963' />
+ <node id='-34405' lat='25.9795' lon='56.19334' />
+ <node id='-34407' lat='26.06828' lon='56.15498' />
+ <node id='-34409' lat='24.88334' lon='56.30269' />
+ <node id='-34411' lat='24.93205' lon='56.34873' />
+ <node id='-34413' lat='24.84417' lon='56.20294' />
+ <node id='-34415' lat='24.78846' lon='56.19719' />
+ <node id='-34417' lat='24.97292' lon='56.32571' />
+ <node id='-34419' lat='24.89639' lon='55.97467' />
+ <node id='-34421' lat='24.87898' lon='56.0466' />
+ <node id='-34423' lat='24.95727' lon='56.05715' />
+ <node id='-34425' lat='25.00857' lon='55.96316' />
+ <node id='-34427' lat='24.96771' lon='55.90849' />
+ <node id='-34429' lat='24.96858' lon='55.85094' />
+ <node id='-34431' lat='24.68567' lon='55.83271' />
+ <node id='-34433' lat='24.5287' lon='55.76461' />
+ <node id='-34435' lat='24.41521' lon='55.83271' />
+ <node id='-34437' lat='24.31124' lon='55.8049' />
+ <node id='-34439' lat='24.27977' lon='55.79051' />
+ <node id='-34441' lat='24.23255' lon='55.75215' />
+ <node id='-34443' lat='24.2343' lon='55.77804' />
+ <node id='-34445' lat='24.20193' lon='55.83367' />
+ <node id='-34447' lat='24.01633' lon='55.8308' />
+ <node id='-34449' lat='23.10378' lon='55.22634' />
+ <node id='-34451' lat='23.669' lon='55.57358' />
+ <node id='-34453' lat='23.94946' lon='55.48677' />
+ <node id='-34455' lat='25.595' lon='50.7801' />
+ <node id='-34457' lat='25.6965' lon='50.86149' />
+ <node id='-34459' lat='25.88946' lon='50.81266' />
+ <node id='-34461' lat='24.71675' lon='51.83108' />
+ <node id='-34463' lat='24.62785' lon='51.39468' />
+ <node id='-34465' lat='24.50747' lon='51.29972' />
+ <node id='-34467' lat='24.46907' lon='51.09638' />
+ <node id='-34469' lat='24.27256' lon='51.58871' />
+ <node id='-34471' lat='24.39615' lon='51.41644' />
+ <node id='-34473' lat='24.75635' lon='52.02277' />
+ <node id='-34475' lat='25.00368' lon='52.35509' />
+ <node id='-34477' lat='25.62624' lon='55.14145' />
+ <node id='-34479' lat='24.64436' lon='53.97892' />
+ <node id='-34481' lat='25.51697' lon='52.82259' />
+ <node id='-34483' lat='50.80065' lon='6.00462' />
+ <node id='-34485' lat='50.81694' lon='6.02328' />
+ <node id='-34487' lat='50.84435' lon='6.01921' />
+ <node id='-34489' lat='50.85634' lon='6.0504' />
+ <node id='-34491' lat='50.85206' lon='6.07346' />
+ <node id='-34493' lat='50.87603' lon='6.08703' />
+ <node id='-34495' lat='50.97692' lon='5.91069' />
+ <node id='-34497' lat='51.05031' lon='5.86186' />
+ <node id='-34499' lat='51.06736' lon='5.9134' />
+ <node id='-34501' lat='51.03496' lon='5.9541' />
+ <node id='-34503' lat='51.15677' lon='6.16706' />
+ <node id='-34505' lat='51.19589' lon='6.17384' />
+ <node id='-34507' lat='51.17038' lon='6.07889' />
+ <node id='-34509' lat='51.24432' lon='6.07889' />
+ <node id='-34511' lat='51.40537' lon='6.21182' />
+ <node id='-34513' lat='51.48568' lon='6.21724' />
+ <node id='-34515' lat='51.36135' lon='6.22674' />
+ <node id='-34517' lat='51.33169' lon='6.16977' />
+ <node id='-34519' lat='51.65514' lon='6.11416' />
+ <node id='-34521' lat='51.68038' lon='6.0287' />
+ <node id='-34523' lat='51.71821' lon='6.04091' />
+ <node id='-34525' lat='51.87257' lon='6.38815' />
+ <node id='-34527' lat='51.82984' lon='6.40172' />
+ <node id='-34529' lat='51.90439' lon='6.15349' />
+ <node id='-34531' lat='51.89769' lon='6.11551' />
+ <node id='-34533' lat='51.84158' lon='6.16027' />
+ <node id='-34535' lat='51.86168' lon='6.06397' />
+ <node id='-34537' lat='51.76944' lon='5.98665' />
+ <node id='-34539' lat='51.83487' lon='5.9541' />
+ <node id='-34541' lat='51.7493' lon='5.95003' />
+ <node id='-34543' lat='51.96711' lon='6.82357' />
+ <node id='-34545' lat='51.89518' lon='6.72319' />
+ <node id='-34547' lat='51.91861' lon='6.68386' />
+ <node id='-34549' lat='52.22626' lon='6.98498' />
+ <node id='-34551' lat='52.11728' lon='6.83984' />
+ <node id='-34553' lat='52.11895' lon='6.76117' />
+ <node id='-34555' lat='51.9905' lon='6.83035' />
+ <node id='-34557' lat='52.0481' lon='6.68386' />
+ <node id='-34559' lat='52.37805' lon='7.07044' />
+ <node id='-34561' lat='52.27941' lon='7.02703' />
+ <node id='-34563' lat='52.23789' lon='7.06365' />
+ <node id='-34565' lat='52.47235' lon='6.99041' />
+ <node id='-34567' lat='52.43597' lon='6.94293' />
+ <node id='-34569' lat='52.62905' lon='6.71641' />
+ <node id='-34571' lat='52.83604' lon='7.08129' />
+ <node id='-34573' lat='53.00288' lon='7.21557' />
+ <node id='-34575' lat='53.13735' lon='7.17624' />
+ <node id='-34577' lat='50.72647' lon='6.0326' />
+ <node id='-34579' lat='50.54179' lon='6.17802' />
+ <node id='-34581' lat='50.53576' lon='6.19735' />
+ <node id='-34583' lat='50.5212' lon='6.19193' />
+ <node id='-34585' lat='50.52013' lon='6.20668' />
+ <node id='-34587' lat='50.50272' lon='6.26637' />
+ <node id='-34589' lat='50.50058' lon='6.30809' />
+ <node id='-34591' lat='50.40776' lon='6.36852' />
+ <node id='-34593' lat='50.31139' lon='6.35701' />
+ <node id='-34595' lat='50.32333' lon='6.32488' />
+ <node id='-34597' lat='50.37994' lon='6.34406' />
+ <node id='-34599' lat='50.33557' lon='6.40785' />
+ <node id='-34601' lat='50.32425' lon='6.40641' />
+ <node id='-34603' lat='50.15279' lon='6.13497' />
+ <node id='-34605' lat='50.75448' lon='5.84888' />
+ <node id='-34607' lat='50.76542' lon='5.84548' />
+ <node id='-34609' lat='50.7622' lon='5.95942' />
+ <node id='-34611' lat='51.10861' lon='5.8109' />
+ <node id='-34613' lat='51.10585' lon='5.83226' />
+ <node id='-34615' lat='51.05834' lon='5.79835' />
+ <node id='-34617' lat='51.09328' lon='5.82921' />
+ <node id='-34619' lat='51.09371' lon='5.79903' />
+ <node id='-34621' lat='51.06196' lon='5.77258' />
+ <node id='-34623' lat='51.27502' lon='5.347' />
+ <node id='-34625' lat='51.26314' lon='5.33886' />
+ <node id='-34627' lat='51.47167' lon='5.0106' />
+ <node id='-34629' lat='51.44736' lon='4.82409' />
+ <node id='-34631' lat='51.44905' lon='4.38122' />
+ <node id='-34633' lat='51.27331' lon='3.38289' />
+ <node id='-34635' lat='51.31572' lon='3.35847' />
+ <node id='-34637' lat='51.33436' lon='3.38696' />
+ <node id='-34639' lat='29.58903' lon='64.62116' />
+ <node id='-34641' lat='29.50407' lon='64.19796' />
+ <node id='-34643' lat='-4.67835' lon='39.21631' />
+ <node id='-34645' lat='-4.64201' lon='40.14328' />
+ <node id='-34647' lat='-4.68136' lon='39.62121' />
+ <node id='-34649' lat='-3.50723' lon='37.63099' />
+ <node id='-34651' lat='-3.54243' lon='37.75036' />
+ <node id='-34653' lat='-3.42735' lon='37.5903' />
+ <node id='-34655' lat='-1.05101' lon='34.03084' />
+ <node id='-34657' lat='-1.02264' lon='34.0824' />
+ <node id='-34659' lat='-1.00779' lon='34.02286' />
+ <node id='-34661' lat='-7.14121' lon='30.2567' />
+ <node id='-34663' lat='-2.65841' lon='30.52747' />
+ <node id='-34665' lat='-2.86151' lon='30.40662' />
+ <node id='-34667' lat='-2.9573' lon='30.4987' />
+ <node id='-34669' lat='-2.89791' lon='30.57926' />
+ <node id='-34671' lat='-2.98987' lon='30.6675' />
+ <node id='-34673' lat='-2.97837' lon='30.83823' />
+ <node id='-34675' lat='-3.56532' lon='30.45915' />
+ <node id='-34677' lat='-4.01738' lon='30.22042' />
+ <node id='-34679' lat='-4.26631' lon='30.03323' />
+ <node id='-34681' lat='-4.45836' lon='29.75109' />
+ <node id='-34683' lat='-2.81978' lon='29.00404' />
+ <node id='-34685' lat='-2.81774' lon='29.0505' />
+ <node id='-34687' lat='-2.87871' lon='29.09119' />
+ <node id='-34689' lat='-2.95457' lon='29.16037' />
+ <node id='-34691' lat='-2.99385' lon='29.17258' />
+ <node id='-34693' lat='-2.91935' lon='29.09797' />
+ <node id='-34695' lat='-2.78523' lon='29.00167' />
+ <node id='-34697' lat='-3.3514' lon='29.21463' />
+ <node id='-34699' lat='-9.49122' lon='28.56208' />
+ <node id='-34701' lat='-9.78' lon='28.68532' />
+ <node id='-34703' lat='-8.66935' lon='28.9711' />
+ <node id='-34705' lat='-9.23393' lon='28.38526' />
+ <node id='-34707' lat='-9.30091' lon='28.36562' />
+ <node id='-34709' lat='-9.35379' lon='28.52636' />
+ <node id='-34711' lat='-16.15414' lon='35.52365' />
+ <node id='-34713' lat='-14.89478' lon='35.87212' />
+ <node id='-34715' lat='-14.27714' lon='35.5299' />
+ <node id='-34717' lat='-14.15594' lon='35.47989' />
+ <node id='-34719' lat='-21.48967' lon='39.10324' />
+ <node id='-34721' lat='-26.40185' lon='32.07352' />
+ <node id='-34723' lat='-26.15656' lon='32.10435' />
+ <node id='-34725' lat='-27.11057' lon='31.97463' />
+ <node id='-34727' lat='-26.80721' lon='32.09664' />
+ <node id='-34729' lat='-26.26303' lon='30.95819' />
+ <node id='-34731' lat='-25.7431' lon='31.31237' />
+ <node id='-34733' lat='-25.91558' lon='31.13073' />
+ <node id='-34735' lat='-26.48271' lon='30.78927' />
+ <node id='-34737' lat='-29.59223' lon='29.28899' />
+ <node id='-34739' lat='-29.76266' lon='29.12553' />
+ <node id='-34741' lat='-29.3772' lon='29.44883' />
+ <node id='-34743' lat='-29.21246' lon='29.40524' />
+ <node id='-34745' lat='-28.57958' lon='28.65328' />
+ <node id='-34747' lat='-28.8631' lon='28.02847' />
+ <node id='-34749' lat='-28.85674' lon='27.92676' />
+ <node id='-34751' lat='-28.92671' lon='27.76692' />
+ <node id='-34753' lat='-29.48161' lon='27.33464' />
+ <node id='-34755' lat='-29.99889' lon='27.2293' />
+ <node id='-34757' lat='-30.15606' lon='27.39276' />
+ <node id='-34759' lat='-30.32239' lon='27.45452' />
+ <node id='-34761' lat='-30.10579' lon='28.80222' />
+ <node id='-34763' lat='-30.1592' lon='28.399' />
+ <node id='-34765' lat='-29.91706' lon='29.16548' />
+ <node id='-34767' lat='-30.28476' lon='28.2319' />
+ <node id='-34769' lat='-30.6167' lon='27.77419' />
+ <node id='-34771' lat='-29.72796' lon='27.09489' />
+ <node id='-34773' lat='-30.3318' lon='27.38187' />
+ <node id='-34775' lat='-28.89165' lon='18.99885' />
+ <node id='-34777' lat='-28.68718' lon='17.4579' />
+ <node id='-34779' lat='-28.08573' lon='17.15405' />
+ <node id='-34781' lat='-28.057' lon='16.90446' />
+ <node id='-34783' lat='-18.0682' lon='24.56583' />
+ <node id='-34785' lat='-17.95726' lon='24.40577' />
+ <node id='-34787' lat='-18.01919' lon='24.19416' />
+ <node id='-34789' lat='-17.99855' lon='23.29618' />
+ <node id='-34791' lat='-18.4881' lon='23.61088' />
+ <node id='-34793' lat='-17.52963' lon='24.5621' />
+ <node id='-34795' lat='-17.46818' lon='24.38712' />
+ <node id='-34797' lat='-17.49082' lon='24.32811' />
+ <node id='-34799' lat='-17.47489' lon='24.23619' />
+ <node id='-34801' lat='-17.90832' lon='25.23909' />
+ <node id='-34803' lat='-17.84452' lon='25.05895' />
+ <node id='-34805' lat='-17.79674' lon='24.95586' />
+ <node id='-34807' lat='-17.78253' lon='25.16882' />
+ <node id='-34809' lat='-17.58221' lon='25.00198' />
+ <node id='-34811' lat='-17.94318' lon='21.14283' />
+ <node id='-34813' lat='-17.80375' lon='18.84226' />
+ <node id='-34815' lat='-17.15165' lon='12.07076' />
+ <node id='-34817' lat='-17.43141' lon='13.95896' />
+ <node id='-34819' lat='-16.98048' lon='13.36212' />
+ <node id='-34821' lat='-16.98567' lon='12.97145' />
+ <node id='-34823' lat='-17.24495' lon='12.52111' />
+ <node id='-34825' lat='-17.25013' lon='11.75063' />
+ <node id='-34827' lat='-17.47563' lon='23.20038' />
+ <node id='-34829' lat='-16.50269' lon='22.17217' />
+ <node id='-34831' lat='-11.15368' lon='24.02603' />
+ <node id='-34833' lat='-12.13149' lon='23.98804' />
+ <node id='-34835' lat='-12.29058' lon='24.06672' />
+ <node id='-34837' lat='-12.844' lon='23.90937' />
+ <node id='-34839' lat='-11.02856' lon='23.86868' />
+ <node id='-34841' lat='-10.946' lon='23.45631' />
+ <node id='-34843' lat='-11.10577' lon='23.16602' />
+ <node id='-34845' lat='-11.05784' lon='22.54205' />
+ <node id='-34847' lat='-5.87078' lon='13.04371' />
+ <node id='-34849' lat='-6.07585' lon='12.42245' />
+ <node id='-34851' lat='-9.94628' lon='22.19039' />
+ <node id='-34853' lat='-10.76291' lon='22.32604' />
+ <node id='-34855' lat='-10.85884' lon='22.17954' />
+ <node id='-34857' lat='-9.59871' lon='21.84856' />
+ <node id='-34859' lat='-6.91953' lon='20.31846' />
+ <node id='-34861' lat='-6.90876' lon='20.61689' />
+ <node id='-34863' lat='-7.28566' lon='20.56263' />
+ <node id='-34865' lat='-6.98955' lon='20.30218' />
+ <node id='-34867' lat='-8.00126' lon='18.33635' />
+ <node id='-34869' lat='-7.21787' lon='16.96282' />
+ <node id='-34871' lat='56.31406' lon='21.57888' />
+ <node id='-34873' lat='56.16917' lon='21.24644' />
+ <node id='-34875' lat='56.35742' lon='23.75932' />
+ <node id='-34877' lat='56.33756' lon='23.53443' />
+ <node id='-34879' lat='56.29598' lon='24.31991' />
+ <node id='-34881' lat='56.26522' lon='24.11457' />
+ <node id='-34883' lat='56.3231' lon='24.02657' />
+ <node id='-34885' lat='56.26522' lon='24.42746' />
+ <node id='-34887' lat='56.3827' lon='23.31606' />
+ <node id='-34889' lat='56.36284' lon='22.69354' />
+ <node id='-34891' lat='56.40074' lon='22.98362' />
+ <node id='-34893' lat='56.31768' lon='23.0651' />
+ <node id='-34895' lat='56.1878' lon='25.09325' />
+ <node id='-34897' lat='56.08892' lon='25.69246' />
+ <node id='-34899' lat='55.95884' lon='26.03815' />
+ <node id='-34901' lat='56.14802' lon='25.66941' />
+ <node id='-34903' lat='55.70905' lon='26.39767' />
+ <node id='-34905' lat='56.11849' lon='27.97865' />
+ <node id='-34907' lat='55.89687' lon='27.63065' />
+ <node id='-34909' lat='55.8089' lon='27.3541' />
+ <node id='-34911' lat='55.78558' lon='27.61683' />
+ <node id='-34913' lat='55.78299' lon='27.27804' />
+ <node id='-34915' lat='55.85032' lon='27.1559' />
+ <node id='-34917' lat='55.8102' lon='26.97153' />
+ <node id='-34919' lat='55.67658' lon='26.76872' />
+ <node id='-34921' lat='55.70645' lon='26.71802' />
+ <node id='-34923' lat='55.70515' lon='26.64888' />
+ <node id='-34925' lat='57.53728' lon='27.56832' />
+ <node id='-34927' lat='57.42826' lon='27.52453' />
+ <node id='-34929' lat='57.29402' lon='27.86101' />
+ <node id='-34931' lat='56.524' lon='28.10069' />
+ <node id='-34933' lat='56.44637' lon='28.19057' />
+ <node id='-34935' lat='56.59004' lon='28.04768' />
+ <node id='-34937' lat='56.57989' lon='28.13526' />
+ <node id='-34939' lat='56.88204' lon='27.86101' />
+ <node id='-34941' lat='56.83921' lon='27.66511' />
+ <node id='-34943' lat='56.27588' lon='28.23716' />
+ <node id='-34945' lat='56.37806' lon='28.16599' />
+ <node id='-34947' lat='57.90193' lon='25.73499' />
+ <node id='-34949' lat='57.98539' lon='25.28237' />
+ <node id='-34951' lat='58.08288' lon='25.29581' />
+ <node id='-34953' lat='57.7718' lon='26.03332' />
+ <node id='-34955' lat='57.78342' lon='26.02456' />
+ <node id='-34957' lat='57.78158' lon='26.027' />
+ <node id='-34959' lat='57.77441' lon='26.0266' />
+ <node id='-34961' lat='57.77169' lon='26.02069' />
+ <node id='-34963' lat='57.76865' lon='26.02415' />
+ <node id='-34965' lat='57.76105' lon='26.0543' />
+ <node id='-34967' lat='57.76619' lon='26.08098' />
+ <node id='-34969' lat='57.7206' lon='26.2029' />
+ <node id='-34971' lat='57.79037' lon='26.0324' />
+ <node id='-34973' lat='57.84744' lon='26.05949' />
+ <node id='-34975' lat='57.56885' lon='26.46527' />
+ <node id='-34977' lat='57.59244' lon='26.29253' />
+ <node id='-34979' lat='57.6849' lon='26.1866' />
+ <node id='-34981' lat='57.51813' lon='26.54675' />
+ <node id='-34983' lat='57.62823' lon='26.90364' />
+ <node id='-34985' lat='57.83356' lon='27.56689' />
+ <node id='-34987' lat='57.83963' lon='27.78526' />
+ <node id='-34989' lat='57.78842' lon='27.50171' />
+ <node id='-34991' lat='57.72843' lon='27.52615' />
+ <node id='-34993' lat='57.66834' lon='27.3746' />
+ <node id='-34995' lat='57.62125' lon='27.40393' />
+ <node id='-34997' lat='57.57672' lon='27.31919' />
+ <node id='-34999' lat='58.09462' lon='27.62393' />
+ <node id='-35001' lat='58.22615' lon='27.48541' />
+ <node id='-35003' lat='57.92627' lon='27.67282' />
+ <node id='-35005' lat='59.18097' lon='27.87978' />
+ <node id='-35007' lat='59.1116' lon='27.80482' />
+ <node id='-35009' lat='59.28351' lon='28.00689' />
+ <node id='-35011' lat='59.37744' lon='28.20897' />
+ <node id='-35013' lat='59.28934' lon='28.14215' />
+ <node id='-35015' lat='59.24353' lon='27.90911' />
+ <node id='-35017' lat='31.31921' lon='24.83101' />
+ <node id='-35019' lat='30.73861' lon='25.01077' />
+ <node id='-35021' lat='30.17441' lon='24.71117' />
+ <node id='-35023' lat='11.36323' lon='-14.77786' />
+ <node id='-35025' lat='10.99244' lon='-14.95993' />
+ <node id='-35027' lat='12.16869' lon='-13.94589' />
+ <node id='-35029' lat='12.24077' lon='-13.92745' />
+ <node id='-35031' lat='12.24978' lon='-13.70851' />
+ <node id='-35033' lat='12.49515' lon='-13.65089' />
+ <node id='-35035' lat='12.42764' lon='-13.64168' />
+ <node id='-35037' lat='12.60313' lon='-13.7039' />
+ <node id='-35039' lat='12.00869' lon='-13.7039' />
+ <node id='-35041' lat='11.63649' lon='-14.09799' />
+ <node id='-35043' lat='11.70195' lon='-13.7039' />
+ <node id='-35045' lat='11.67486' lon='-14.26623' />
+ <node id='-35047' lat='12.42974' lon='-15.67302' />
+ <node id='-35049' lat='12.46157' lon='-16.20591' />
+ <node id='-35051' lat='12.36449' lon='-16.38191' />
+ <node id='-35053' lat='13.34472' lon='-13.79409' />
+ <node id='-35055' lat='13.59126' lon='-13.8955' />
+ <node id='-35057' lat='13.46578' lon='-14.34721' />
+ <node id='-35059' lat='13.23033' lon='-14.36795' />
+ <node id='-35061' lat='13.80173' lon='-14.93719' />
+ <node id='-35063' lat='15.51558' lon='-11.70705' />
+ <node id='-35065' lat='14.76143' lon='-11.94903' />
+ <node id='-35067' lat='15.4223' lon='-10.71721' />
+ <node id='-35069' lat='16.09022' lon='-13.43135' />
+ <node id='-35071' lat='16.64997' lon='-15.00557' />
+ <node id='-35073' lat='16.50315' lon='-15.6509' />
+ <node id='-35075' lat='16.51565' lon='-16.27016' />
+ <node id='-35077' lat='16.20605' lon='-16.4429' />
+ <node id='-35079' lat='38.25518' lon='127.04479' />
+ <node id='-35081' lat='38.10246' lon='126.89239' />
+ <node id='-35083' lat='38.0344' lon='126.84961' />
+ <node id='-35085' lat='37.7897' lon='126.66067' />
+ <node id='-35087' lat='37.76364' lon='126.59918' />
+ <node id='-35089' lat='37.76857' lon='126.56709' />
+ <node id='-35091' lat='59.8926' lon='12.15641' />
+ <node id='-35093' lat='59.86039' lon='11.87121' />
+ <node id='-35095' lat='59.69531' lon='11.92112' />
+ <node id='-35097' lat='59.59442' lon='11.69297' />
+ <node id='-35099' lat='59.24985' lon='11.8213' />
+ <node id='-35101' lat='58.90177' lon='11.65732' />
+ <node id='-35103' lat='59.99259' lon='12.36317' />
+ <node id='-35105' lat='60.13846' lon='12.52003' />
+ <node id='-35107' lat='60.50559' lon='12.59133' />
+ <node id='-35109' lat='61.02442' lon='12.2277' />
+ <node id='-35111' lat='61.06584' lon='12.69115' />
+ <node id='-35113' lat='61.56547' lon='12.57707' />
+ <node id='-35115' lat='61.57226' lon='12.40595' />
+ <node id='-35117' lat='61.35427' lon='12.86939' />
+ <node id='-35119' lat='62.25699' lon='12.29187' />
+ <node id='-35121' lat='62.6297' lon='12.07085' />
+ <node id='-35123' lat='63.00104' lon='12.19919' />
+ <node id='-35125' lat='64.02171' lon='12.74105' />
+ <node id='-35127' lat='63.59373' lon='12.14928' />
+ <node id='-35129' lat='63.47935' lon='12.19919' />
+ <node id='-35131' lat='63.27487' lon='11.98529' />
+ <node id='-35133' lat='65.31786' lon='14.50926' />
+ <node id='-35135' lat='66.15572' lon='15.05113' />
+ <node id='-35137' lat='66.28509' lon='15.49318' />
+ <node id='-35139' lat='66.48217' lon='15.37197' />
+ <node id='-35141' lat='66.12399' lon='14.53778' />
+ <node id='-35143' lat='67.4364' lon='16.09922' />
+ <node id='-35145' lat='67.21653' lon='16.39154' />
+ <node id='-35147' lat='67.52106' lon='16.12774' />
+ <node id='-35149' lat='67.06419' lon='16.35589' />
+ <node id='-35151' lat='68.11591' lon='17.30416' />
+ <node id='-35153' lat='67.91037' lon='16.7409' />
+ <node id='-35155' lat='67.52923' lon='16.38441' />
+ <node id='-35157' lat='68.20874' lon='18.13836' />
+ <node id='-35159' lat='68.53721' lon='18.1241' />
+ <node id='-35161' lat='68.58672' lon='18.39503' />
+ <node id='-35163' lat='68.50849' lon='18.63032' />
+ <node id='-35165' lat='68.52416' lon='18.97255' />
+ <node id='-35167' lat='68.93283' lon='20.28444' />
+ <node id='-35169' lat='68.80174' lon='20.33435' />
+ <node id='-35171' lat='68.67246' lon='20.22027' />
+ <node id='-35173' lat='68.55546' lon='19.95647' />
+ <node id='-35175' lat='68.48759' lon='20.22027' />
+ <node id='-35177' lat='68.35911' lon='19.93508' />
+ <node id='-35179' lat='66.15802' lon='23.90497' />
+ <node id='-35181' lat='66.21299' lon='23.71339' />
+ <node id='-35183' lat='66.772' lon='23.89488' />
+ <node id='-35185' lat='66.79585' lon='23.98059' />
+ <node id='-35187' lat='66.56434' lon='23.85959' />
+ <node id='-35189' lat='66.43568' lon='23.63776' />
+ <node id='-35191' lat='66.84149' lon='23.98563' />
+ <node id='-35193' lat='67.17038' lon='23.56214' />
+ <node id='-35195' lat='67.20752' lon='23.58735' />
+ <node id='-35197' lat='67.25435' lon='23.54701' />
+ <node id='-35199' lat='67.29914' lon='23.75372' />
+ <node id='-35201' lat='67.43688' lon='23.75372' />
+ <node id='-35203' lat='67.85297' lon='23.45627' />
+ <node id='-35205' lat='67.59306' lon='23.54701' />
+ <node id='-35207' lat='67.46974' lon='23.39577' />
+ <node id='-35209' lat='68.05545' lon='23.40081' />
+ <node id='-35211' lat='68.15134' lon='23.26469' />
+ <node id='-35213' lat='68.14759' lon='23.15377' />
+ <node id='-35215' lat='67.9497' lon='23.65793' />
+ <node id='-35217' lat='68.26551' lon='23.10336' />
+ <node id='-35219' lat='68.40881' lon='22.73028' />
+ <node id='-35221' lat='68.50692' lon='22.00429' />
+ <node id='-35223' lat='68.88969' lon='21.03001' />
+ <node id='-35225' lat='68.89696' lon='20.90649' />
+ <node id='-35227' lat='68.93142' lon='20.85104' />
+ <node id='-35229' lat='68.96764' lon='20.91658' />
+ <node id='-35231' lat='69.03087' lon='20.78802' />
+ <node id='-35233' lat='69.22755' lon='21.00732' />
+ <node id='-35235' lat='68.71561' lon='22.38367' />
+ <node id='-35237' lat='68.89514' lon='22.27276' />
+ <node id='-35239' lat='62.43042' lon='31.10136' />
+ <node id='-35241' lat='60.95323' lon='28.66124' />
+ <node id='-35243' lat='60.93365' lon='28.47974' />
+ <node id='-35245' lat='62.66284' lon='31.38369' />
+ <node id='-35247' lat='62.91642' lon='31.58535' />
+ <node id='-35249' lat='63.09035' lon='31.29294' />
+ <node id='-35251' lat='63.22239' lon='31.23244' />
+ <node id='-35253' lat='63.46666' lon='30.49637' />
+ <node id='-35255' lat='63.83364' lon='30.25437' />
+ <node id='-35257' lat='63.75795' lon='29.98213' />
+ <node id='-35259' lat='64.09036' lon='30.55687' />
+ <node id='-35261' lat='64.25728' lon='30.4762' />
+ <node id='-35263' lat='64.35782' lon='30.06279' />
+ <node id='-35265' lat='64.57513' lon='30.01238' />
+ <node id='-35267' lat='64.64862' lon='30.12329' />
+ <node id='-35269' lat='64.79072' lon='30.05271' />
+ <node id='-35271' lat='64.80789' lon='29.68972' />
+ <node id='-35273' lat='65.05993' lon='29.61914' />
+ <node id='-35275' lat='65.1109' lon='29.84096' />
+ <node id='-35277' lat='65.22101' lon='29.8813' />
+ <node id='-35279' lat='65.23791' lon='29.61914' />
+ <node id='-35281' lat='65.31803' lon='29.68972' />
+ <node id='-35283' lat='65.56945' lon='29.84096' />
+ <node id='-35285' lat='65.64025' lon='29.74013' />
+ <node id='-35287' lat='65.70256' lon='29.97205' />
+ <node id='-35289' lat='66.13863' lon='29.91155' />
+ <node id='-35291' lat='65.66935' lon='30.16363' />
+ <node id='-35293' lat='66.94139' lon='28.9839' />
+ <node id='-35295' lat='67.51507' lon='29.91155' />
+ <node id='-35297' lat='67.79872' lon='29.66955' />
+ <node id='-35299' lat='69.27485' lon='21.63833' />
+ <node id='-35301' lat='68.74393' lon='22.53321' />
+ <node id='-35303' lat='68.64684' lon='23.13064' />
+ <node id='-35305' lat='68.70276' lon='23.68017' />
+ <node id='-35307' lat='68.84514' lon='23.781' />
+ <node id='-35309' lat='68.81601' lon='24.02299' />
+ <node id='-35311' lat='68.73936' lon='24.18432' />
+ <node id='-35313' lat='68.65143' lon='24.74898' />
+ <node id='-35315' lat='68.55579' lon='24.90023' />
+ <node id='-35317' lat='68.61102' lon='24.93048' />
+ <node id='-35319' lat='68.63307' lon='25.10189' />
+ <node id='-35321' lat='68.78684' lon='25.12206' />
+ <node id='-35323' lat='68.90328' lon='25.42455' />
+ <node id='-35325' lat='68.53366' lon='28.43941' />
+ <node id='-35327' lat='68.86696' lon='28.78224' />
+ <node id='-35329' lat='68.91417' lon='28.45957' />
+ <node id='-35331' lat='68.89602' lon='25.61613' />
+ <node id='-35333' lat='68.99383' lon='25.75729' />
+ <node id='-35335' lat='69.27039' lon='25.69679' />
+ <node id='-35337' lat='69.68397' lon='25.96904' />
+ <node id='-35339' lat='69.91377' lon='26.40261' />
+ <node id='-35341' lat='69.96565' lon='26.64461' />
+ <node id='-35343' lat='70.06215' lon='27.57226' />
+ <node id='-35345' lat='69.92069' lon='27.05802' />
+ <node id='-35347' lat='70.0965' lon='27.95542' />
+ <node id='-35349' lat='69.99671' lon='27.97558' />
+ <node id='-35351' lat='69.88605' lon='28.32849' />
+ <node id='-35353' lat='69.81658' lon='28.36883' />
+ <node id='-35355' lat='69.47994' lon='29.31664' />
+ <node id='-35357' lat='69.22395' lon='28.8629' />
+ <node id='-35359' lat='69.11997' lon='28.81248' />
+ <node id='-35361' lat='69.54699' lon='30.95011' />
+ <node id='-35363' lat='69.54699' lon='30.52662' />
+ <node id='-35365' lat='69.65244' lon='30.16363' />
+ <node id='-35367' lat='69.41623' lon='29.97205' />
+ <node id='-35369' lat='69.2811' lon='29.27631' />
+ <node id='-35371' lat='69.13794' lon='29.26623' />
+ <node id='-35373' lat='69.0119' lon='29.0444' />
+ <node id='-35375' lat='11.1117' lon='-72.4767' />
+ <node id='-35377' lat='10.44309' lon='-72.88002' />
+ <node id='-35379' lat='9.85253' lon='-72.98085' />
+ <node id='-35381' lat='11.14138' lon='-72.24983' />
+ <node id='-35383' lat='11.65536' lon='-71.9675' />
+ <node id='-35385' lat='8.0448' lon='-72.36074' />
+ <node id='-35387' lat='8.36416' lon='-72.39603' />
+ <node id='-35389' lat='7.92497' lon='-72.48174' />
+ <node id='-35391' lat='7.40034' lon='-72.43132' />
+ <node id='-35393' lat='7.37034' lon='-72.19437' />
+ <node id='-35395' lat='9.10663' lon='-72.94052' />
+ <node id='-35397' lat='9.27584' lon='-73.02119' />
+ <node id='-35399' lat='9.16636' lon='-73.36905' />
+ <node id='-35401' lat='9.10165' lon='-72.77415' />
+ <node id='-35403' lat='8.59852' lon='-72.65315' />
+ <node id='-35405' lat='7.09526' lon='-70.7424' />
+ <node id='-35407' lat='6.99019' lon='-71.03985' />
+ <node id='-35409' lat='7.04022' lon='-72.03808' />
+ <node id='-35411' lat='6.96516' lon='-70.10716' />
+ <node id='-35413' lat='6.2891' lon='-67.60654' />
+ <node id='-35415' lat='6.16882' lon='-67.46538' />
+ <node id='-35417' lat='5.98835' lon='-67.43513' />
+ <node id='-35419' lat='5.76768' lon='-67.64183' />
+ <node id='-35421' lat='5.5369' lon='-67.59141' />
+ <node id='-35423' lat='5.31104' lon='-67.83341' />
+ <node id='-35425' lat='4.53249' lon='-67.85358' />
+ <node id='-35427' lat='3.74303' lon='-67.62671' />
+ <node id='-35429' lat='3.75812' lon='-67.50067' />
+ <node id='-35431' lat='2.81691' lon='-67.65696' />
+ <node id='-35433' lat='2.79173' lon='-67.85862' />
+ <node id='-35435' lat='2.86727' lon='-67.85862' />
+ <node id='-35437' lat='1.17441' lon='-67.08222' />
+ <node id='-35439' lat='1.80439' lon='-67.15784' />
+ <node id='-35441' lat='1.87494' lon='-67.299' />
+ <node id='-35443' lat='2.22258' lon='-67.40488' />
+ <node id='-35445' lat='1.82455' lon='-67.9292' />
+ <node id='-35447' lat='2.00091' lon='-68.18632' />
+ <node id='-35449' lat='1.83463' lon='-68.26699' />
+ <node id='-35451' lat='1.72881' lon='-68.18128' />
+ <node id='-35453' lat='1.76408' lon='-69.53746' />
+ <node id='-35455' lat='1.70865' lon='-69.38621' />
+ <node id='-35457' lat='1.69353' lon='-69.83491' />
+ <node id='-35459' lat='0.84172' lon='-69.14422' />
+ <node id='-35461' lat='1.06856' lon='-69.26017' />
+ <node id='-35463' lat='1.07864' lon='-69.82987' />
+ <node id='-35465' lat='-1.01853' lon='-69.4215' />
+ <node id='-35467' lat='-0.75136' lon='-69.59796' />
+ <node id='-35469' lat='-0.51947' lon='-69.603' />
+ <node id='-35471' lat='0.57958' lon='-69.20976' />
+ <node id='-35473' lat='0.71065' lon='-69.47696' />
+ <node id='-35475' lat='0.55437' lon='-70.04162' />
+ <node id='-35477' lat='-0.19681' lon='-70.03658' />
+ <node id='-35479' lat='1.64566' lon='-57.97336' />
+ <node id='-35481' lat='1.51966' lon='-58.01873' />
+ <node id='-35483' lat='1.58014' lon='-58.33887' />
+ <node id='-35485' lat='1.95808' lon='-57.23981' />
+ <node id='-35487' lat='2.01854' lon='-57.09109' />
+ <node id='-35489' lat='1.98327' lon='-57.35073' />
+ <node id='-35491' lat='1.69605' lon='-57.55743' />
+ <node id='-35493' lat='1.95304' lon='-57.07092' />
+ <node id='-35495' lat='1.89509' lon='-56.7659' />
+ <node id='-35497' lat='1.73344' lon='-57.77281' />
+ <node id='-35499' lat='1.48399' lon='-58.4858' />
+ <node id='-35501' lat='1.29154' lon='-58.53571' />
+ <node id='-35503' lat='1.17749' lon='-58.84229' />
+ <node id='-35505' lat='1.31293' lon='-58.92072' />
+ <node id='-35507' lat='1.40559' lon='-59.25583' />
+ <node id='-35509' lat='1.87596' lon='-59.74066' />
+ <node id='-35511' lat='2.27497' lon='-59.7264' />
+ <node id='-35513' lat='2.36759' lon='-59.91177' />
+ <node id='-35515' lat='2.92312' lon='-59.99733' />
+ <node id='-35517' lat='3.37162' lon='-59.79769' />
+ <node id='-35519' lat='3.57089' lon='-59.86899' />
+ <node id='-35521' lat='4.20399' lon='-59.73353' />
+ <node id='-35523' lat='3.91951' lon='-59.51963' />
+ <node id='-35525' lat='2.4317' lon='-63.39114' />
+ <node id='-35527' lat='2.48156' lon='-64.0257' />
+ <node id='-35529' lat='2.16098' lon='-63.39827' />
+ <node id='-35531' lat='1.94722' lon='-64.06135' />
+ <node id='-35533' lat='1.64792' lon='-64.08274' />
+ <node id='-35535' lat='1.35569' lon='-64.34654' />
+ <node id='-35537' lat='1.5125' lon='-64.38932' />
+ <node id='-35539' lat='1.12046' lon='-65.11657' />
+ <node id='-35541' lat='0.62856' lon='-65.57288' />
+ <node id='-35543' lat='0.92086' lon='-65.50158' />
+ <node id='-35545' lat='1.01353' lon='-65.6727' />
+ <node id='-35547' lat='3.89995' lon='-63.42233' />
+ <node id='-35549' lat='3.91417' lon='-63.70218' />
+ <node id='-35551' lat='3.94796' lon='-63.86082' />
+ <node id='-35553' lat='3.83592' lon='-63.50611' />
+ <node id='-35555' lat='3.9693' lon='-63.4464' />
+ <node id='-35557' lat='4.01731' lon='-63.67099' />
+ <node id='-35559' lat='3.90172' lon='-63.99183' />
+ <node id='-35561' lat='4.12932' lon='-64.14512' />
+ <node id='-35563' lat='4.28931' lon='-64.72977' />
+ <node id='-35565' lat='4.12576' lon='-64.57648' />
+ <node id='-35567' lat='3.7879' lon='-64.48379' />
+ <node id='-35569' lat='4.24665' lon='-64.84028' />
+ <node id='-35571' lat='4.04754' lon='-62.57656' />
+ <node id='-35573' lat='3.73099' lon='-62.7655' />
+ <node id='-35575' lat='4.03331' lon='-62.74411' />
+ <node id='-35577' lat='3.59935' lon='-62.98296' />
+ <node id='-35579' lat='3.96219' lon='-63.21111' />
+ <node id='-35581' lat='4.44216' lon='-61.29675' />
+ <node id='-35583' lat='4.43149' lon='-61.48569' />
+ <node id='-35585' lat='4.2822' lon='-61.54629' />
+ <node id='-35587' lat='4.08309' lon='-62.13094' />
+ <node id='-35589' lat='4.18621' lon='-62.44822' />
+ <node id='-35591' lat='4.54167' lon='-61.31457' />
+ <node id='-35593' lat='4.50613' lon='-61.12563' />
+ <node id='-35595' lat='4.54167' lon='-60.98303' />
+ <node id='-35597' lat='4.70512' lon='-60.86539' />
+ <node id='-35599' lat='4.94312' lon='-60.5802' />
+ <node id='-35601' lat='4.45637' lon='-59.78878' />
+ <node id='-35603' lat='4.53456' lon='-60.15953' />
+ <node id='-35605' lat='4.69801' lon='-60.04189' />
+ <node id='-35607' lat='5.07097' lon='-59.98129' />
+ <node id='-35609' lat='5.28754' lon='-60.20944' />
+ <node id='-35611' lat='5.21299' lon='-60.32352' />
+ <node id='-35613' lat='6.70922' lon='-61.13632' />
+ <node id='-35615' lat='6.58174' lon='-61.20762' />
+ <node id='-35617' lat='6.19558' lon='-61.15058' />
+ <node id='-35619' lat='7.1162' lon='-60.28074' />
+ <node id='-35621' lat='7.20817' lon='-60.44116' />
+ <node id='-35623' lat='7.14804' lon='-60.54098' />
+ <node id='-35625' lat='7.25061' lon='-60.63367' />
+ <node id='-35627' lat='7.33194' lon='-60.59802' />
+ <node id='-35629' lat='7.55817' lon='-60.71923' />
+ <node id='-35631' lat='7.56877' lon='-60.64793' />
+ <node id='-35633' lat='7.83373' lon='-60.51959' />
+ <node id='-35635' lat='7.8302' lon='-60.38056' />
+ <node id='-35637' lat='8.04557' lon='-60.02407' />
+ <node id='-35639' lat='8.20791' lon='-59.97059' />
+ <node id='-35641' lat='8.23261' lon='-59.83156' />
+ <node id='-35643' lat='8.28906' lon='-59.80661' />
+ <node id='-35645' lat='15.01158' lon='-83.49268' />
+ <node id='-35647' lat='14.76697' lon='-83.89551' />
+ <node id='-35649' lat='14.76353' lon='-84.10584' />
+ <node id='-35651' lat='14.89448' lon='-83.62101' />
+ <node id='-35653' lat='14.63249' lon='-84.48373' />
+ <node id='-35655' lat='14.68078' lon='-84.70119' />
+ <node id='-35657' lat='14.82212' lon='-84.82596' />
+ <node id='-35659' lat='14.80489' lon='-84.90082' />
+ <node id='-35661' lat='14.53934' lon='-85.1575' />
+ <node id='-35663' lat='14.24929' lon='-85.18602' />
+ <node id='-35665' lat='14.2562' lon='-85.32149' />
+ <node id='-35667' lat='12.98682' lon='-87.03785' />
+ <node id='-35669' lat='13.00892' lon='-87.06306' />
+ <node id='-35671' lat='13.05313' lon='-86.93197' />
+ <node id='-35673' lat='13.28385' lon='-86.90173' />
+ <node id='-35675' lat='13.30348' lon='-86.71267' />
+ <node id='-35677' lat='13.79605' lon='-86.76812' />
+ <node id='-35679' lat='13.77157' lon='-86.35219' />
+ <node id='-35681' lat='14.04317' lon='-86.14801' />
+ <node id='-35683' lat='14.08474' lon='-86.00685' />
+ <node id='-35685' lat='13.99181' lon='-86.03458' />
+ <node id='-35687' lat='13.8499' lon='-85.75477' />
+ <node id='-35689' lat='13.9698' lon='-85.73964' />
+ <node id='-35691' lat='13.50577' lon='-87.71657' />
+ <node id='-35693' lat='13.52906' lon='-87.78148' />
+ <node id='-35695' lat='13.75443' lon='-87.73106' />
+ <node id='-35697' lat='13.80829' lon='-87.68821' />
+ <node id='-35699' lat='13.91353' lon='-87.7966' />
+ <node id='-35701' lat='13.86948' lon='-88.00331' />
+ <node id='-35703' lat='13.98447' lon='-88.07641' />
+ <node id='-35705' lat='13.99915' lon='-88.23018' />
+ <node id='-35707' lat='13.91108' lon='-88.25791' />
+ <node id='-35709' lat='13.86458' lon='-88.48982' />
+ <node id='-35711' lat='13.97224' lon='-88.49738' />
+ <node id='-35713' lat='14.04317' lon='-88.70661' />
+ <node id='-35715' lat='14.10919' lon='-88.73182' />
+ <node id='-35717' lat='14.11652' lon='-88.815' />
+ <node id='-35719' lat='14.17763' lon='-88.85785' />
+ <node id='-35721' lat='14.20207' lon='-88.94608' />
+ <node id='-35723' lat='14.33644' lon='-89.04187' />
+ <node id='-35725' lat='14.44561' lon='-89.39028' />
+ <node id='-35727' lat='14.41108' lon='-89.57566' />
+ <node id='-35729' lat='14.33165' lon='-89.58814' />
+ <node id='-35731' lat='14.26084' lon='-89.50614' />
+ <node id='-35733' lat='14.22628' lon='-89.52397' />
+ <node id='-35735' lat='14.21937' lon='-89.61844' />
+ <node id='-35737' lat='14.1537' lon='-89.70756' />
+ <node id='-35739' lat='14.07073' lon='-89.75569' />
+ <node id='-35741' lat='14.04133' lon='-89.73251' />
+ <node id='-35743' lat='14.02923' lon='-89.76103' />
+ <node id='-35745' lat='14.07073' lon='-89.81807' />
+ <node id='-35747' lat='14.0396' lon='-89.88937' />
+ <node id='-35749' lat='13.85104' lon='-90.10505' />
+ <node id='-35751' lat='14.99967' lon='-89.18048' />
+ <node id='-35753' lat='14.97775' lon='-89.15149' />
+ <node id='-35755' lat='15.07392' lon='-89.15149' />
+ <node id='-35757' lat='14.85596' lon='-89.23467' />
+ <node id='-35759' lat='14.71582' lon='-89.13132' />
+ <node id='-35761' lat='14.57802' lon='-89.15653' />
+ <node id='-35763' lat='14.58046' lon='-89.23719' />
+ <node id='-35765' lat='14.47553' lon='-89.35189' />
+ <node id='-35767' lat='15.69247' lon='-88.24022' />
+ <node id='-35769' lat='15.66942' lon='-88.31459' />
+ <node id='-35771' lat='15.63665' lon='-88.32467' />
+ <node id='-35773' lat='19.50227' lon='-71.69448' />
+ <node id='-35775' lat='19.37866' lon='-71.69448' />
+ <node id='-35777' lat='19.26686' lon='-71.73229' />
+ <node id='-35779' lat='19.09305' lon='-71.6844' />
+ <node id='-35781' lat='18.95007' lon='-71.77766' />
+ <node id='-35783' lat='18.95007' lon='-71.88102' />
+ <node id='-35785' lat='19.21212' lon='-71.62642' />
+ <node id='-35787' lat='19.33823' lon='-71.77766' />
+ <node id='-35789' lat='18.64939' lon='-71.95412' />
+ <node id='-35791' lat='18.62551' lon='-71.82556' />
+ <node id='-35793' lat='18.45821' lon='-71.90875' />
+ <node id='-35795' lat='18.50125' lon='-71.88102' />
+ <node id='-35797' lat='18.62312' lon='-72.00201' />
+ <node id='-35799' lat='18.11115' lon='-71.74994' />
+ <node id='-35801' lat='18.18302' lon='-71.78271' />
+ <node id='-35803' lat='18.34101' lon='-71.69952' />
+ <node id='-35805' lat='15.97077' lon='-63.25348' />
+ <node id='-35807' lat='16.0256' lon='-63.85239' />
+ <node id='-35809' lat='-1.26222' lon='-73.65312' />
+ <node id='-35811' lat='-2.44514' lon='-72.92587' />
+ <node id='-35813' lat='-2.23142' lon='-70.94377' />
+ <node id='-35815' lat='-3.47626' lon='-80.2415' />
+ <node id='-35817' lat='-3.90317' lon='-80.13232' />
+ <node id='-35819' lat='-4.01342' lon='-80.46386' />
+ <node id='-35821' lat='-4.20543' lon='-80.45673' />
+ <node id='-35823' lat='-4.20187' lon='-80.3177' />
+ <node id='-35825' lat='-4.41516' lon='-80.46386' />
+ <node id='-35827' lat='-4.48269' lon='-80.39256' />
+ <node id='-35829' lat='-4.47558' lon='-79.79722' />
+ <node id='-35831' lat='-4.29786' lon='-80.13945' />
+ <node id='-35833' lat='-4.46848' lon='-79.59402' />
+ <node id='-35835' lat='-4.95167' lon='-79.26248' />
+ <node id='-35837' lat='-3.47653' lon='-78.14324' />
+ <node id='-35839' lat='-3.51113' lon='-78.22642' />
+ <node id='-35841' lat='-4.60754' lon='-78.68394' />
+ <node id='-35843' lat='-3.36431' lon='-78.19369' />
+ <node id='-35845' lat='-3.39907' lon='-78.24589' />
+ <node id='-35847' lat='-3.38633' lon='-78.34362' />
+ <node id='-35849' lat='-4.66795' lon='-78.85149' />
+ <node id='-35851' lat='-0.95588' lon='-75.22862' />
+ <node id='-35853' lat='-0.19213' lon='-75.53615' />
+ <node id='-35855' lat='-0.18708' lon='-75.60169' />
+ <node id='-35857' lat='-0.60048' lon='-75.22862' />
+ <node id='-35859' lat='-0.50218' lon='-74.42701' />
+ <node id='-35861' lat='-0.0308' lon='-75.18513' />
+ <node id='-35863' lat='-0.10012' lon='-75.61997' />
+ <node id='-35865' lat='-0.17196' lon='-75.40192' />
+ <node id='-35867' lat='0.05491' lon='-75.79075' />
+ <node id='-35869' lat='0.42294' lon='-76.23441' />
+ <node id='-35871' lat='0.39269' lon='-76.39574' />
+ <node id='-35873' lat='0.23641' lon='-76.46128' />
+ <node id='-35875' lat='0.64476' lon='-77.49984' />
+ <node id='-35877' lat='0.40782' lon='-77.52001' />
+ <node id='-35879' lat='1.15389' lon='-78.42749' />
+ <node id='-35881' lat='10.79916' lon='-83.66597' />
+ <node id='-35883' lat='10.71161' lon='-83.90838' />
+ <node id='-35885' lat='11.07568' lon='-84.68197' />
+ <node id='-35887' lat='10.9497' lon='-84.92439' />
+ <node id='-35889' lat='11.22607' lon='-85.60529' />
+ <node id='-35891' lat='11.06868' lon='-85.71223' />
+ <node id='-35893' lat='9.49378' lon='-82.65976' />
+ <node id='-35895' lat='9.59573' lon='-82.77206' />
+ <node id='-35897' lat='9.60979' lon='-82.87544' />
+ <node id='-35899' lat='9.4973' lon='-82.84871' />
+ <node id='-35901' lat='8.25926' lon='-82.93159' />
+ <node id='-35903' lat='8.47793' lon='-82.8496' />
+ <node id='-35905' lat='8.32982' lon='-83.04567' />
+ <node id='-35907' lat='8.6119' lon='-82.83534' />
+ <node id='-35909' lat='8.774' lon='-82.91377' />
+ <node id='-35911' lat='8.97125' lon='-82.72126' />
+ <node id='-35913' lat='9.46741' lon='-82.93516' />
+ <node id='-35915' lat='9.07687' lon='-82.93516' />
+ <node id='-35917' lat='7.47612' lon='-77.72157' />
+ <node id='-35919' lat='7.72348' lon='-77.72514' />
+ <node id='-35921' lat='7.51147' lon='-77.57185' />
+ <node id='-35923' lat='7.97422' lon='-77.17257' />
+ <node id='-35925' lat='8.49991' lon='-77.45064' />
+ <node id='-35927' lat='7.48319' lon='-77.81426' />
+ <node id='-35929' lat='-7.77897' lon='-73.65485' />
+ <node id='-35931' lat='-7.89884' lon='-73.76576' />
+ <node id='-35933' lat='-9.04074' lon='-72.92886' />
+ <node id='-35935' lat='-9.98049' lon='-72.14742' />
+ <node id='-35937' lat='-9.5184' lon='-72.31883' />
+ <node id='-35939' lat='-9.41397' lon='-72.72216' />
+ <node id='-35941' lat='-9.58303' lon='-70.58453' />
+ <node id='-35943' lat='-9.76692' lon='-70.55429' />
+ <node id='-35945' lat='-9.37418' lon='-70.49883' />
+ <node id='-35947' lat='-9.80666' lon='-70.62487' />
+ <node id='-35949' lat='-10.92744' lon='-69.90896' />
+ <node id='-35951' lat='-11.07096' lon='-70.38791' />
+ <node id='-35953' lat='-10.92249' lon='-70.51395' />
+ <node id='-35955' lat='-7.28944' lon='-73.77011' />
+ <node id='-35957' lat='-6.87919' lon='-73.73986' />
+ <node id='-35959' lat='-6.43852' lon='-73.12983' />
+ <node id='-35961' lat='-6.05764' lon='-73.24579' />
+ <node id='-35963' lat='-4.51661' lon='-71.87003' />
+ <node id='-35965' lat='-5.0391' lon='-72.64391' />
+ <node id='-35967' lat='-4.27281' lon='-70.11305' />
+ <node id='-35969' lat='-4.36581' lon='-69.99205' />
+ <node id='-35971' lat='-4.33816' lon='-70.20884' />
+ <node id='-35973' lat='-4.15214' lon='-70.33236' />
+ <node id='-35975' lat='-4.15717' lon='-70.77601' />
+ <node id='-35977' lat='-3.79505' lon='-70.3374' />
+ <node id='-35979' lat='-3.87553' lon='-70.52393' />
+ <node id='-35981' lat='-11.17606' lon='-68.70333' />
+ <node id='-35983' lat='-9.86253' lon='-65.29019' />
+ <node id='-35985' lat='-9.63894' lon='-65.40615' />
+ <node id='-35987' lat='-9.84266' lon='-65.56244' />
+ <node id='-35989' lat='-9.75323' lon='-65.68343' />
+ <node id='-35991' lat='-12.46398' lon='-64.30708' />
+ <node id='-35993' lat='-11.98604' lon='-64.99778' />
+ <node id='-35995' lat='-11.48749' lon='-65.30027' />
+ <node id='-35997' lat='-13.49564' lon='-61.81151' />
+ <node id='-35999' lat='-12.42952' lon='-63.76259' />
+ <node id='-36001' lat='-13.50054' lon='-61.05527' />
+ <node id='-36003' lat='-14.22496' lon='-60.46037' />
+ <node id='-36005' lat='-13.77981' lon='-60.48053' />
+ <node id='-36007' lat='-14.63021' lon='-60.27887' />
+ <node id='-36009' lat='-19.00544' lon='-57.69134' />
+ <node id='-36011' lat='-18.97546' lon='-57.71995' />
+ <node id='-36013' lat='-18.89573' lon='-57.71995' />
+ <node id='-36015' lat='-19.03161' lon='-57.71113' />
+ <node id='-36017' lat='-18.90087' lon='-57.76764' />
+ <node id='-36019' lat='-18.24219' lon='-57.48237' />
+ <node id='-36021' lat='-18.25655' lon='-57.56807' />
+ <node id='-36023' lat='-19.03259' lon='-57.78463' />
+ <node id='-36025' lat='-17.56095' lon='-57.73949' />
+ <node id='-36027' lat='-17.44555' lon='-57.90082' />
+ <node id='-36029' lat='-17.5273' lon='-57.99661' />
+ <node id='-36031' lat='-17.28195' lon='-58.32935' />
+ <node id='-36033' lat='-16.80958' lon='-58.5058' />
+ <node id='-36035' lat='-16.3699' lon='-58.30918' />
+ <node id='-36037' lat='-16.25861' lon='-58.32431' />
+ <node id='-36039' lat='-16.32636' lon='-58.41506' />
+ <node id='-36041' lat='-13.40792' lon='-68.8864' />
+ <node id='-36043' lat='-12.87769' lon='-68.85615' />
+ <node id='-36045' lat='-14.18639' lon='-68.88135' />
+ <node id='-36047' lat='-15.23478' lon='-69.14856' />
+ <node id='-36049' lat='-14.90861' lon='-69.39055' />
+ <node id='-36051' lat='-16.56863' lon='-69.04775' />
+ <node id='-36053' lat='-16.42165' lon='-68.98358' />
+ <node id='-36055' lat='-16.33272' lon='-68.79464' />
+ <node id='-36057' lat='-16.22664' lon='-69.11192' />
+ <node id='-36059' lat='-16.19925' lon='-68.96932' />
+ <node id='-36061' lat='-16.66769' lon='-69.00853' />
+ <node id='-36063' lat='-16.72233' lon='-69.16896' />
+ <node id='-36065' lat='-17.28142' lon='-69.62883' />
+ <node id='-36067' lat='-17.3665' lon='-69.47554' />
+ <node id='-36069' lat='-21.77837' lon='-66.24077' />
+ <node id='-36071' lat='-22.10105' lon='-66.29118' />
+ <node id='-36073' lat='-22.23644' lon='-66.7298' />
+ <node id='-36075' lat='-22.10105' lon='-65.7467' />
+ <node id='-36077' lat='-22.55807' lon='-64.22918' />
+ <node id='-36079' lat='-22.27377' lon='-64.58713' />
+ <node id='-36081' lat='-22.88824' lon='-64.31489' />
+ <node id='-36083' lat='-21.99357' lon='-63.93173' />
+ <node id='-36085' lat='-22.14775' lon='-62.80242' />
+ <node id='-36087' lat='-24.04436' lon='-60.28163' />
+ <node id='-36089' lat='-23.80934' lon='-60.99754' />
+ <node id='-36091' lat='-23.62932' lon='-61.0782' />
+ <node id='-36093' lat='-23.0507' lon='-61.9756' />
+ <node id='-36095' lat='-22.55807' lon='-62.22768' />
+ <node id='-36097' lat='-24.97099' lon='-58.33055' />
+ <node id='-36099' lat='-24.49935' lon='-59.33886' />
+ <node id='-36101' lat='-24.34787' lon='-59.45482' />
+ <node id='-36103' lat='-24.92528' lon='-58.25492' />
+ <node id='-36105' lat='-25.47269' lon='-57.57431' />
+ <node id='-36107' lat='-25.93604' lon='-57.87176' />
+ <node id='-36109' lat='-26.16704' lon='-58.1188' />
+ <node id='-36111' lat='-26.78079' lon='-58.28517' />
+ <node id='-36113' lat='-27.14028' lon='-58.65321' />
+ <node id='-36115' lat='-27.5165' lon='-56.85337' />
+ <node id='-36117' lat='-27.26135' lon='-57.96251' />
+ <node id='-36119' lat='-26.93821' lon='-55.3409' />
+ <node id='-36121' lat='-27.1941' lon='-55.62322' />
+ <node id='-36123' lat='-27.33303' lon='-55.58793' />
+ <node id='-36125' lat='-26.96068' lon='-55.16948' />
+ <node id='-36127' lat='-26.39306' lon='-54.68045' />
+ <node id='-36129' lat='-27.45836' lon='-55.7543' />
+ <node id='-36131' lat='-20.10053' lon='-61.93912' />
+ <node id='-36133' lat='-20.93155' lon='-57.84536' />
+ <node id='-36135' lat='-22.25347' lon='-56.23206' />
+ <node id='-36137' lat='-22.08072' lon='-56.45893' />
+ <node id='-36139' lat='-22.2768' lon='-56.72109' />
+ <node id='-36141' lat='-22.63556' lon='-55.65732' />
+ <node id='-36143' lat='-23.99669' lon='-55.12292' />
+ <node id='-36145' lat='-23.83078' lon='-54.6238' />
+ <node id='-36147' lat='-25.13381' lon='-54.4423' />
+ <node id='-36149' lat='-25.45288' lon='-54.61372' />
+ <node id='-36151' lat='-26.22082' lon='-53.68584' />
+ <node id='-36153' lat='-33.67337' lon='-53.52451' />
+ <node id='-36155' lat='-33.16843' lon='-53.53459' />
+ <node id='-36157' lat='-31.05053' lon='-55.87388' />
+ <node id='-36159' lat='-30.85164' lon='-55.6218' />
+ <node id='-36161' lat='-32.71147' lon='-53.1111' />
+ <node id='-36163' lat='-30.02578' lon='-56.90236' />
+ <node id='-36165' lat='-30.26121' lon='-57.22502' />
+ <node id='-36167' lat='-31.86762' lon='-58.21317' />
+ <node id='-36169' lat='-34.69099' lon='-57.83001' />
+ <node id='-36171' lat='-34.15035' lon='-58.34425' />
+ <node id='-36173' lat='-33.11777' lon='-58.40475' />
+ <node id='-36175' lat='-18.16893' lon='-69.14807' />
+ <node id='-36177' lat='-18.03715' lon='-69.07496' />
+ <node id='-36179' lat='-17.94844' lon='-69.28671' />
+ <node id='-36181' lat='-17.72048' lon='-69.82868' />
+ <node id='-36183' lat='-18.12582' lon='-69.81607' />
+ <node id='-36185' lat='-17.94605' lon='-69.75305' />
+ <node id='-36187' lat='-18.31737' lon='-70.16394' />
+ <node id='-36189' lat='-18.31258' lon='-70.31267' />
+ <node id='-36191' lat='-18.25992' lon='-69.96732' />
+ <node id='-36193' lat='-17.65083' lon='-69.66483' />
+ <node id='-36195' lat='-17.65563' lon='-69.79087' />
+ <node id='-36197' lat='-20.91542' lon='-68.53957' />
+ <node id='-36199' lat='-20.7355' lon='-68.55383' />
+ <node id='-36201' lat='-20.94562' lon='-68.40403' />
+ <node id='-36203' lat='-21.28614' lon='-68.18816' />
+ <node id='-36205' lat='-19.84651' lon='-68.54611' />
+ <node id='-36207' lat='-20.03134' lon='-68.57132' />
+ <node id='-36209' lat='-20.08817' lon='-68.74273' />
+ <node id='-36211' lat='-20.46178' lon='-68.7276' />
+ <node id='-36213' lat='-20.62701' lon='-68.44023' />
+ <node id='-36215' lat='-22.89771' lon='-67.54284' />
+ <node id='-36217' lat='-25.08636' lon='-68.38372' />
+ <node id='-36219' lat='-24.69831' lon='-68.56909' />
+ <node id='-36221' lat='-24.04237' lon='-67.33563' />
+ <node id='-36223' lat='-24.42596' lon='-68.24825' />
+ <node id='-36225' lat='-25.32505' lon='-68.57622' />
+ <node id='-36227' lat='-27.95042' lon='-69.22504' />
+ <node id='-36229' lat='-29.07185' lon='-69.80969' />
+ <node id='-36231' lat='-27.08414' lon='-68.43363' />
+ <node id='-36233' lat='-27.16029' lon='-68.77586' />
+ <node id='-36235' lat='-28.44055' lon='-69.66709' />
+ <node id='-36237' lat='-26.28146' lon='-68.56909' />
+ <node id='-36239' lat='-26.15353' lon='-68.38372' />
+ <node id='-36241' lat='-26.49861' lon='-68.59048' />
+ <node id='-36243' lat='-26.90626' lon='-68.27677' />
+ <node id='-36245' lat='-30.26131' lon='-69.8596' />
+ <node id='-36247' lat='-29.28351' lon='-69.99507' />
+ <node id='-36249' lat='-30.36595' lon='-70.14479' />
+ <node id='-36251' lat='-33.34489' lon='-69.88099' />
+ <node id='-36253' lat='-31.51559' lon='-70.55832' />
+ <node id='-36255' lat='-34.13344' lon='-69.87386' />
+ <node id='-36257' lat='-35.24145' lon='-70.49416' />
+ <node id='-36259' lat='-36.02375' lon='-70.38008' />
+ <node id='-36261' lat='-36.4321' lon='-70.95047' />
+ <node id='-36263' lat='-37.20264' lon='-71.24279' />
+ <node id='-36265' lat='-38.91474' lon='-71.37826' />
+ <node id='-36267' lat='-40.72714' lon='-71.92726' />
+ <node id='-36269' lat='-42.11711' lon='-71.74901' />
+ <node id='-36271' lat='-42.15941' lon='-72.15541' />
+ <node id='-36273' lat='-42.85321' lon='-72.14828' />
+ <node id='-36275' lat='-43.64774' lon='-71.64206' />
+ <node id='-36277' lat='-45.61611' lon='-71.75614' />
+ <node id='-36279' lat='-45.22075' lon='-71.35687' />
+ <node id='-36281' lat='-44.38097' lon='-71.81318' />
+ <node id='-36283' lat='-44.46244' lon='-71.16436' />
+ <node id='-36285' lat='-44.75684' lon='-71.26418' />
+ <node id='-36287' lat='-44.81756' lon='-72.06985' />
+ <node id='-36289' lat='-47.13595' lon='-71.94152' />
+ <node id='-36291' lat='-48.52392' lon='-72.54042' />
+ <node id='-36293' lat='-48.28727' lon='-72.27662' />
+ <node id='-36295' lat='-47.80586' lon='-72.50478' />
+ <node id='-36297' lat='-48.81116' lon='-72.56894' />
+ <node id='-36299' lat='-49.14342' lon='-73.09655' />
+ <node id='-36301' lat='45.1934' lon='-67.27039' />
+ <node id='-36303' lat='45.60725' lon='-67.6049' />
+ <node id='-36305' lat='45.91814' lon='-67.75196' />
+ <node id='-36307' lat='26.90984' lon='-10.68417' />
+ <node id='-36309' lat='20.80492' lon='-17.35589' />
+ <node id='-36311' lat='8.00111' lon='47.92477' />
+ <node id='-36313' lat='2.78611' lon='49.16337' />
+ <node id='-36315' lat='17.98125' lon='38.57727' />
+ <node id='-36317' lat='27.70027' lon='34.51305' />
+ <node id='-36319' lat='16.40211' lon='42.15205' />
+ <node id='-36321' lat='13.0483' lon='50.51849' />
+ <node id='-36323' lat='26.41236' lon='56.79239' />
+ <node id='-36325' lat='28.66798' lon='47.59863' />
+ <node id='-36327' lat='28.83382' lon='47.58376' />
+ <node id='-36329' lat='29.35727' lon='34.95987' />
+ <node id='-36331' lat='30.48295' lon='42.97796' />
+ <node id='-36333' lat='35.94113' lon='36.00514' />
+ <node id='-36335' lat='23.97539' lon='68.36773' />
+ <node id='-36337' lat='23.96613' lon='68.35017' />
+ <node id='-36339' lat='23.94328' lon='68.35557' />
+ <node id='-36341' lat='23.90963' lon='68.32416' />
+ <node id='-36343' lat='23.94513' lon='68.29139' />
+ <node id='-36345' lat='23.92044' lon='68.26876' />
+ <node id='-36347' lat='23.89758' lon='68.28261' />
+ <node id='-36349' lat='23.89542' lon='68.25052' />
+ <node id='-36351' lat='23.78616' lon='68.20613' />
+ <node id='-36353' lat='23.74856' lon='68.18511' />
+ <node id='-36355' lat='23.67771' lon='68.18129' />
+ <node id='-36357' lat='23.65321' lon='68.13829' />
+ <node id='-36359' lat='23.60419' lon='68.11059' />
+ <node id='-36361' lat='9.81445' lon='-60.89962' />
+ <node id='-36363' lat='11.77667' lon='-60.07172' />
+ <node id='-36365' lat='8.6862' lon='-59.54058' />
+ <node id='-36367' lat='18.73231' lon='-65.02435' />
+ <node id='-36369' lat='18.98678' lon='-64.62855' />
+ <node id='-36371' lat='18.3662' lon='-62.64209' />
+ <node id='-36373' lat='18.89029' lon='-63.3414' />
+ <node id='-36375' lat='18.06396' lon='-63.06302' />
+ <node id='-36377' lat='18.04943' lon='-63.07759' />
+ <node id='-36379' lat='18.04608' lon='-63.09686' />
+ <node id='-36381' lat='18.05368' lon='-63.11096' />
+ <node id='-36383' lat='18.02904' lon='-62.93924' />
+ <node id='-36385' lat='18.05565' lon='-63.02503' />
+ <node id='-36387' lat='18.0541' lon='-63.13584' />
+ <node id='-36389' lat='17.9615' lon='-63.33064' />
+ <node id='-36391' lat='18.06012' lon='-63.35989' />
+ <node id='-36393' lat='18.19278' lon='-62.86666' />
+ <node id='-36395' lat='17.90532' lon='-63.29212' />
+ <node id='-36397' lat='16.66647' lon='-61.83929' />
+ <node id='-36399' lat='16.69392' lon='-62.52079' />
+ <node id='-36401' lat='16.82364' lon='-62.62949' />
+ <node id='-36403' lat='16.48911' lon='-60.71337' />
+ <node id='-36405' lat='13.68336' lon='-61.43129' />
+ <node id='-36407' lat='12.52991' lon='-61.38256' />
+ <node id='-36409' lat='4.51394' lon='-51.63798' />
+ <node id='-36411' lat='11.96275' lon='-70.92579' />
+ <node id='-36413' lat='12.92535' lon='-70.34259' />
+ <node id='-36415' lat='11.79035' lon='-68.99639' />
+ <node id='-36417' lat='12.18025' lon='-69.4514' />
+ <node id='-36419' lat='12.36848' lon='-65.4181' />
+ <node id='-36421' lat='12.4116' lon='-67.89186' />
+ <node id='-36423' lat='11.92623' lon='-63.73917' />
+ <node id='-36425' lat='11.77722' lon='-68.01417' />
+ <node id='-36427' lat='20.32236' lon='-70.39828' />
+ <node id='-36429' lat='19.73128' lon='-71.77419' />
+ <node id='-36431' lat='17.48026' lon='-72.29523' />
+ <node id='-36433' lat='20.26689' lon='-79.63484' />
+ <node id='-36435' lat='19.50496' lon='-79.33932' />
+ <node id='-36437' lat='18.7521' lon='-81.52417' />
+ <node id='-36439' lat='19.51758' lon='-81.81969' />
+ <node id='-36441' lat='20.76169' lon='-85.29304' />
+ <node id='-36443' lat='20.93037' lon='-80.28428' />
+ <node id='-36445' lat='19.33462' lon='-78.19353' />
+ <node id='-36447' lat='19.51903' lon='-73.98196' />
+ <node id='-36449' lat='21.8218' lon='-85.9092' />
+ <node id='-36451' lat='25.97377' lon='-96.92418' />
+ <node id='-36453' lat='20.98822' lon='-71.13087' />
+ <node id='-36455' lat='21.53631' lon='-70.63262' />
+ <node id='-36457' lat='21.93519' lon='-17.27295' />
+ <node id='-36459' lat='27.02969' lon='-14.43883' />
+ <node id='-36461' lat='35.17111' lon='-2.41312' />
+ <node id='-36463' lat='35.63219' lon='-2.85819' />
+ <node id='-36465' lat='35.31207' lon='-2.96481' />
+ <node id='-36467' lat='35.28599' lon='-2.92181' />
+ <node id='-36469' lat='35.27313' lon='-2.92674' />
+ <node id='-36471' lat='37.97429' lon='2.46645' />
+ <node id='-36473' lat='38.19924' lon='7.89009' />
+ <node id='-36475' lat='35.25036' lon='12.02012' />
+ <node id='-36477' lat='35.88474' lon='13.4634' />
+ <node id='-36479' lat='35.36688' lon='14.74801' />
+ <node id='-36481' lat='42.39171' lon='18.54128' />
+ <node id='-36483' lat='42.48329' lon='18.44258' />
+ <node id='-36485' lat='42.21008' lon='9.86526' />
+ <node id='-36487' lat='41.32097' lon='9.28609' />
+ <node id='-36489' lat='41.26173' lon='8.80584' />
+ <node id='-36491' lat='43.20816' lon='9.56115' />
+ <node id='-36493' lat='43.53609' lon='7.53358' />
+ <node id='-36495' lat='43.78887' lon='7.5289' />
+ <node id='-36497' lat='45.64761' lon='13.6076' />
+ <node id='-36499' lat='41.90281' lon='12.45826' />
+ <node id='-36501' lat='41.90174' lon='12.45834' />
+ <node id='-36503' lat='41.90115' lon='12.4577' />
+ <node id='-36505' lat='41.90125' lon='12.45691' />
+ <node id='-36507' lat='41.9033' lon='12.45755' />
+ <node id='-36509' lat='41.90172' lon='12.45626' />
+ <node id='-36511' lat='41.9058' lon='12.45762' />
+ <node id='-36513' lat='41.90738' lon='12.45543' />
+ <node id='-36515' lat='41.90625' lon='12.45091' />
+ <node id='-36517' lat='41.90194' lon='12.44582' />
+ <node id='-36519' lat='41.90028' lon='12.45446' />
+ <node id='-36521' lat='43.57419' lon='7.63035' />
+ <node id='-36523' lat='41.44198' lon='9.62656' />
+ <node id='-36525' lat='41.54558' lon='7.52234' />
+ <node id='-36527' lat='45.33128' lon='13.05142' />
+ <node id='-36529' lat='44.48877' lon='13.12821' />
+ <node id='-36531' lat='42.18525' lon='16.15283' />
+ <node id='-36533' lat='36.26215' lon='15.10171' />
+ <node id='-36535' lat='36.53141' lon='14.02721' />
+ <node id='-36537' lat='35.1178' lon='12.80065' />
+ <node id='-36539' lat='40.72797' lon='25.94795' />
+ <node id='-36541' lat='40.3958' lon='26.04292' />
+ <node id='-36543' lat='40.17161' lon='25.61285' />
+ <node id='-36545' lat='39.39358' lon='25.94257' />
+ <node id='-36547' lat='39.43096' lon='26.43357' />
+ <node id='-36549' lat='39.0312' lon='26.70773' />
+ <node id='-36551' lat='38.81372' lon='26.61814' />
+ <node id='-36553' lat='38.74247' lon='26.25079' />
+ <node id='-36555' lat='38.65436' lon='26.21136' />
+ <node id='-36557' lat='38.54373' lon='26.3135' />
+ <node id='-36559' lat='38.45537' lon='26.3135' />
+ <node id='-36561' lat='38.44695' lon='26.24183' />
+ <node id='-36563' lat='38.38518' lon='26.21136' />
+ <node id='-36565' lat='38.31632' lon='26.22032' />
+ <node id='-36567' lat='38.23613' lon='26.18807' />
+ <node id='-36569' lat='38.17558' lon='26.21136' />
+ <node id='-36571' lat='38.09665' lon='26.32963' />
+ <node id='-36573' lat='37.9131' lon='27.05537' />
+ <node id='-36575' lat='37.79105' lon='27.16111' />
+ <node id='-36577' lat='37.72343' lon='27.16428' />
+ <node id='-36579' lat='37.69988' lon='27.09395' />
+ <node id='-36581' lat='37.69687' lon='27.00716' />
+ <node id='-36583' lat='37.64989' lon='26.95583' />
+ <node id='-36585' lat='37.55619' lon='27.05977' />
+ <node id='-36587' lat='37.32' lon='27.14757' />
+ <node id='-36589' lat='37.06591' lon='27.15474' />
+ <node id='-36591' lat='36.94571' lon='27.20312' />
+ <node id='-36593' lat='36.90703' lon='27.38411' />
+ <node id='-36595' lat='36.85686' lon='27.40203' />
+ <node id='-36597' lat='36.71622' lon='27.24613' />
+ <node id='-36599' lat='36.60122' lon='27.31602' />
+ <node id='-36601' lat='36.53789' lon='27.46117' />
+ <node id='-36603' lat='36.57244' lon='27.63857' />
+ <node id='-36605' lat='36.70904' lon='27.80701' />
+ <node id='-36607' lat='36.46155' lon='27.95037' />
+ <node id='-36609' lat='36.56812' lon='28.23708' />
+ <node id='-36611' lat='36.53069' lon='28.32668' />
+ <node id='-36613' lat='36.01033' lon='29.30783' />
+ <node id='-36615' lat='33.45682' lon='22.5213' />
+ <node id='-36617' lat='39.82496' lon='18.75365' />
+ <node id='-36619' lat='40.35325' lon='19.0384' />
+ <node id='-36621' lat='-21.93325' lon='-133.61511' />
+ <node id='-36623' lat='-24.55017' lon='-122.0366' />
+ <node id='-36625' lat='-45.18423' lon='-179.93224' />
+ <node id='-36627' lat='-22.90585' lon='-180.0' />
+ <node id='-36629' lat='-24.21376' lon='-180.0' />
+ <node id='-36631' lat='-14.96041' lon='-180.0' />
+ <node id='-36633' lat='-14.92809' lon='-167.73854' />
+ <node id='-36635' lat='-45.20102' lon='-173.00283' />
+ <node id='-36637' lat='-14.95183' lon='-176.76826' />
+ <node id='-36639' lat='-14.94228' lon='-173.13438' />
+ <node id='-36641' lat='-24.19665' lon='-173.10761' />
+ <node id='-36643' lat='-22.89767' lon='-176.74538' />
+ <node id='-36645' lat='-12.48057' lon='-174.18596' />
+ <node id='-36647' lat='-14.94502' lon='-174.17905' />
+ <node id='-36649' lat='-14.95666' lon='-178.60161' />
+ <node id='-36651' lat='-14.93704' lon='-171.14262' />
+ <node id='-36653' lat='-12.4725' lon='-171.14953' />
+ <node id='-36655' lat='-28.52556' lon='-156.44843' />
+ <node id='-36657' lat='-28.4709' lon='-133.59543' />
+ <node id='-36659' lat='-7.46952' lon='-133.65593' />
+ <node id='-36661' lat='-7.51261' lon='-149.6249' />
+ <node id='-36663' lat='-10.13616' lon='-174.17993' />
+ <node id='-36665' lat='-12.49232' lon='-178.60852' />
+ <node id='-36667' lat='1.65656' lon='-177.43928' />
+ <node id='-36669' lat='-1.40631' lon='-175.33482' />
+ <node id='-36671' lat='-7.54825' lon='-175.31804' />
+ <node id='-36673' lat='-10.12005' lon='-167.75195' />
+ <node id='-36675' lat='-7.4975' lon='-156.50903' />
+ <node id='-36677' lat='-7.54408' lon='-174.18707' />
+ <node id='-36679' lat='5.27712' lon='-149.65979' />
+ <node id='-36681' lat='-12.30171' lon='-149.61166' />
+ <node id='-36683' lat='-12.32002' lon='-156.4957' />
+ <node id='-36685' lat='-1.35506' lon='-158.62058' />
+ <node id='-36687' lat='7.12322' lon='-163.24994' />
+ <node id='-36689' lat='7.1291' lon='-161.0731' />
+ <node id='-36691' lat='1.11722' lon='-161.05669' />
+ <node id='-36693' lat='1.1296' lon='-158.62734' />
+ <node id='-36695' lat='5.2462' lon='-161.06795' />
+ <node id='-36697' lat='18.15359' lon='-179.23433' />
+ <node id='-36699' lat='18.17333' lon='-154.13058' />
+ <node id='-36701' lat='29.20682' lon='-154.14205' />
+ <node id='-36703' lat='29.18869' lon='-179.2458' />
+ <node id='-36705' lat='14.43014' lon='-25.82546' />
+ <node id='-36707' lat='14.46693' lon='-22.19117' />
+ <node id='-36709' lat='17.64208' lon='-22.22571' />
+ <node id='-36711' lat='17.60587' lon='-25.86' />
+ <node id='-36713' lat='-35.03863' lon='16.22632' />
+ <node id='-36715' lat='-28.53246' lon='16.59922' />
+ <node id='-36717' lat='-28.57126' lon='16.46592' />
+ <node id='-36719' lat='-26.8579' lon='32.89816' />
+ <node id='-36721' lat='-48.03306' lon='38.88176' />
+ <node id='-36723' lat='-40.02846' lon='-13.29655' />
+ <node id='-36725' lat='-41.00353' lon='-9.34669' />
+ <node id='-36727' lat='-15.55882' lon='-4.97086' />
+ <node id='-36729' lat='-6.63386' lon='-14.91926' />
+ <node id='-36731' lat='-34.54062' lon='-53.54511' />
+ <node id='-36733' lat='1.86593' lon='-28.99601' />
+ <node id='-36735' lat='-20.99094' lon='-28.34015' />
+ <node id='-36737' lat='-53.1401' lon='-62.78369' />
+ <node id='-36739' lat='-59.90465' lon='-26.52505' />
+ <node id='-36741' lat='-54.792' lon='-23.50385' />
+ <node id='-36743' lat='-50.36819' lon='-62.3754' />
+ <node id='-36745' lat='-55.04486' lon='-63.07977' />
+ <node id='-36747' lat='-52.65781' lon='-68.60702' />
+ <node id='-36749' lat='-54.9125' lon='-68.60733' />
+ <node id='-36751' lat='-54.8753' lon='-68.01394' />
+ <node id='-36753' lat='-54.94199' lon='-67.11046' />
+ <node id='-36755' lat='-55.19618' lon='-66.07313' />
+ <node id='-36757' lat='-58.14883' lon='-68.11646' />
+ <node id='-36759' lat='-26.52828' lon='-113.52687' />
+ <node id='-36761' lat='9.93766' lon='-78.79327' />
+ <node id='-36763' lat='9.22278' lon='-77.58292' />
+ <node id='-36765' lat='16.62373' lon='-78.66279' />
+ <node id='-36767' lat='15.86201' lon='-81.80642' />
+ <node id='-36769' lat='17.10872' lon='-87.3359' />
+ <node id='-36771' lat='15.88698' lon='-88.95358' />
+ <node id='-36773' lat='16.09624' lon='-88.40779' />
+ <node id='-36775' lat='10.96805' lon='-83.54024' />
+ <node id='-36777' lat='13.45767' lon='-87.77354' />
+ <node id='-36779' lat='13.44655' lon='-87.83467' />
+ <node id='-36781' lat='17.04813' lon='-89.15025' />
+ <node id='-36783' lat='15.9063' lon='-89.02415' />
+ <node id='-36785' lat='15.90898' lon='-89.17418' />
+ <node id='-36787' lat='13.73679' lon='-90.11344' />
+ <node id='-36789' lat='-17.99635' lon='-78.15039' />
+ <node id='-36791' lat='-7.80762' lon='-84.46057' />
+ <node id='-36793' lat='-20.10822' lon='-73.98689' />
+ <node id='-36795' lat='-18.3495' lon='-70.378' />
+ <node id='-36797' lat='8.04083' lon='-82.89978' />
+ <node id='-36799' lat='5.02401' lon='-87.41779' />
+ <node id='-36801' lat='7.22681' lon='-77.89178' />
+ <node id='-36803' lat='4.00341' lon='-82.12561' />
+ <node id='-36805' lat='-2.52874' lon='-92.46744' />
+ <node id='-36807' lat='2.64343' lon='-93.12365' />
+ <node id='-36809' lat='9.84394' lon='-109.6462' />
+ <node id='-36811' lat='9.84085' lon='-108.755' />
+ <node id='-36813' lat='10.72712' lon='-108.75183' />
+ <node id='-36815' lat='10.7302' lon='-109.64303' />
+ <node id='-36817' lat='32.64094' lon='-114.76736' />
+ <node id='-36819' lat='32.55543' lon='-114.81141' />
+ <node id='-36821' lat='32.55731' lon='-114.79524' />
+ <node id='-36823' lat='32.62028' lon='-114.80584' />
+ <node id='-36825' lat='18.41089' lon='-120.12904' />
+ <node id='-36827' lat='50.85267' lon='-10.17712' />
+ <node id='-36829' lat='54.24486' lon='-13.3292' />
+ <node id='-36831' lat='55.84142' lon='-7.93366' />
+ <node id='-36833' lat='35.93599' lon='-7.27694' />
+ <node id='-36835' lat='42.4358' lon='3.4481' />
+ <node id='-36837' lat='39.43581' lon='5.18061' />
+ <node id='-36839' lat='35.91222' lon='-5.27635' />
+ <node id='-36841' lat='36.07439' lon='-5.3004' />
+ <node id='-36843' lat='36.10278' lon='-5.39074' />
+ <node id='-36845' lat='36.14896' lon='-5.40134' />
+ <node id='-36847' lat='36.15481' lon='-5.38545' />
+ <node id='-36849' lat='36.15501' lon='-5.34536' />
+ <node id='-36851' lat='26.96222' lon='-18.8556' />
+ <node id='-36853' lat='29.62861' lon='-18.67893' />
+ <node id='-36855' lat='3.48284' lon='8.05799' />
+ <node id='-36857' lat='3.72052' lon='9.22018' />
+ <node id='-36859' lat='-1.68343' lon='5.37613' />
+ <node id='-36861' lat='-1.69667' lon='5.85762' />
+ <node id='-36863' lat='-1.20569' lon='5.87114' />
+ <node id='-36865' lat='-1.19244' lon='5.38965' />
+ <node id='-36867' lat='2.29079' lon='9.83238' />
+ <node id='-36869' lat='2.24676' lon='9.84716' />
+ <node id='-36871' lat='2.35097' lon='9.82123' />
+ <node id='-36873' lat='2.23756' lon='7.23334' />
+ <node id='-36875' lat='1.79377' lon='8.0168' />
+ <node id='-36877' lat='-0.53945' lon='6.69416' />
+ <node id='-36879' lat='-0.09539' lon='5.9107' />
+ <node id='-36881' lat='-0.64092' lon='7.24416' />
+ <node id='-36883' lat='12.61191' lon='-61.73897' />
+ <node id='-36885' lat='12.51526' lon='-61.13395' />
+ <node id='-36887' lat='11.65795' lon='-61.57265' />
+ <node id='-36889' lat='11.87638' lon='-62.14806' />
+ <node id='-36891' lat='17.22145' lon='-62.27053' />
+ <node id='-36893' lat='16.81958' lon='-61.44461' />
+ <node id='-36895' lat='17.9187' lon='-61.45764' />
+ <node id='-36897' lat='17.9235' lon='-62.12601' />
+ <node id='-36899' lat='38.25641' lon='71.37803' />
+ <node id='-36901' visible='true' lat='37.77904' lon='71.53778' />
+ <node id='-36903' visible='true' lat='37.26158' lon='73.8564' />
+ <node id='-36905' lat='37.34208' lon='74.20308' />
+ <node id='-36907' visible='true' lat='36.96224' lon='74.53739' />
+ <node id='-36909' lat='36.91421' lon='73.82685' />
+ <node id='-36911' lat='36.71838' lon='72.18135' />
+ <node id='-36913' lat='34.36769' lon='71.17662' />
+ <node id='-36915' lat='33.53535' lon='70.17062' />
+ <node id='-36917' lat='30.97532' lon='66.58175' />
+ <node id='-36919' lat='30.93904' lon='66.39435' />
+ <node id='-36921' lat='30.57001' lon='66.28413' />
+ <node id='-36923' lat='30.404' lon='66.34869' />
+ <node id='-36925' lat='29.9583' lon='66.36042' />
+ <node id='-36927' lat='29.53957' lon='65.04005' />
+ <node id='-36929' lat='29.39157' lon='64.12966' />
+ <node id='-36931' lat='29.50456' lon='63.5876' />
+ <node id='-36933' visible='true' lat='29.40782' lon='62.47751' />
+ <node id='-36935' lat='29.86514' lon='60.87231' />
+ <node id='-36937' lat='31.38447' lon='61.71753' />
+ <node id='-36939' lat='31.49561' lon='60.84541' />
+ <node id='-36941' lat='32.22565' lon='60.86191' />
+ <node id='-36943' lat='34.31539' lon='60.66502' />
+ <node id='-36945' lat='34.3234' lon='60.91064' />
+ <node id='-36947' lat='35.61482' lon='61.27371' />
+ <node id='-36949' lat='37.11604' lon='64.75876' />
+ <node id='-36951' lat='37.32409' lon='66.30993' />
+ <node id='-36953' lat='37.1834' lon='67.78329' />
+ <node id='-36955' lat='37.52519' lon='70.15015' />
+ <node id='-36957' lat='38.34774' lon='70.61526' />
+ <node id='-36959' lat='-5.85631' lon='16.55507' />
+ <node id='-36961' lat='-8.13784' lon='17.5828' />
+ <node id='-36963' lat='-7.99743' lon='19.33698' />
+ <node id='-36965' lat='-7.00195' lon='19.5469' />
+ <node id='-36967' lat='-7.29628' lon='21.79824' />
+ <node id='-36969' lat='-11.24911' lon='22.25951' />
+ <node id='-36971' lat='-10.89356' lon='24.00027' />
+ <node id='-36973' lat='-12.99091' lon='24.03339' />
+ <node id='-36975' visible='true' lat='-13.00148' lon='21.97988' />
+ <node id='-36977' lat='-18.02787' lon='21.42741' />
+ <node id='-36979' visible='true' lat='-17.38927' lon='18.39229' />
+ <node id='-36981' visible='true' lat='-17.38814' lon='14.28743' />
+ <node id='-36983' lat='-17.25284' lon='10.5065' />
+ <node id='-36985' lat='-5.74353' lon='12.52318' />
+ <node id='-36987' lat='-5.74031' lon='12.26557' />
+ <node id='-36989' lat='-5.76338' lon='12.20376' />
+ <node id='-36991' lat='-5.94705' lon='11.95767' />
+ <node id='-36993' lat='42.55582' lon='20.07761' />
+ <node id='-36995' lat='41.8818' lon='20.59524' />
+ <node id='-36997' lat='40.85475' lon='20.97887' />
+ <node id='-36999' lat='39.69227' lon='20.00957' />
+ <node id='-37001' lat='39.69533' lon='19.92466' />
+ <node id='-37003' lat='39.74903' lon='19.95973' />
+ <node id='-37005' lat='39.78684' lon='19.97622' />
+ <node id='-37007' lat='39.82857' lon='19.95905' />
+ <node id='-37009' lat='41.74971' lon='19.26406' />
+ <node id='-37011' lat='41.84849' lon='19.37597' />
+ <node id='-37013' lat='42.60217' lon='1.44197' />
+ <node id='-37015' lat='25.26344' lon='56.28423' />
+ <node id='-37017' lat='25.26128' lon='56.27086' />
+ <node id='-37019' lat='25.27916' lon='56.2716' />
+ <node id='-37021' lat='25.28486' lon='56.28102' />
+ <node id='-37023' lat='25.2754' lon='56.29379' />
+ <node id='-37025' lat='25.62825' lon='56.26534' />
+ <node id='-37027' lat='25.7713' lon='56.82555' />
+ <node id='-37029' lat='24.73699' lon='56.13684' />
+ <node id='-37031' lat='24.74457' lon='56.06128' />
+ <node id='-37033' lat='24.9116' lon='55.81116' />
+ <node id='-37035' lat='24.32855' lon='55.83327' />
+ <node id='-37037' lat='24.25895' lon='55.75493' />
+ <node id='-37039' lat='24.2172' lon='55.95472' />
+ <node id='-37041' lat='24.07426' lon='56.01799' />
+ <node id='-37043' lat='24.05994' lon='55.73301' />
+ <node id='-37045' lat='22.71065' lon='55.2137' />
+ <node id='-37047' lat='22.63334' lon='55.13599' />
+ <node id='-37049' lat='22.94341' lon='52.56622' />
+ <node id='-37051' lat='24.12041' lon='51.59617' />
+ <node id='-37053' lat='26.18798' lon='55.81777' />
+ <node id='-37055' lat='26.05004' lon='56.08836' />
+ <node id='-37057' visible='true' lat='25.33108' lon='56.26062' />
+ <node id='-37059' visible='true' lat='25.31253' lon='56.23362' />
+ <node id='-37061' lat='25.28843' lon='56.25008' />
+ <node id='-37063' lat='25.27505' lon='56.24465' />
+ <node id='-37065' lat='25.25668' lon='56.20838' />
+ <node id='-37067' lat='25.24104' lon='56.20872' />
+ <node id='-37069' lat='25.22867' lon='56.24341' />
+ <node id='-37071' lat='25.23404' lon='56.27628' />
+ <node id='-37073' visible='true' lat='25.26653' lon='56.34438' />
+ <node id='-37075' lat='25.30681' lon='56.35172' />
+ <node id='-37077' lat='25.30107' lon='56.3111' />
+ <node id='-37079' lat='25.31815' lon='56.3005' />
+ <node id='-37081' lat='-22.00576' lon='-62.81108' />
+ <node id='-37083' visible='true' lat='-24.00701' lon='-60.03367' />
+ <node id='-37085' visible='true' lat='-25.65383' lon='-54.5985' />
+ <node id='-37087' lat='-25.55513' lon='-53.90831' />
+ <node id='-37089' lat='-27.09844' lon='-53.80144' />
+ <node id='-37091' visible='true' lat='-27.94661' lon='-55.33303' />
+ <node id='-37093' lat='-32.98842' lon='-58.1224' />
+ <node id='-37095' lat='-35.78518' lon='-55.71154' />
+ <node id='-37097' lat='-50.58411' lon='-72.31343' />
+ <node id='-37099' visible='true' lat='-46.55385' lon='-71.68577' />
+ <node id='-37101' lat='-38.6923' lon='-70.89532' />
+ <node id='-37103' lat='-22.99839' lon='-66.99632' />
+ <node id='-37105' lat='-22.81525' lon='-67.18382' />
+ <node id='-37107' lat='40.58424' lon='45.50279' />
+ <node id='-37109' visible='true' lat='40.65023' lon='45.47927' />
+ <node id='-37111' visible='true' lat='40.64765' lon='45.56071' />
+ <node id='-37113' lat='41.29747' lon='45.0133' />
+ <node id='-37115' lat='41.2464' lon='45.05497' />
+ <node id='-37117' visible='true' lat='41.2101' lon='45.02932' />
+ <node id='-37119' visible='true' lat='41.19211' lon='45.05201' />
+ <node id='-37121' lat='41.19967' lon='45.11811' />
+ <node id='-37123' lat='41.168' lon='45.1969' />
+ <node id='-37125' lat='41.13299' lon='45.19942' />
+ <node id='-37127' lat='41.10917' lon='45.08028' />
+ <node id='-37129' lat='41.05379' lon='45.06784' />
+ <node id='-37131' lat='41.06059' lon='45.12923' />
+ <node id='-37133' lat='41.09369' lon='45.1313' />
+ <node id='-37135' lat='41.08082' lon='45.1634' />
+ <node id='-37137' lat='41.05068' lon='45.16493' />
+ <node id='-37139' lat='41.04518' lon='45.1994' />
+ <node id='-37141' lat='41.0027' lon='45.25897' />
+ <node id='-37143' lat='41.03757' lon='45.28859' />
+ <node id='-37145' lat='38.86548' lon='46.53497' />
+ <node id='-37147' lat='39.28931' lon='45.99774' />
+ <node id='-37149' lat='39.3695' lon='45.79225' />
+ <node id='-37151' lat='39.56716' lon='45.80804' />
+ <node id='-37153' lat='39.49888' lon='45.46992' />
+ <node id='-37155' lat='39.79277' lon='45.06604' />
+ <node id='-37157' lat='39.7148' lon='44.75779' />
+ <node id='-37159' lat='40.04866' lon='44.26973' />
+ <node id='-37161' lat='41.12611' lon='43.4717' />
+ <node id='-37163' lat='41.25685' lon='44.93493' />
+ <node id='-37165' lat='41.03411' lon='45.00864' />
+ <node id='-37167' lat='41.03938' lon='45.03792' />
+ <node id='-37169' lat='41.06653' lon='45.04517' />
+ <node id='-37171' lat='41.07931' lon='45.03406' />
+ <node id='-37173' lat='41.09407' lon='45.00864' />
+ <node id='-37175' lat='41.07553' lon='44.95383' />
+ <node id='-37177' lat='41.06345' lon='44.96031' />
+ <node id='-37179' lat='41.05657' lon='44.9903' />
+ <node id='-37181' lat='40.9817' lon='45.21324' />
+ <node id='-37183' lat='40.97828' lon='45.23095' />
+ <node id='-37185' lat='41.00226' lon='45.23487' />
+ <node id='-37187' lat='41.01484' lon='45.20625' />
+ <node id='-37189' lat='41.0066' lon='45.18382' />
+ <node id='-37191' lat='40.98998' lon='45.19312' />
+ <node id='-37193' lat='40.99348' lon='45.20518' />
+ <node id='-37195' lat='40.99001' lon='45.21219' />
+ <node id='-37197' lat='48.98444' lon='15.34823' />
+ <node id='-37199' lat='48.60371' lon='16.93955' />
+ <node id='-37201' lat='48.00636' lon='17.16001' />
+ <node id='-37203' lat='47.76171' lon='16.61183' />
+ <node id='-37205' visible='true' lat='47.50155' lon='16.64821' />
+ <node id='-37207' lat='47.46139' lon='16.6718' />
+ <node id='-37209' lat='47.39416' lon='16.49908' />
+ <node id='-37211' lat='47.21127' lon='16.43663' />
+ <node id='-37213' visible='true' lat='47.00558' lon='16.28855' />
+ <node id='-37215' lat='46.867' lon='16.10983' />
+ <node id='-37217' lat='46.85698' lon='10.47197' />
+ <node id='-37219' lat='46.84296' lon='10.10715' />
+ <node id='-37221' lat='46.91434' lon='9.98058' />
+ <node id='-37223' lat='46.93343' lon='9.88266' />
+ <node id='-37225' lat='47.01337' lon='9.87935' />
+ <node id='-37227' lat='47.06091' lon='9.60717' />
+ <node id='-37229' lat='47.27029' lon='9.53116' />
+ <node id='-37231' lat='47.28353' lon='9.54739' />
+ <node id='-37233' lat='47.31334' lon='9.58513' />
+ <node id='-37235' lat='47.49495' lon='9.56312' />
+ <node id='-37237' lat='47.53457' lon='9.72736' />
+ <node id='-37239' lat='47.56755' lon='10.60337' />
+ <node id='-37241' lat='47.59202' lon='11.63934' />
+ <node id='-37243' lat='47.84374' lon='13.00588' />
+ <node id='-37245' lat='48.31575' lon='13.30897' />
+ <node id='-37247' lat='48.5898' lon='14.20691' />
+ <node id='-37249' lat='48.55682' lon='14.33566' />
+ <node id='-37251' lat='48.5931' lon='14.41909' />
+ <node id='-37253' lat='48.64695' lon='14.4587' />
+ <node id='-37255' lat='48.58215' lon='14.66762' />
+ <node id='-37257' lat='48.75983' lon='14.95736' />
+ <node id='-37259' lat='38.84206' lon='46.14785' />
+ <node id='-37261' lat='39.42998' lon='44.96746' />
+ <node id='-37263' lat='39.62677' lon='44.81043' />
+ <node id='-37265' lat='41.26366' lon='47.49004' />
+ <node id='-37267' lat='41.84306' lon='48.5867' />
+ <node id='-37269' lat='38.40869' lon='49.20805' />
+ <node id='-37271' lat='38.43975' lon='48.88288' />
+ <node id='-37273' lat='38.61013' lon='48.45084' />
+ <node id='-37275' lat='38.59958' lon='48.3146' />
+ <node id='-37277' lat='38.71883' lon='48.24773' />
+ <node id='-37279' lat='38.82705' lon='48.02581' />
+ <node id='-37281' lat='38.90333' lon='48.01409' />
+ <node id='-37283' lat='38.94434' lon='48.08627' />
+ <node id='-37285' lat='39.03022' lon='48.33884' />
+ <node id='-37287' lat='39.38235' lon='48.37978' />
+ <node id='-37289' lat='39.70999' lon='47.98977' />
+ <node id='-37291' lat='39.45999' lon='47.38978' />
+ <node id='-37293' lat='41.46433' lon='45.26285' />
+ <node id='-37295' lat='41.47168' lon='45.31352' />
+ <node id='-37297' lat='41.42402' lon='45.4006' />
+ <node id='-37299' lat='41.91323' lon='46.42738' />
+ <node id='-37301' lat='-2.66266' lon='30.41789' />
+ <node id='-37303' lat='-3.25152' lon='30.84165' />
+ <node id='-37305' lat='-4.44845' lon='29.43673' />
+ <node id='-37307' lat='-3.75856' lon='29.23708' />
+ <node id='-37309' lat='-3.05471' lon='29.25633' />
+ <node id='-37311' lat='51.4213' lon='4.82946' />
+ <node id='-37313' lat='51.43319' lon='4.78314' />
+ <node id='-37315' lat='51.43046' lon='4.76577' />
+ <node id='-37317' lat='51.41337' lon='4.77229' />
+ <node id='-37319' lat='51.41102' lon='4.78941' />
+ <node id='-37321' lat='51.41502' lon='4.84988' />
+ <node id='-37323' lat='51.41404' lon='4.90016' />
+ <node id='-37325' lat='51.39487' lon='4.92152' />
+ <node id='-37327' lat='51.44406' lon='5.00393' />
+ <node id='-37329' lat='51.48679' lon='5.03281' />
+ <node id='-37331' lat='51.47022' lon='5.04774' />
+ <node id='-37333' lat='51.4715' lon='5.07891' />
+ <node id='-37335' lat='51.43163' lon='5.10456' />
+ <node id='-37337' lat='51.39469' lon='5.07102' />
+ <node id='-37339' lat='51.34791' lon='5.13105' />
+ <node id='-37341' lat='51.31592' lon='5.13377' />
+ <node id='-37343' lat='51.31035' lon='5.16222' />
+ <node id='-37345' lat='51.32243' lon='5.2002' />
+ <node id='-37347' lat='51.30495' lon='5.24244' />
+ <node id='-37349' lat='51.26888' lon='5.22542' />
+ <node id='-37351' lat='51.26064' lon='5.23814' />
+ <node id='-37353' lat='51.26693' lon='5.26461' />
+ <node id='-37355' lat='51.26104' lon='5.29716' />
+ <node id='-37357' lat='51.26248' lon='5.41672' />
+ <node id='-37359' lat='51.28169' lon='5.4407' />
+ <node id='-37361' lat='51.2849' lon='5.46519' />
+ <node id='-37363' lat='51.30053' lon='5.48476' />
+ <node id='-37365' lat='51.29462' lon='5.515' />
+ <node id='-37367' lat='51.26544' lon='5.5569' />
+ <node id='-37369' lat='51.22249' lon='5.5603' />
+ <node id='-37371' lat='51.19788' lon='5.65145' />
+ <node id='-37373' lat='51.18736' lon='5.65528' />
+ <node id='-37375' lat='51.1829' lon='5.70344' />
+ <node id='-37377' lat='51.18928' lon='5.74617' />
+ <node id='-37379' lat='51.17845' lon='5.77735' />
+ <node id='-37381' lat='51.1522' lon='5.77697' />
+ <node id='-37383' lat='51.16753' lon='5.82564' />
+ <node id='-37385' lat='51.14445' lon='5.85508' />
+ <node id='-37387' lat='51.11661' lon='5.80798' />
+ <node id='-37389' lat='51.03113' lon='5.75961' />
+ <node id='-37391' lat='51.02483' lon='5.77688' />
+ <node id='-37393' lat='50.99703' lon='5.76242' />
+ <node id='-37395' lat='50.96092' lon='5.71864' />
+ <node id='-37397' lat='50.95428' lon='5.72875' />
+ <node id='-37399' lat='50.96202' lon='5.74752' />
+ <node id='-37401' lat='50.95601' lon='5.75927' />
+ <node id='-37403' lat='50.94723' lon='5.74644' />
+ <node id='-37405' lat='50.92312' lon='5.72545' />
+ <node id='-37407' lat='50.91167' lon='5.72644' />
+ <node id='-37409' lat='50.90796' lon='5.71626' />
+ <node id='-37411' lat='50.91046' lon='5.69858' />
+ <node id='-37413' lat='50.88142' lon='5.67886' />
+ <node id='-37415' lat='50.87107' lon='5.64504' />
+ <node id='-37417' lat='50.84742' lon='5.64009' />
+ <node id='-37419' lat='50.82082' lon='5.65259' />
+ <node id='-37421' lat='50.80764' lon='5.70118' />
+ <node id='-37423' lat='50.79641' lon='5.68995' />
+ <node id='-37425' lat='50.7827' lon='5.70107' />
+ <node id='-37427' lat='50.75804' lon='5.68091' />
+ <node id='-37429' lat='50.75529' lon='5.69469' />
+ <node id='-37431' lat='50.76398' lon='5.72216' />
+ <node id='-37433' lat='50.75674' lon='5.73904' />
+ <node id='-37435' visible='true' lat='50.7691' lon='5.74356' />
+ <node id='-37437' lat='50.78159' lon='5.76533' />
+ <node id='-37439' lat='50.78308' lon='5.77513' />
+ <node id='-37441' lat='50.7558' lon='5.80673' />
+ <node id='-37443' lat='50.77092' lon='5.88734' />
+ <node id='-37445' visible='true' lat='50.75125' lon='5.89129' />
+ <node id='-37447' visible='true' lat='50.75124' lon='5.89132' />
+ <node id='-37449' lat='50.75441' lon='5.97545' />
+ <node id='-37451' lat='50.75398' lon='6.01976' />
+ <node id='-37453' lat='50.74618' lon='6.03889' />
+ <node id='-37455' lat='50.71848' lon='6.0406' />
+ <node id='-37457' lat='50.72753' lon='6.04566' />
+ <node id='-37459' lat='50.72134' lon='6.11605' />
+ <node id='-37461' lat='50.6245' lon='6.17852' />
+ <node id='-37463' lat='50.62444' lon='6.26957' />
+ <node id='-37465' lat='50.60392' lon='6.2476' />
+ <node id='-37467' lat='50.59869' lon='6.24888' />
+ <node id='-37469' lat='50.58732' lon='6.24005' />
+ <node id='-37471' lat='50.5907' lon='6.22581' />
+ <node id='-37473' lat='50.56952' lon='6.20281' />
+ <node id='-37475' lat='50.55875' lon='6.17739' />
+ <node id='-37477' lat='50.5313' lon='6.19579' />
+ <node id='-37479' lat='50.52653' lon='6.18716' />
+ <node id='-37481' lat='50.49578' lon='6.22335' />
+ <node id='-37483' lat='50.48833' lon='6.3465' />
+ <node id='-37485' lat='50.46083' lon='6.34005' />
+ <node id='-37487' lat='50.45397' lon='6.37219' />
+ <node id='-37489' visible='true' lat='50.30887' lon='6.29949' />
+ <node id='-37491' lat='50.27458' lon='6.28797' />
+ <node id='-37493' lat='50.25179' lon='6.208' />
+ <node id='-37495' lat='50.2234' lon='6.16853' />
+ <node id='-37497' lat='50.20815' lon='6.18364' />
+ <node id='-37499' lat='50.1822' lon='6.18739' />
+ <node id='-37501' lat='50.17106' lon='6.14588' />
+ <node id='-37503' lat='50.14126' lon='6.15298' />
+ <node id='-37505' lat='50.15344' lon='6.06406' />
+ <node id='-37507' lat='50.18283' lon='6.02488' />
+ <node id='-37509' lat='50.13295' lon='5.95929' />
+ <node id='-37511' lat='50.11476' lon='5.89488' />
+ <node id='-37513' lat='50.04614' lon='5.86904' />
+ <node id='-37515' lat='49.9892' lon='5.83968' />
+ <node id='-37517' lat='49.82435' lon='5.74844' />
+ <node id='-37519' lat='49.82058' lon='5.74364' />
+ <node id='-37521' lat='49.75048' lon='5.82245' />
+ <node id='-37523' lat='49.72395' lon='5.82562' />
+ <node id='-37525' lat='49.69291' lon='5.86527' />
+ <node id='-37527' lat='49.67862' lon='5.86175' />
+ <node id='-37529' lat='49.60898' lon='5.8762' />
+ <node id='-37531' lat='49.56082' lon='5.8424' />
+ <node id='-37533' lat='49.55228' lon='5.79195' />
+ <node id='-37535' lat='49.56298' lon='5.77435' />
+ <node id='-37537' lat='49.55915' lon='5.7577' />
+ <node id='-37539' lat='49.54321' lon='5.75649' />
+ <node id='-37541' lat='49.76193' lon='5.09249' />
+ <node id='-37543' lat='49.79872' lon='4.96714' />
+ <node id='-37545' lat='49.78995' lon='4.85464' />
+ <node id='-37547' lat='49.9236' lon='4.88529' />
+ <node id='-37549' lat='49.95609' lon='4.78827' />
+ <node id='-37551' lat='51.07014' lon='2.55904' />
+ <node id='-37553' lat='51.52087' lon='2.18458' />
+ <node id='-37555' lat='51.85301' lon='2.56575' />
+ <node id='-37557' lat='51.242' lon='3.44913' />
+ <node id='-37559' lat='51.2458' lon='3.52698' />
+ <node id='-37561' lat='51.28697' lon='3.51502' />
+ <node id='-37563' lat='51.30183' lon='3.59025' />
+ <node id='-37565' lat='51.2567' lon='3.79497' />
+ <node id='-37567' lat='51.21392' lon='3.78818' />
+ <node id='-37569' lat='51.20371' lon='3.90125' />
+ <node id='-37571' lat='51.24354' lon='4.05045' />
+ <node id='-37573' lat='51.29348' lon='4.16721' />
+ <node id='-37575' lat='51.35371' lon='4.24024' />
+ <node id='-37577' lat='51.37443' lon='4.21923' />
+ <node id='-37579' lat='51.37687' lon='4.33265' />
+ <node id='-37581' lat='51.35738' lon='4.34086' />
+ <node id='-37583' lat='51.35547' lon='4.39292' />
+ <node id='-37585' lat='51.37482' lon='4.43383' />
+ <node id='-37587' visible='true' lat='51.41965' lon='4.38064' />
+ <node id='-37589' lat='51.43316' lon='4.39747' />
+ <node id='-37591' lat='51.4778' lon='4.47736' />
+ <node id='-37593' lat='51.48184' lon='4.5388' />
+ <node id='-37595' lat='51.47265' lon='4.54675' />
+ <node id='-37597' lat='51.45002' lon='4.52846' />
+ <node id='-37599' lat='51.4243' lon='4.53521' />
+ <node id='-37601' lat='51.4324' lon='4.57489' />
+ <node id='-37603' lat='51.42352' lon='4.65442' />
+ <node id='-37605' lat='51.50124' lon='4.7536' />
+ <node id='-37607' lat='51.50284' lon='4.78803' />
+ <node id='-37609' lat='51.4799' lon='4.84139' />
+ <node id='-37611' lat='6.13349' lon='2.74181' />
+ <node id='-37613' lat='6.02702' lon='1.67336' />
+ <node id='-37615' lat='6.24075' lon='1.62913' />
+ <node id='-37617' lat='6.28221' lon='1.79826' />
+ <node id='-37619' lat='10.99597' lon='0.91245' />
+ <node id='-37621' lat='11.89473' lon='2.39723' />
+ <node id='-37623' lat='12.24804' lon='2.37783' />
+ <node id='-37625' lat='15.00135' lon='0.23859' />
+ <node id='-37627' lat='14.51654' lon='0.16936' />
+ <node id='-37629' lat='12.41915' lon='2.26349' />
+ <node id='-37631' lat='12.35539' lon='2.05785' />
+ <node id='-37633' lat='10.99964' lon='0.66104' />
+ <node id='-37635' lat='10.93269' lon='0.4958' />
+ <node id='-37637' lat='11.01011' lon='0.50388' />
+ <node id='-37639' lat='11.0067' lon='-2.83373' />
+ <node id='-37641' lat='13.12927' lon='-4.34477' />
+ <node id='-37643' lat='13.49778' lon='-3.96501' />
+ <node id='-37645' lat='13.1588' lon='-3.4313' />
+ <node id='-37647' lat='13.27272' lon='-3.43507' />
+ <node id='-37649' lat='13.29035' lon='-3.23599' />
+ <node id='-37651' visible='true' lat='13.5422' lon='-3.28396' />
+ <node id='-37653' lat='13.70699' lon='-3.26407' />
+ <node id='-37655' lat='14.29671' lon='-2.47587' />
+ <node id='-37657' lat='14.14878' lon='-2.10223' />
+ <node id='-37659' lat='14.19011' lon='-1.9992' />
+ <node id='-37661' lat='14.47709' lon='-1.97945' />
+ <node id='-37663' lat='14.50023' lon='-1.68083' />
+ <node id='-37665' lat='14.72774' lon='-1.32166' />
+ <node id='-37667' lat='14.7921' lon='-1.05875' />
+ <node id='-37669' lat='26.13708' lon='89.15869' />
+ <node id='-37671' lat='25.61714' lon='89.86129' />
+ <node id='-37673' lat='25.1475' lon='90.39623' />
+ <node id='-37675' lat='25.12846' lon='91.63648' />
+ <node id='-37677' lat='24.38997' lon='92.11662' />
+ <node id='-37679' lat='24.14674' lon='91.89258' />
+ <node id='-37681' lat='23.99072' lon='91.35741' />
+ <node id='-37683' lat='23.37538' lon='91.28293' />
+ <node id='-37685' lat='22.93929' lon='91.61571' />
+ <node id='-37687' lat='23.26619' lon='91.76417' />
+ <node id='-37689' lat='23.42235' lon='91.84789' />
+ <node id='-37691' lat='22.1522' lon='92.60029' />
+ <node id='-37693' lat='21.97638' lon='92.60949' />
+ <node id='-37695' lat='21.87037' lon='92.62187' />
+ <node id='-37697' lat='20.38919' lon='92.39837' />
+ <node id='-37699' lat='21.60785' lon='89.13927' />
+ <node id='-37701' lat='22.75228' lon='88.9151' />
+ <node id='-37703' lat='22.83346' lon='88.96713' />
+ <node id='-37705' lat='23.50016' lon='88.78802' />
+ <node id='-37707' lat='23.64044' lon='88.56507' />
+ <node id='-37709' lat='24.31464' lon='88.68801' />
+ <node id='-37711' lat='24.32474' lon='88.50934' />
+ <node id='-37713' lat='24.51301' lon='88.12296' />
+ <node id='-37715' lat='25.66245' lon='88.45103' />
+ <node id='-37717' lat='25.80811' lon='88.242' />
+ <node id='-37719' lat='25.78773' lon='88.13138' />
+ <node id='-37721' lat='25.91334' lon='88.08804' />
+ <node id='-37723' lat='26.14417' lon='88.1844' />
+ <node id='-37725' lat='26.22216' lon='88.34757' />
+ <node id='-37727' lat='43.79494' lon='23.05288' />
+ <node id='-37729' lat='43.84843' lon='23.26772' />
+ <node id='-37731' lat='43.68218' lon='24.18149' />
+ <node id='-37733' lat='43.6831' lon='25.10718' />
+ <node id='-37735' lat='43.69263' lon='25.72792' />
+ <node id='-37737' lat='43.85745' lon='25.94911' />
+ <node id='-37739' lat='44.04356' lon='26.38764' />
+ <node id='-37741' lat='44.13555' lon='26.95141' />
+ <node id='-37743' lat='44.0141' lon='27.39757' />
+ <node id='-37745' lat='43.84193' lon='27.99558' />
+ <node id='-37747' lat='43.76' lon='28.23293' />
+ <node id='-37749' lat='41.98066' lon='28.02971' />
+ <node id='-37751' lat='42.31725' lon='22.34773' />
+ <node id='-37753' lat='42.87774' lon='22.54302' />
+ <node id='-37755' lat='43.6558' lon='22.47582' />
+ <node id='-37757' lat='43.81281' lon='22.35558' />
+ <node id='-37759' lat='44.00514' lon='22.41449' />
+ <node id='-37761' lat='44.06534' lon='22.61688' />
+ <node id='-37763' lat='44.07694' lon='23.04988' />
+ <node id='-37765' lat='43.84452' lon='22.85314' />
+ <node id='-37767' lat='26.30758' lon='50.93865' />
+ <node id='-37769' lat='25.54641' lon='50.80824' />
+ <node id='-37771' lat='26.08243' lon='50.26923' />
+ <node id='-37773' lat='45.03956' lon='17.85874' />
+ <node id='-37775' lat='45.07654' lon='18.1624' />
+ <node id='-37777' lat='44.90402' lon='18.76965' />
+ <node id='-37779' lat='44.85097' lon='18.8704' />
+ <node id='-37781' lat='44.85493' lon='19.01994' />
+ <node id='-37783' lat='44.69612' lon='19.29753' />
+ <node id='-37785' lat='43.98764' lon='19.23465' />
+ <node id='-37787' lat='43.79668' lon='19.3986' />
+ <node id='-37789' visible='true' lat='42.55921' lon='18.43735' />
+ <node id='-37791' lat='42.97223' lon='17.70879' />
+ <node id='-37793' lat='43.08595' lon='17.64268' />
+ <node id='-37795' lat='43.16559' lon='17.46986' />
+ <node id='-37797' lat='43.76011' lon='16.80736' />
+ <node id='-37799' lat='44.02826' lon='16.43629' />
+ <node id='-37801' lat='44.27012' lon='16.18688' />
+ <node id='-37803' lat='44.82334' lon='15.72584' />
+ <node id='-37805' lat='44.8455' lon='15.79472' />
+ <node id='-37807' visible='true' lat='45.09616' lon='16.12153' />
+ <node id='-37809' lat='56.16964' lon='28.15217' />
+ <node id='-37811' lat='55.98971' lon='29.21717' />
+ <node id='-37813' lat='55.8358' lon='30.12136' />
+ <node id='-37815' lat='54.5096' lon='31.08818' />
+ <node id='-37817' lat='54.0837' lon='31.89599' />
+ <node id='-37819' lat='53.80015' lon='31.77028' />
+ <node id='-37821' lat='53.7166' lon='32.36663' />
+ <node id='-37823' lat='53.08193' lon='32.12279' />
+ <node id='-37825' lat='52.07775' lon='30.95589' />
+ <node id='-37827' lat='51.48372' lon='29.54372' />
+ <node id='-37829' lat='51.5664' lon='28.64429' />
+ <node id='-37831' lat='51.66713' lon='27.20948' />
+ <node id='-37833' lat='51.87315' lon='26.39367' />
+ <node id='-37835' visible='true' lat='51.66979' lon='24.13075' />
+ <node id='-37837' lat='52.11264' lon='23.61' />
+ <node id='-37839' lat='52.22848' lon='23.20071' />
+ <node id='-37841' visible='true' lat='52.6149' lon='23.73615' />
+ <node id='-37843' lat='52.71332' lon='23.93763' />
+ <node id='-37845' lat='53.24131' lon='23.81995' />
+ <node id='-37847' lat='55.67968' lon='26.63231' />
+ <node id='-37849' lat='18.49048' lon='-88.3268' />
+ <node id='-37851' lat='18.47591' lon='-88.29909' />
+ <node id='-37853' lat='18.41778' lon='-88.03238' />
+ <node id='-37855' lat='18.16657' lon='-88.03165' />
+ <node id='-37857' lat='-15.09515' lon='-60.23968' />
+ <node id='-37859' visible='true' lat='-15.50267' lon='-60.23797' />
+ <node id='-37861' visible='true' lat='-17.8431' lon='-57.69877' />
+ <node id='-37863' lat='-19.76276' lon='-58.14215' />
+ <node id='-37865' lat='-19.98346' lon='-57.8496' />
+ <node id='-37867' lat='-19.80058' lon='-58.23216' />
+ <node id='-37869' visible='true' lat='-19.29148' lon='-59.06965' />
+ <node id='-37871' visible='true' lat='-19.2981' lon='-60.00638' />
+ <node id='-37873' visible='true' lat='-19.63958' lon='-61.73723' />
+ <node id='-37875' visible='true' lat='-20.55311' lon='-62.26883' />
+ <node id='-37877' visible='true' lat='-21.06657' lon='-62.2757' />
+ <node id='-37879' lat='-22.25788' lon='-62.64225' />
+ <node id='-37881' lat='-22.08446' lon='-64.97873' />
+ <node id='-37883' lat='-19.72118' lon='-68.66761' />
+ <node id='-37885' lat='-19.0323' lon='-68.87959' />
+ <node id='-37887' lat='-16.16668' lon='-69.20291' />
+ <node id='-37889' lat='-13.68546' lon='-69.05265' />
+ <node id='-37891' lat='-10.9448' lon='-69.57302' />
+ <node id='-37893' visible='true' lat='-10.35141' lon='-65.37923' />
+ <node id='-37895' visible='true' lat='4.34069' lon='-59.69361' />
+ <node id='-37897' lat='1.95135' lon='-56.47045' />
+ <node id='-37899' lat='1.83137' lon='-55.99278' />
+ <node id='-37901' visible='true' lat='2.37298' lon='-52.6906' />
+ <node id='-37903' lat='-33.86894' lon='-53.18243' />
+ <node id='-37905' lat='-30.17568' lon='-57.63279' />
+ <node id='-37907' lat='-20.16193' lon='-58.16225' />
+ <node id='-37909' visible='true' lat='-16.26479' lon='-60.16069' />
+ <node id='-37911' visible='true' lat='-15.09887' lon='-60.58224' />
+ <node id='-37913' visible='true' lat='-12.52544' lon='-63.90248' />
+ <node id='-37915' lat='-9.90446' lon='-66.63041' />
+ <node id='-37917' lat='-11.00524' lon='-68.80891' />
+ <node id='-37919' visible='true' lat='-11.0108' lon='-70.64134' />
+ <node id='-37921' lat='-9.9668' lon='-71.23394' />
+ <node id='-37923' visible='true' lat='-9.40904' lon='-73.21498' />
+ <node id='-37925' visible='true' lat='-7.58465' lon='-73.96938' />
+ <node id='-37927' lat='-5.14765' lon='-72.83973' />
+ <node id='-37929' lat='-4.36915' lon='-70.96814' />
+ <node id='-37931' lat='-4.23758' lon='-69.94413' />
+ <node id='-37933' visible='true' lat='-1.42219' lon='-69.43395' />
+ <node id='-37935' lat='1.22998' lon='-66.85795' />
+ <node id='-37937' visible='true' lat='0.74585' lon='-66.28507' />
+ <node id='-37939' visible='true' lat='2.79797' lon='-64.02908' />
+ <node id='-37941' lat='5.20931' lon='-60.73204' />
+ <node id='-37943' lat='12.80638' lon='-59.14146' />
+ <node id='-37945' lat='12.77667' lon='-59.88892' />
+ <node id='-37947' lat='13.58015' lon='-59.92255' />
+ <node id='-37949' lat='13.60976' lon='-59.17509' />
+ <node id='-37951' lat='5.01011' lon='115.16236' />
+ <node id='-37953' lat='4.87604' lon='115.15092' />
+ <node id='-37955' visible='true' lat='4.8256' lon='115.20737' />
+ <node id='-37957' visible='true' lat='4.39123' lon='115.09978' />
+ <node id='-37959' lat='4.53418' lon='115.07737' />
+ <node id='-37961' lat='4.63706' lon='115.04064' />
+ <node id='-37963' visible='true' lat='4.74137' lon='115.02278' />
+ <node id='-37965' lat='4.81146' lon='114.96982' />
+ <node id='-37967' lat='4.42387' lon='114.83189' />
+ <node id='-37969' lat='4.4257' lon='114.88039' />
+ <node id='-37971' lat='4.58441' lon='114.07448' />
+ <node id='-37973' lat='4.64632' lon='114.08532' />
+ <node id='-37975' lat='4.90275' lon='115.05038' />
+ <node id='-37977' lat='27.76358' lon='91.6469' />
+ <node id='-37979' lat='27.6144' lon='91.55819' />
+ <node id='-37981' lat='27.47352' lon='92.01132' />
+ <node id='-37983' lat='26.90704' lon='90.39271' />
+ <node id='-37985' lat='27.32483' lon='88.91901' />
+ <node id='-37987' lat='-24.78725' lon='20.02809' />
+ <node id='-37989' lat='-24.76768' lon='19.99817' />
+ <node id='-37991' lat='-21.99991' lon='19.99912' />
+ <node id='-37993' lat='-22.00026' lon='20.99751' />
+ <node id='-37995' lat='-18.31743' lon='20.99904' />
+ <node id='-37997' lat='-18.31795' lon='21.45556' />
+ <node id='-37999' lat='-18.00075' lon='23.0996' />
+ <node id='-38001' visible='true' lat='-17.89591' lon='24.72534' />
+ <node id='-38003' lat='10.91915' lon='22.87758' />
+ <node id='-38005' lat='9.67566' lon='23.69155' />
+ <node id='-38007' lat='4.01805' lon='15.07686' />
+ <node id='-38009' lat='4.1362' lon='15.10644' />
+ <node id='-38011' lat='4.6135' lon='14.73383' />
+ <node id='-38013' lat='7.52179' lon='15.49743' />
+ <node id='-38015' lat='42.91911' lon='-65.81187' />
+ <node id='-38017' lat='44.20069' lon='-67.16117' />
+ <node id='-38019' lat='44.95333' lon='-67.0216' />
+ <node id='-38021' lat='45.11176' lon='-67.11316' />
+ <node id='-38023' lat='45.16179' lon='-67.15965' />
+ <node id='-38025' lat='45.16771' lon='-67.19603' />
+ <node id='-38027' lat='45.1722' lon='-67.20349' />
+ <node id='-38029' lat='45.16344' lon='-67.22751' />
+ <node id='-38031' lat='45.18173' lon='-67.29748' />
+ <node id='-38033' lat='45.14865' lon='-67.29754' />
+ <node id='-38035' lat='45.122' lon='-67.34927' />
+ <node id='-38037' lat='45.27351' lon='-67.48201' />
+ <node id='-38039' lat='45.37969' lon='-67.42394' />
+ <node id='-38041' lat='45.48971' lon='-67.50578' />
+ <node id='-38043' lat='45.50584' lon='-67.42144' />
+ <node id='-38045' lat='45.59162' lon='-67.43815' />
+ <node id='-38047' lat='45.69528' lon='-67.80705' />
+ <node id='-38049' lat='45.80022' lon='-67.80653' />
+ <node id='-38051' lat='45.82324' lon='-67.75654' />
+ <node id='-38053' lat='45.87531' lon='-67.80961' />
+ <node id='-38055' lat='45.9392' lon='-67.78111' />
+ <node id='-38057' lat='47.06473' lon='-67.78578' />
+ <node id='-38059' lat='47.1925' lon='-67.94843' />
+ <node id='-38061' lat='47.35712' lon='-68.23244' />
+ <node id='-38063' lat='47.35851' lon='-68.37458' />
+ <node id='-38065' lat='47.28723' lon='-68.38332' />
+ <node id='-38067' lat='47.28431' lon='-68.57914' />
+ <node id='-38069' lat='47.1807' lon='-68.89222' />
+ <node id='-38071' lat='47.2456' lon='-69.05039' />
+ <node id='-38073' lat='47.42012' lon='-69.05148' />
+ <node id='-38075' lat='47.46461' lon='-69.22119' />
+ <node id='-38077' lat='46.69543' lon='-69.99966' />
+ <node id='-38079' lat='46.41768' lon='-70.05812' />
+ <node id='-38081' lat='46.35357' lon='-70.18547' />
+ <node id='-38083' lat='45.96424' lon='-70.31025' />
+ <node id='-38085' lat='45.95138' lon='-70.24694' />
+ <node id='-38087' lat='45.89675' lon='-70.25976' />
+ <node id='-38089' lat='45.79497' lon='-70.41523' />
+ <node id='-38091' lat='45.73215' lon='-70.38934' />
+ <node id='-38093' lat='45.49771' lon='-70.72651' />
+ <node id='-38095' lat='45.37444' lon='-70.80236' />
+ <node id='-38097' lat='45.22698' lon='-70.84816' />
+ <node id='-38099' lat='45.33895' lon='-70.95193' />
+ <node id='-38101' lat='45.30623' lon='-71.08364' />
+ <node id='-38103' lat='45.24128' lon='-71.14568' />
+ <node id='-38105' lat='45.25438' lon='-71.19723' />
+ <node id='-38107' lat='45.25184' lon='-71.22338' />
+ <node id='-38109' lat='45.29996' lon='-71.29371' />
+ <node id='-38111' lat='45.24624' lon='-71.37133' />
+ <node id='-38113' lat='45.2361' lon='-71.44252' />
+ <node id='-38115' lat='45.21382' lon='-71.40364' />
+ <node id='-38117' lat='45.12624' lon='-71.42778' />
+ <node id='-38119' lat='45.07784' lon='-71.48735' />
+ <node id='-38121' lat='45.01357' lon='-71.50067' />
+ <node id='-38123' lat='45.00606' lon='-74.8447' />
+ <node id='-38125' lat='44.98051' lon='-74.99101' />
+ <node id='-38127' lat='44.95608' lon='-75.01363' />
+ <node id='-38129' lat='44.87821' lon='-75.2193' />
+ <node id='-38131' lat='44.76614' lon='-75.41441' />
+ <node id='-38133' lat='44.51537' lon='-75.76813' />
+ <node id='-38135' lat='44.43176' lon='-75.8217' />
+ <node id='-38137' lat='44.34463' lon='-75.95947' />
+ <node id='-38139' lat='44.34896' lon='-76.00018' />
+ <node id='-38141' lat='44.28262' lon='-76.16285' />
+ <node id='-38143' lat='44.23051' lon='-76.1664' />
+ <node id='-38145' lat='44.19643' lon='-76.244' />
+ <node id='-38147' lat='44.19894' lon='-76.31222' />
+ <node id='-38149' lat='44.13493' lon='-76.35324' />
+ <node id='-38151' lat='44.09393' lon='-76.43859' />
+ <node id='-38153' lat='43.63099' lon='-76.79706' />
+ <node id='-38155' lat='43.54052' lon='-79.25796' />
+ <node id='-38157' lat='43.26183' lon='-79.06921' />
+ <node id='-38159' visible='true' lat='42.93022' lon='-78.90905' />
+ <node id='-38161' lat='42.89733' lon='-78.90712' />
+ <node id='-38163' lat='42.82887' lon='-78.93684' />
+ <node id='-38165' lat='41.67681' lon='-82.39605' />
+ <node id='-38167' lat='41.67615' lon='-82.67862' />
+ <node id='-38169' lat='41.86338' lon='-83.07' />
+ <node id='-38171' lat='42.04089' lon='-83.14962' />
+ <node id='-38173' lat='42.12577' lon='-83.12023' />
+ <node id='-38175' lat='42.17574' lon='-83.13434' />
+ <node id='-38177' lat='42.2376' lon='-83.12724' />
+ <node id='-38179' lat='42.28877' lon='-83.09837' />
+ <node id='-38181' lat='42.30978' lon='-83.07837' />
+ <node id='-38183' lat='42.33045' lon='-83.02253' />
+ <node id='-38185' lat='42.37355' lon='-82.82964' />
+ <node id='-38187' lat='42.55594' lon='-82.64242' />
+ <node id='-38189' lat='42.54984' lon='-82.58873' />
+ <node id='-38191' visible='true' lat='42.5718' lon='-82.57583' />
+ <node id='-38193' lat='42.611' lon='-82.51858' />
+ <node id='-38195' lat='42.66025' lon='-82.51063' />
+ <node id='-38197' lat='42.76615' lon='-82.46613' />
+ <node id='-38199' lat='42.97626' lon='-82.4146' />
+ <node id='-38201' lat='42.992' lon='-82.42469' />
+ <node id='-38203' lat='45.20171' lon='-82.23151' />
+ <node id='-38205' lat='45.82131' lon='-83.59589' />
+ <node id='-38207' lat='45.99749' lon='-83.43746' />
+ <node id='-38209' lat='46.105' lon='-83.57017' />
+ <node id='-38211' lat='46.12108' lon='-83.65703' />
+ <node id='-38213' lat='46.10301' lon='-83.76207' />
+ <node id='-38215' lat='46.11889' lon='-83.82587' />
+ <node id='-38217' lat='46.05922' lon='-83.90453' />
+ <node id='-38219' lat='46.05634' lon='-83.95399' />
+ <node id='-38221' lat='46.10341' lon='-83.97741' />
+ <node id='-38223' lat='46.1199' lon='-84.00818' />
+ <node id='-38225' lat='46.14948' lon='-84.00698' />
+ <node id='-38227' lat='46.18728' lon='-84.07757' />
+ <node id='-38229' lat='46.20816' lon='-84.08569' />
+ <node id='-38231' lat='46.23987' lon='-84.1096' />
+ <node id='-38233' lat='46.25512' lon='-84.09756' />
+ <node id='-38235' lat='46.2681' lon='-84.11615' />
+ <node id='-38237' visible='true' lat='46.31423' lon='-84.1191' />
+ <node id='-38239' lat='46.32248' lon='-84.10732' />
+ <node id='-38241' lat='46.3462' lon='-84.12439' />
+ <node id='-38243' lat='46.3731' lon='-84.13853' />
+ <node id='-38245' lat='46.41757' lon='-84.14489' />
+ <node id='-38247' lat='46.50248' lon='-84.11196' />
+ <node id='-38249' lat='46.53068' lon='-84.12885' />
+ <node id='-38251' lat='46.52753' lon='-84.17723' />
+ <node id='-38253' lat='46.54061' lon='-84.1945' />
+ <node id='-38255' lat='46.53337' lon='-84.2264' />
+ <node id='-38257' lat='46.49508' lon='-84.26351' />
+ <node id='-38259' lat='46.49127' lon='-84.29893' />
+ <node id='-38261' lat='46.50683' lon='-84.34174' />
+ <node id='-38263' lat='46.49853' lon='-84.42101' />
+ <node id='-38265' visible='true' lat='46.48972' lon='-84.4481' />
+ <node id='-38267' lat='46.45225' lon='-84.47607' />
+ <node id='-38269' lat='46.45974' lon='-84.55635' />
+ <node id='-38271' lat='46.63458' lon='-84.7644' />
+ <node id='-38273' lat='46.88881' lon='-84.85871' />
+ <node id='-38275' lat='48.30586' lon='-88.37033' />
+ <node id='-38277' lat='48.24545' lon='-88.6773' />
+ <node id='-38279' lat='47.97445' lon='-89.33871' />
+ <node id='-38281' lat='48.01412' lon='-89.48837' />
+ <node id='-38283' lat='48.00023' lon='-89.57972' />
+ <node id='-38285' lat='47.98109' lon='-89.89974' />
+ <node id='-38287' lat='48.11043' lon='-90.07418' />
+ <node id='-38289' lat='48.09488' lon='-90.56312' />
+ <node id='-38291' lat='48.12184' lon='-90.56444' />
+ <node id='-38293' lat='48.09143' lon='-90.75045' />
+ <node id='-38295' lat='48.2484' lon='-90.87588' />
+ <node id='-38297' lat='48.18096' lon='-91.08016' />
+ <node id='-38299' lat='48.08522' lon='-91.25025' />
+ <node id='-38301' lat='48.04912' lon='-91.43248' />
+ <node id='-38303' lat='48.07454' lon='-91.45829' />
+ <node id='-38305' lat='48.04339' lon='-91.58025' />
+ <node id='-38307' lat='48.10611' lon='-91.55649' />
+ <node id='-38309' lat='48.11805' lon='-91.70451' />
+ <node id='-38311' lat='48.19875' lon='-91.71231' />
+ <node id='-38313' lat='48.21278' lon='-91.86125' />
+ <node id='-38315' lat='48.35958' lon='-92.05339' />
+ <node id='-38317' lat='48.35252' lon='-92.202' />
+ <node id='-38319' lat='48.25046' lon='-92.27167' />
+ <node id='-38321' visible='true' lat='48.22259' lon='-92.37185' />
+ <node id='-38323' lat='48.36609' lon='-92.48147' />
+ <node id='-38325' lat='48.40624' lon='-92.45588' />
+ <node id='-38327' lat='48.44921' lon='-92.50712' />
+ <node id='-38329' lat='48.43471' lon='-92.65606' />
+ <node id='-38331' visible='true' lat='48.50278' lon='-92.62747' />
+ <node id='-38333' lat='48.54133' lon='-92.6342' />
+ <node id='-38335' lat='48.54005' lon='-92.7287' />
+ <node id='-38337' lat='48.60866' lon='-92.94973' />
+ <node id='-38339' lat='48.64266' lon='-93.25391' />
+ <node id='-38341' lat='48.60653' lon='-93.41228' />
+ <node id='-38343' lat='48.59147' lon='-93.44472' />
+ <node id='-38345' lat='48.54357' lon='-93.47022' />
+ <node id='-38347' lat='48.51845' lon='-93.66382' />
+ <node id='-38349' lat='48.51631' lon='-93.79267' />
+ <node id='-38351' lat='48.52439' lon='-93.80939' />
+ <node id='-38353' lat='48.62745' lon='-93.83288' />
+ <node id='-38355' lat='48.63284' lon='-93.85769' />
+ <node id='-38357' visible='true' lat='48.65202' lon='-94.23215' />
+ <node id='-38359' visible='true' lat='48.65729' lon='-94.25104' />
+ <node id='-38361' lat='48.69223' lon='-94.44258' />
+ <node id='-38363' lat='48.70216' lon='-94.53826' />
+ <node id='-38365' lat='48.71803' lon='-94.58903' />
+ <node id='-38367' lat='48.77883' lon='-94.69335' />
+ <node id='-38369' lat='48.80918' lon='-94.69669' />
+ <node id='-38371' lat='48.82365' lon='-94.70486' />
+ <node id='-38373' lat='48.8339' lon='-94.70087' />
+ <node id='-38375' lat='48.84077' lon='-94.687' />
+ <node id='-38377' lat='49.09931' lon='-94.75017' />
+ <node id='-38379' lat='49.29483' lon='-94.82487' />
+ <node id='-38381' lat='49.32299' lon='-94.8159' />
+ <node id='-38383' lat='49.32492' lon='-94.85381' />
+ <node id='-38385' lat='49.37035' lon='-94.95681' />
+ <node id='-38387' lat='49.35647' lon='-95.01419' />
+ <node id='-38389' lat='49.35311' lon='-95.05825' />
+ <node id='-38391' lat='49.384' lon='-95.15357' />
+ <node id='-38393' lat='48.9996' lon='-95.15355' />
+ <node id='-38395' lat='72.20369' lon='-141.00555' />
+ <node id='-38397' lat='45.93987' lon='-51.16966' />
+ <node id='-38399' lat='46.64935' lon='-55.8643' />
+ <node id='-38401' lat='47.31192' lon='-56.25228' />
+ <node id='-38403' lat='47.38123' lon='-57.60106' />
+ <node id='-38405' lat='51.98254' lon='126.44606' />
+ <node id='-38407' lat='51.70607' lon='126.68349' />
+ <node id='-38409' lat='50.23503' lon='127.60515' />
+ <node id='-38411' lat='46.46681' lon='133.84104' />
+ <node id='-38413' lat='46.4274' lon='133.91496' />
+ <node id='-38415' lat='46.05576' lon='133.72695' />
+ <node id='-38417' lat='45.1332' lon='133.12293' />
+ <node id='-38419' lat='45.05916' lon='132.83978' />
+ <node id='-38421' lat='45.2567' lon='131.99417' />
+ <node id='-38423' lat='44.04262' lon='131.30365' />
+ <node id='-38425' lat='42.84753' lon='130.66524' />
+ <node id='-38427' lat='42.9027' lon='130.26095' />
+ <node id='-38429' lat='42.96494' lon='129.85261' />
+ <node id='-38431' visible='true' lat='42.07524' lon='128.95485' />
+ <node id='-38433' visible='true' lat='42.03537' lon='128.94007' />
+ <node id='-38435' lat='42.01769' lon='128.04487' />
+ <node id='-38437' lat='41.60322' lon='128.30716' />
+ <node id='-38439' lat='41.38165' lon='128.16422' />
+ <node id='-38441' lat='41.79111' lon='126.91622' />
+ <node id='-38443' visible='true' lat='40.11047' lon='124.38556' />
+ <node id='-38445' visible='true' lat='40.09829' lon='124.36997' />
+ <node id='-38447' lat='24.49266' lon='118.56434' />
+ <node id='-38449' lat='24.51645' lon='118.35291' />
+ <node id='-38451' lat='24.51231' lon='118.28244' />
+ <node id='-38453' lat='24.38193' lon='118.09488' />
+ <node id='-38455' lat='24.06775' lon='118.41371' />
+ <node id='-38457' visible='true' lat='21.53604' lon='108.0569' />
+ <node id='-38459' lat='21.77659' lon='101.11744' />
+ <node id='-38461' lat='21.67396' lon='100.87265' />
+ <node id='-38463' lat='22.15874' lon='99.1552' />
+ <node id='-38465' lat='22.85726' lon='99.45654' />
+ <node id='-38467' lat='22.94086' lon='99.43537' />
+ <node id='-38469' lat='22.90014' lon='99.54218' />
+ <node id='-38471' lat='23.08218' lon='99.52214' />
+ <node id='-38473' lat='23.18656' lon='98.88597' />
+ <node id='-38475' lat='24.15624' lon='98.87998' />
+ <node id='-38477' lat='24.09526' lon='98.09406' />
+ <node id='-38479' lat='23.84276' lon='97.64616' />
+ <node id='-38481' lat='23.94032' lon='97.5247' />
+ <node id='-38483' lat='24.16902' lon='97.75305' />
+ <node id='-38485' lat='24.76475' lon='97.56648' />
+ <node id='-38487' lat='26.09165' lon='98.66884' />
+ <node id='-38489' lat='26.85095' lon='98.72884' />
+ <node id='-38491' lat='28.21385' lon='97.34547' />
+ <node id='-38493' lat='28.81575' lon='96.58216' />
+ <node id='-38495' lat='29.20797' lon='95.72086' />
+ <node id='-38497' lat='29.31739' lon='94.69318' />
+ <node id='-38499' lat='28.68821' lon='93.72797' />
+ <node id='-38501' visible='true' lat='28.67189' lon='93.44621' />
+ <node id='-38503' lat='28.15018' lon='92.67486' />
+ <node id='-38505' lat='27.95417' lon='88.1278' />
+ <node id='-38507' lat='31.60631' lon='78.84516' />
+ <node id='-38509' lat='32.00384' lon='78.74404' />
+ <node id='-38511' lat='32.38051' lon='79.0979' />
+ <node id='-38513' lat='32.47766' lon='79.13174' />
+ <node id='-38515' lat='32.53277' lon='79.26768' />
+ <node id='-38517' lat='33.56521' lon='78.73636' />
+ <node id='-38519' lat='34.03195' lon='78.65657' />
+ <node id='-38521' lat='34.61484' lon='78.27781' />
+ <node id='-38523' lat='35.48022' lon='78.11664' />
+ <node id='-38525' lat='35.66062' lon='76.77323' />
+ <node id='-38527' lat='36.13136' lon='75.93028' />
+ <node id='-38529' lat='36.59522' lon='75.94756' />
+ <node id='-38531' lat='36.7529' lon='75.72737' />
+ <node id='-38533' lat='37.03023' lon='74.56453' />
+ <node id='-38535' lat='37.23275' lon='74.88887' />
+ <node id='-38537' lat='37.77486' lon='75.00935' />
+ <node id='-38539' lat='38.37952' lon='74.66345' />
+ <node id='-38541' lat='38.66449' lon='73.80656' />
+ <node id='-38543' lat='39.24534' lon='73.60638' />
+ <node id='-38545' lat='39.46425' lon='73.59831' />
+ <node id='-38547' lat='39.47879' lon='73.87018' />
+ <node id='-38549' lat='39.60733' lon='73.94683' />
+ <node id='-38551' lat='39.76136' lon='73.83006' />
+ <node id='-38553' lat='40.04378' lon='73.97049' />
+ <node id='-38555' lat='40.13191' lon='74.25533' />
+ <node id='-38557' lat='40.34668' lon='74.69875' />
+ <node id='-38559' lat='42.21166' lon='80.17807' />
+ <node id='-38561' visible='true' lat='42.23797' lon='80.26841' />
+ <node id='-38563' visible='true' lat='42.66037' lon='80.15245' />
+ <node id='-38565' lat='42.8366' lon='80.26886' />
+ <node id='-38567' visible='true' lat='42.83142' lon='80.38169' />
+ <node id='-38569' lat='42.9011' lon='80.58999' />
+ <node id='-38571' lat='43.141' lon='80.62913' />
+ <node id='-38573' lat='43.14235' lon='80.78817' />
+ <node id='-38575' lat='43.30065' lon='80.77771' />
+ <node id='-38577' lat='43.32589' lon='80.69718' />
+ <node id='-38579' lat='43.44948' lon='80.75156' />
+ <node id='-38581' lat='49.12432' lon='86.87238' />
+ <node id='-38583' lat='49.11626' lon='87.28386' />
+ <node id='-38585' lat='48.89582' lon='87.73822' />
+ <node id='-38587' lat='46.99399' lon='90.76108' />
+ <node id='-38589' visible='true' lat='45.49314' lon='90.65114' />
+ <node id='-38591' lat='44.25274' lon='95.01191' />
+ <node id='-38593' visible='true' lat='44.2805' lon='95.39772' />
+ <node id='-38595' lat='43.99353' lon='95.52594' />
+ <node id='-38597' lat='43.2528' lon='95.89543' />
+ <node id='-38599' lat='42.90363' lon='96.35658' />
+ <node id='-38601' visible='true' lat='42.72055' lon='96.37926' />
+ <node id='-38603' lat='42.50074' lon='101.80515' />
+ <node id='-38605' lat='41.66113' lon='104.51667' />
+ <node id='-38607' lat='41.58382' lon='105.01119' />
+ <node id='-38609' lat='42.40898' lon='107.57258' />
+ <node id='-38611' lat='44.3461' lon='111.40498' />
+ <node id='-38613' lat='44.98032' lon='111.76275' />
+ <node id='-38615' lat='45.38337' lon='114.54801' />
+ <node id='-38617' lat='45.43585' lon='114.74612' />
+ <node id='-38619' lat='45.37377' lon='114.94546' />
+ <node id='-38621' lat='45.45761' lon='115.69688' />
+ <node id='-38623' lat='45.68603' lon='116.16989' />
+ <node id='-38625' lat='45.78637' lon='116.27366' />
+ <node id='-38627' lat='45.8778' lon='116.24012' />
+ <node id='-38629' visible='true' lat='46.38637' lon='116.83166' />
+ <node id='-38631' lat='46.36335' lon='117.36609' />
+ <node id='-38633' lat='46.63783' lon='119.42827' />
+ <node id='-38635' lat='47.42617' lon='119.31964' />
+ <node id='-38637' lat='47.53997' lon='119.13995' />
+ <node id='-38639' lat='47.76947' lon='118.7564' />
+ <node id='-38641' lat='47.63627' lon='117.37875' />
+ <node id='-38643' lat='47.87766' lon='116.2527' />
+ <node id='-38645' lat='47.67741' lon='115.94296' />
+ <node id='-38647' lat='48.15367' lon='115.52082' />
+ <node id='-38649' lat='48.81716' lon='116.06565' />
+ <node id='-38651' visible='true' lat='48.87014' lon='116.03781' />
+ <node id='-38653' lat='49.68482' lon='117.07142' />
+ <node id='-38655' lat='49.62544' lon='117.27597' />
+ <node id='-38657' lat='49.62324' lon='117.48208' />
+ <node id='-38659' lat='50.00276' lon='119.11003' />
+ <node id='-38661' lat='50.37412' lon='119.13553' />
+ <node id='-38663' lat='51.93544' lon='120.65907' />
+ <node id='-38665' lat='52.32447' lon='120.61346' />
+ <node id='-38667' lat='52.54099' lon='120.71673' />
+ <node id='-38669' lat='53.31888' lon='121.39213' />
+ <node id='-38671' lat='53.47395' lon='122.85966' />
+ <node id='-38673' lat='53.54843' lon='123.26989' />
+ <node id='-38675' lat='47.79998' lon='8.61657' />
+ <node id='-38677' lat='47.67462' lon='8.79511' />
+ <node id='-38679' lat='47.7075' lon='8.76965' />
+ <node id='-38681' lat='47.72059' lon='8.77309' />
+ <node id='-38683' lat='47.73821' lon='8.80663' />
+ <node id='-38685' lat='47.64769' lon='8.89946' />
+ <node id='-38687' lat='47.66522' lon='9.13657' />
+ <node id='-38689' lat='46.61003' lon='10.10307' />
+ <node id='-38691' lat='45.85653' lon='7.10685' />
+ <node id='-38693' lat='46.42661' lon='6.82312' />
+ <node id='-38695' lat='47.06616' lon='6.68823' />
+ <node id='-38697' lat='47.24338' lon='6.9508' />
+ <node id='-38699' lat='47.49583' lon='6.98717' />
+ <node id='-38701' lat='47.44312' lon='7.17026' />
+ <node id='-38703' lat='47.59017' lon='7.58945' />
+ <node id='-38705' lat='47.54599' lon='7.75261' />
+ <node id='-38707' lat='47.55691' lon='7.79486' />
+ <node id='-38709' lat='47.55493' lon='7.97581' />
+ <node id='-38711' lat='47.57918' lon='8.10395' />
+ <node id='-38713' lat='47.62141' lon='8.20617' />
+ <node id='-38715' lat='47.60603' lon='8.29722' />
+ <node id='-38717' lat='47.56608' lon='8.38273' />
+ <node id='-38719' lat='47.63476' lon='8.51686' />
+ <node id='-38721' lat='47.67201' lon='8.60452' />
+ <node id='-38723' lat='47.66059' lon='8.52801' />
+ <node id='-38725' lat='47.66676' lon='8.41346' />
+ <node id='-38727' lat='47.77215' lon='8.48868' />
+ <node id='-38729' lat='47.78001' lon='8.56814' />
+ <node id='-38731' visible='true' lat='-54.92205' lon='-67.46182' />
+ <node id='-38733' lat='-19.40499' lon='-68.41218' />
+ <node id='-38735' lat='-22.87076' lon='-67.85114' />
+ <node id='-38737' lat='-18.35072' lon='-70.59118' />
+ <node id='-38739' lat='10.43177' lon='-5.51058' />
+ <node id='-38741' lat='9.49343' lon='-2.68802' />
+ <node id='-38743' lat='8.20872' lon='-2.49037' />
+ <node id='-38745' lat='5.10657' lon='-2.75502' />
+ <node id='-38747' lat='4.17519' lon='-3.34019' />
+ <node id='-38749' lat='4.35145' lon='-7.53259' />
+ <node id='-38751' lat='6.50612' lon='-8.59456' />
+ <node id='-38753' lat='7.55676' lon='-8.47114' />
+ <node id='-38755' lat='12.62963' lon='14.83314' />
+ <node id='-38757' visible='true' lat='12.3269' lon='14.90827' />
+ <node id='-38759' lat='11.79313' lon='15.11579' />
+ <node id='-38761' lat='10.80921' lon='15.06737' />
+ <node id='-38763' lat='9.99344' lon='15.68761' />
+ <node id='-38765' lat='9.92876' lon='15.41408' />
+ <node id='-38767' lat='10.00264' lon='14.4673' />
+ <node id='-38769' lat='10.00055' lon='14.20411' />
+ <node id='-38771' lat='9.82413' lon='14.1317' />
+ <node id='-38773' lat='9.6365' lon='13.97544' />
+ <node id='-38775' lat='9.19611' lon='14.35707' />
+ <node id='-38777' lat='8.50892' lon='15.20426' />
+ <node id='-38779' lat='7.7696' lon='15.59272' />
+ <node id='-38781' lat='7.58936' lon='15.56964' />
+ <node id='-38783' lat='2.21537' lon='16.19357' />
+ <node id='-38785' visible='true' lat='2.16106' lon='13.29457' />
+ <node id='-38787' visible='true' lat='2.16561' lon='9.991' />
+ <node id='-38789' lat='2.33797' lon='9.81162' />
+ <node id='-38791' lat='4.06346' lon='8.6479' />
+ <node id='-38793' lat='4.30689' lon='8.34397' />
+ <node id='-38795' lat='13.0797' lon='14.08251' />
+ <node id='-38797' lat='13.08259' lon='14.46881' />
+ <node id='-38799' lat='35.70297' lon='32.82353' />
+ <node id='-38801' lat='5.02033' lon='27.44419' />
+ <node id='-38803' lat='-2.7416' lon='29.04081' />
+ <node id='-38805' visible='true' lat='-6.2731' lon='29.52552' />
+ <node id='-38807' lat='-8.27382' lon='30.79243' />
+ <node id='-38809' visible='true' lat='-8.4831' lon='28.88917' />
+ <node id='-38811' visible='true' lat='-9.92942' lon='28.62795' />
+ <node id='-38813' lat='-13.44683' lon='29.81551' />
+ <node id='-38815' lat='3.47564' lon='18.62755' />
+ <node id='-38817' lat='-4.63739' lon='13.09648' />
+ <node id='-38819' lat='-5.02627' lon='12.00924' />
+ <node id='-38821' lat='-5.33417' lon='11.50888' />
+ <node id='-38823' lat='-4.39519' lon='10.75913' />
+ <node id='-38825' lat='-3.68942' lon='11.68608' />
+ <node id='-38827' lat='-3.62768' lon='11.92719' />
+ <node id='-38829' lat='-3.5812' lon='11.8318' />
+ <node id='-38831' lat='-2.41704' lon='12.04895' />
+ <node id='-38833' lat='-2.43224' lon='13.47977' />
+ <node id='-38835' lat='-1.97624' lon='14.25932' />
+ <node id='-38837' lat='-1.89412' lon='14.41838' />
+ <node id='-38839' lat='-0.57818' lon='14.52569' />
+ <node id='-38841' lat='-0.2287' lon='13.90632' />
+ <node id='-38843' lat='0.57255' lon='14.26066' />
+ <node id='-38845' lat='12.65801' lon='-71.19849' />
+ <node id='-38847' visible='true' lat='11.85' lon='-71.3275' />
+ <node id='-38849' lat='6.1072' lon='-69.41843' />
+ <node id='-38851' visible='true' lat='3.38393' lon='-67.30945' />
+ <node id='-38853' lat='2.35778' lon='-67.21967' />
+ <node id='-38855' lat='-3.7921' lon='-70.71396' />
+ <node id='-38857' lat='-2.73906' lon='-70.04609' />
+ <node id='-38859' visible='true' lat='-0.97229' lon='-74.26675' />
+ <node id='-38861' lat='1.46862' lon='-78.86967' />
+ <node id='-38863' lat='7.07793' lon='-78.06168' />
+ <node id='-38865' lat='8.81247' lon='-77.32389' />
+ <node id='-38867' lat='9.65379' lon='-82.51044' />
+ <node id='-38869' lat='9.57279' lon='-82.56507' />
+ <node id='-38871' visible='true' lat='8.10219' lon='-82.88641' />
+ <node id='-38873' visible='true' lat='8.05755' lon='-82.89137' />
+ <node id='-38875' lat='7.93865' lon='-82.94503' />
+ <node id='-38877' lat='11.09059' lon='-86.14524' />
+ <node id='-38879' lat='35.04253' lon='33.76106' />
+ <node id='-38881' lat='35.05321' lon='33.73824' />
+ <node id='-38883' lat='36.10954' lon='35.51152' />
+ <node id='-38885' lat='34.9976' lon='33.77312' />
+ <node id='-38887' lat='34.99518' lon='33.77553' />
+ <node id='-38889' lat='34.99582' lon='33.78516' />
+ <node id='-38891' lat='34.98914' lon='33.79191' />
+ <node id='-38893' lat='34.98854' lon='33.78917' />
+ <node id='-38895' lat='34.98951' lon='33.78571' />
+ <node id='-38897' lat='34.98699' lon='33.78318' />
+ <node id='-38899' lat='34.988' lon='33.77843' />
+ <node id='-38901' lat='34.98981' lon='33.7778' />
+ <node id='-38903' lat='34.99188' lon='33.76738' />
+ <node id='-38905' lat='34.99543' lon='33.76605' />
+ <node id='-38907' lat='34.99916' lon='33.75682' />
+ <node id='-38909' lat='35.00113' lon='33.75994' />
+ <node id='-38911' lat='35.01053' lon='33.74144' />
+ <node id='-38913' lat='35.01178' lon='33.7343' />
+ <node id='-38915' lat='35.02181' lon='33.73781' />
+ <node id='-38917' lat='35.02329' lon='33.74265' />
+ <node id='-38919' lat='35.02274' lon='33.74983' />
+ <node id='-38921' lat='35.01319' lon='33.7492' />
+ <node id='-38923' lat='34.96623' lon='33.90075' />
+ <node id='-38925' lat='34.49942' lon='33.26744' />
+ <node id='-38927' lat='34.64424' lon='33.0138' />
+ <node id='-38929' lat='34.63446' lon='32.96718' />
+ <node id='-38931' lat='34.62919' lon='32.95891' />
+ <node id='-38933' lat='34.64075' lon='32.95323' />
+ <node id='-38935' lat='34.66462' lon='32.95325' />
+ <node id='-38937' lat='34.66112' lon='32.97079' />
+ <node id='-38939' lat='34.65277' lon='32.97736' />
+ <node id='-38941' lat='34.65518' lon='32.99014' />
+ <node id='-38943' lat='34.68061' lon='32.99135' />
+ <node id='-38945' lat='34.67907' lon='32.94683' />
+ <node id='-38947' lat='34.66241' lon='32.93449' />
+ <node id='-38949' lat='34.66736' lon='32.92807' />
+ <node id='-38951' lat='34.67091' lon='32.93043' />
+ <node id='-38953' lat='34.67343' lon='32.91398' />
+ <node id='-38955' lat='34.66102' lon='32.9068' />
+ <node id='-38957' lat='34.68734' lon='32.86167' />
+ <node id='-38959' lat='34.70585' lon='32.86014' />
+ <node id='-38961' lat='34.70622' lon='32.82717' />
+ <node id='-38963' lat='34.67883' lon='32.79433' />
+ <node id='-38965' lat='34.68318' lon='32.76136' />
+ <node id='-38967' lat='34.64985' lon='32.75515' />
+ <node id='-38969' lat='34.43926' lon='32.74412' />
+ <node id='-38971' lat='34.37973' lon='32.10341' />
+ <node id='-38973' lat='35.1606' lon='31.71872' />
+ <node id='-38975' lat='50.87096' lon='14.82031' />
+ <node id='-38977' lat='49.6815' lon='18.80479' />
+ <node id='-38979' lat='49.51739' lon='18.83732' />
+ <node id='-38981' lat='48.87602' lon='17.19355' />
+ <node id='-38983' lat='54.12784' lon='14.20811' />
+ <node id='-38985' lat='54.85841' lon='9.20571' />
+ <node id='-38987' lat='54.84726' lon='9.24631' />
+ <node id='-38989' lat='54.83432' lon='9.23445' />
+ <node id='-38991' lat='54.8112' lon='9.2474' />
+ <node id='-38993' lat='54.84116' lon='9.40741' />
+ <node id='-38995' lat='54.82586' lon='9.43155' />
+ <node id='-38997' lat='54.83131' lon='9.4659' />
+ <node id='-38999' lat='54.73883' lon='10.16755' />
+ <node id='-39001' lat='54.65968' lon='10.31111' />
+ <node id='-39003' lat='54.38543' lon='11.90309' />
+ <node id='-39005' lat='48.76988' lon='13.84023' />
+ <node id='-39007' lat='47.53629' lon='9.55125' />
+ <node id='-39009' lat='47.65939' lon='9.25619' />
+ <node id='-39011' lat='47.65486' lon='9.17078' />
+ <node id='-39013' lat='47.6868' lon='9.02093' />
+ <node id='-39015' lat='47.65441' lon='8.87625' />
+ <node id='-39017' lat='47.68209' lon='8.85065' />
+ <node id='-39019' lat='47.70504' lon='8.86989' />
+ <node id='-39021' lat='47.71458' lon='8.82002' />
+ <node id='-39023' lat='47.69282' lon='8.72809' />
+ <node id='-39025' lat='47.69651' lon='8.72617' />
+ <node id='-39027' lat='47.7169' lon='8.73671' />
+ <node id='-39029' lat='47.7626' lon='8.62408' />
+ <node id='-39031' lat='47.80633' lon='8.56415' />
+ <node id='-39033' lat='47.61897' lon='8.50747' />
+ <node id='-39035' lat='47.58854' lon='7.88664' />
+ <node id='-39037' lat='47.58798' lon='7.81901' />
+ <node id='-39039' lat='47.54219' lon='7.71961' />
+ <node id='-39041' lat='47.63849' lon='7.5591' />
+ <node id='-39043' lat='47.65115' lon='7.53384' />
+ <node id='-39045' lat='47.66437' lon='7.52067' />
+ <node id='-39047' lat='47.68335' lon='7.51915' />
+ <node id='-39049' lat='47.70197' lon='7.51266' />
+ <node id='-39051' lat='47.71635' lon='7.53722' />
+ <node id='-39053' lat='47.72912' lon='7.54761' />
+ <node id='-39055' lat='47.77747' lon='7.52921' />
+ <node id='-39057' visible='true' lat='48.54758' lon='7.80167' />
+ <node id='-39059' visible='true' lat='48.58236' lon='7.80178' />
+ <node id='-39061' lat='48.87985' lon='8.12813' />
+ <node id='-39063' visible='true' lat='48.95825' lon='8.19989' />
+ <node id='-39065' visible='true' lat='48.95856' lon='8.20031' />
+ <node id='-39067' lat='48.97946' lon='8.14241' />
+ <node id='-39069' lat='49.03161' lon='7.97783' />
+ <node id='-39071' lat='49.05567' lon='7.93916' />
+ <node id='-39073' lat='49.03499' lon='7.86386' />
+ <node id='-39075' lat='49.05428' lon='7.63618' />
+ <node id='-39077' lat='49.13915' lon='7.49172' />
+ <node id='-39079' lat='49.17' lon='7.49473' />
+ <node id='-39081' lat='49.17308' lon='7.3662' />
+ <node id='-39083' lat='49.28065' lon='6.66583' />
+ <node id='-39085' visible='true' lat='49.46546' lon='6.40274' />
+ <node id='-39087' visible='true' lat='49.4667' lon='6.39168' />
+ <node id='-39089' visible='true' lat='49.46463' lon='6.38352' />
+ <node id='-39091' lat='49.48931' lon='6.36907' />
+ <node id='-39093' lat='49.55171' lon='6.38072' />
+ <node id='-39095' lat='49.57053' lon='6.35825' />
+ <node id='-39097' lat='49.59946' lon='6.385' />
+ <node id='-39099' lat='49.60081' lon='6.39822' />
+ <node id='-39101' lat='49.61723' lon='6.41861' />
+ <node id='-39103' lat='49.65722' lon='6.4413' />
+ <node id='-39105' lat='49.66078' lon='6.42726' />
+ <node id='-39107' lat='49.66857' lon='6.42937' />
+ <node id='-39109' lat='49.69092' lon='6.46048' />
+ <node id='-39111' lat='49.75292' lon='6.50174' />
+ <node id='-39113' lat='49.81164' lon='6.45425' />
+ <node id='-39115' lat='49.81591' lon='6.42521' />
+ <node id='-39117' lat='49.85032' lon='6.36576' />
+ <node id='-39119' lat='49.84974' lon='6.34267' />
+ <node id='-39121' lat='49.88203' lon='6.26146' />
+ <node id='-39123' lat='49.89972' lon='6.23496' />
+ <node id='-39125' lat='49.94955' lon='6.22094' />
+ <node id='-39127' lat='49.97086' lon='6.16466' />
+ <node id='-39129' lat='49.98518' lon='6.1701' />
+ <node id='-39131' lat='49.99563' lon='6.14147' />
+ <node id='-39133' lat='50.01849' lon='6.1295' />
+ <node id='-39135' lat='50.02019' lon='6.13273' />
+ <node id='-39137' lat='50.02207' lon='6.14666' />
+ <node id='-39139' lat='50.02929' lon='6.13044' />
+ <node id='-39141' lat='50.05916' lon='6.11274' />
+ <node id='-39143' lat='50.77453' lon='6.02624' />
+ <node id='-39145' lat='50.79992' lon='5.97497' />
+ <node id='-39147' lat='50.80988' lon='5.98404' />
+ <node id='-39149' lat='50.8882' lon='6.07178' />
+ <node id='-39151' lat='50.92066' lon='6.09297' />
+ <node id='-39153' lat='50.93367' lon='6.01615' />
+ <node id='-39155' lat='50.9852' lon='6.02577' />
+ <node id='-39157' visible='true' lat='51.07469' lon='5.98292' />
+ <node id='-39159' lat='51.54096' lon='6.18017' />
+ <node id='-39161' lat='51.60564' lon='6.09055' />
+ <node id='-39163' lat='51.85883' lon='6.47437' />
+ <node id='-39165' lat='52.40237' lon='7.03417' />
+ <node id='-39167' lat='52.488' lon='6.69507' />
+ <node id='-39169' lat='52.65375' lon='6.77307' />
+ <node id='-39171' lat='52.63339' lon='7.05158' />
+ <node id='-39173' lat='53.20058' lon='7.21679' />
+ <node id='-39175' lat='53.31866' lon='7.19052' />
+ <node id='-39177' lat='53.32672' lon='7.00198' />
+ <node id='-39179' lat='53.44221' lon='6.91025' />
+ <node id='-39181' lat='54.20039' lon='5.45168' />
+ <node id='-39183' lat='55.09613' lon='8.02459' />
+ <node id='-39185' lat='55.06747' lon='8.45719' />
+ <node id='-39187' lat='54.91069' lon='8.63979' />
+ <node id='-39189' lat='11.70983' lon='43.42425' />
+ <node id='-39191' lat='10.97127' lon='41.80056' />
+ <node id='-39193' lat='11.72361' lon='41.82878' />
+ <node id='-39195' lat='11.81157' lon='41.95461' />
+ <node id='-39197' lat='12.46478' lon='42.4037' />
+ <node id='-39199' lat='12.79154' lon='43.29075' />
+ <node id='-39201' lat='12.59711' lon='43.32909' />
+ <node id='-39203' lat='56.04345' lon='12.65312' />
+ <node id='-39205' lat='54.91837' lon='8.55769' />
+ <node id='-39207' lat='57.35913' lon='7.28637' />
+ <node id='-39209' lat='58.38489' lon='10.40861' />
+ <node id='-39211' lat='18.97186' lon='-67.99519' />
+ <node id='-39213' lat='17.83927' lon='-68.20301' />
+ <node id='-39215' lat='17.20162' lon='-71.87936' />
+ <node id='-39217' lat='18.03686' lon='-71.75355' />
+ <node id='-39219' visible='true' lat='18.78423' lon='-71.71885' />
+ <node id='-39221' lat='20.08703' lon='-72.17094' />
+ <node id='-39223' lat='35.73669' lon='8.26472' />
+ <node id='-39225' lat='35.29884' lon='8.30329' />
+ <node id='-39227' lat='34.57575' lon='8.20482' />
+ <node id='-39229' lat='34.06493' lon='7.52851' />
+ <node id='-39231' lat='32.83483' lon='8.31895' />
+ <node id='-39233' visible='true' lat='32.50101' lon='8.35999' />
+ <node id='-39235' lat='30.16738' lon='9.3876' />
+ <node id='-39237' visible='true' lat='23.51735' lon='11.96886' />
+ <node id='-39239' visible='true' lat='20.87258' lon='7.48273' />
+ <node id='-39241' visible='true' lat='20.79165' lon='7.38361' />
+ <node id='-39243' lat='19.45101' lon='5.8153' />
+ <node id='-39245' lat='19.14224' lon='4.26651' />
+ <node id='-39247' lat='21.12843' lon='1.15698' />
+ <node id='-39249' lat='24.99935' lon='-4.83423' />
+ <node id='-39251' lat='27.6666' lon='-8.66879' />
+ <node id='-39253' lat='28.71194' lon='-8.6715' />
+ <node id='-39255' visible='true' lat='29.50924' lon='-6.95824' />
+ <node id='-39257' visible='true' lat='29.51623' lon='-6.69965' />
+ <node id='-39259' visible='true' lat='29.61407' lon='-5.75616' />
+ <node id='-39261' lat='29.48103' lon='-5.58831' />
+ <node id='-39263' lat='30.67539' lon='-3.64735' />
+ <node id='-39265' lat='30.85566' lon='-3.65418' />
+ <node id='-39267' lat='31.6339' lon='-3.66314' />
+ <node id='-39269' lat='32.16603' lon='-2.46166' />
+ <node id='-39271' lat='32.52467' lon='-0.9912' />
+ <node id='-39273' lat='32.73628' lon='-1.37794' />
+ <node id='-39275' lat='32.95499' lon='-1.54244' />
+ <node id='-39277' lat='34.10405' lon='-1.64666' />
+ <node id='-39279' lat='34.39018' lon='-1.78042' />
+ <node id='-39281' lat='34.48056' lon='-1.69788' />
+ <node id='-39283' lat='-0.11943' lon='-75.25764' />
+ <node id='-39285' lat='-0.9374' lon='-75.3872' />
+ <node id='-39287' lat='-1.55961' lon='-75.57429' />
+ <node id='-39289' lat='-2.12179' lon='-76.05203' />
+ <node id='-39291' lat='-2.58397' lon='-76.6324' />
+ <node id='-39293' visible='true' lat='-3.05454' lon='-77.94147' />
+ <node id='-39295' lat='-5.01481' lon='-79.01659' />
+ <node id='-39297' lat='-3.43246' lon='-80.22627' />
+ <node id='-39299' lat='-3.39149' lon='-80.30602' />
+ <node id='-39301' lat='-3.36941' lon='-84.52388' />
+ <node id='-39303' lat='31.32363' lon='34.21853' />
+ <node id='-39305' lat='31.29214' lon='34.23985' />
+ <node id='-39307' lat='29.24574' lon='24.99968' />
+ <node id='-39309' visible='true' lat='31.57937' lon='25.06041' />
+ <node id='-39311' lat='31.67534' lon='25.14001' />
+ <node id='-39313' lat='16.19728' lon='41.37609' />
+ <node id='-39315' lat='15.565' lon='41.29956' />
+ <node id='-39317' lat='13.58268' lon='42.63806' />
+ <node id='-39319' lat='14.25597' lon='36.54376' />
+ <node id='-39321' lat='15.14963' lon='36.44337' />
+ <node id='-39323' lat='17.66269' lon='38.37133' />
+ <node id='-39325' lat='17.87167' lon='38.45916' />
+ <node id='-39327' lat='18.37348' lon='39.63762' />
+ <node id='-39329' lat='35.26538' lon='-2.9501' />
+ <node id='-39331' lat='35.28852' lon='-2.97035' />
+ <node id='-39333' lat='35.3401' lon='-2.92224' />
+ <node id='-39335' lat='35.8711' lon='-5.34379' />
+ <node id='-39337' lat='35.87375' lon='-5.35844' />
+ <node id='-39339' lat='35.88417' lon='-5.37338' />
+ <node id='-39341' lat='42.44682' lon='1.99838' />
+ <node id='-39343' lat='42.44697' lon='1.98378' />
+ <node id='-39345' lat='42.45364' lon='1.96125' />
+ <node id='-39347' lat='42.45785' lon='1.95606' />
+ <node id='-39349' lat='42.47854' lon='1.96215' />
+ <node id='-39351' lat='42.48568' lon='1.97697' />
+ <node id='-39353' lat='42.49351' lon='1.98916' />
+ <node id='-39355' lat='42.4858' lon='1.99766' />
+ <node id='-39357' lat='42.47486' lon='1.98579' />
+ <node id='-39359' lat='42.46208' lon='1.99216' />
+ <node id='-39361' lat='42.45171' lon='2.01564' />
+ <node id='-39363' lat='43.59738' lon='-1.81005' />
+ <node id='-39365' lat='43.38957' lon='-1.77289' />
+ <node id='-39367' lat='43.37497' lon='-1.79319' />
+ <node id='-39369' lat='43.36399' lon='-1.78332' />
+ <node id='-39371' lat='43.35476' lon='-1.78714' />
+ <node id='-39373' lat='43.34396' lon='-1.77068' />
+ <node id='-39375' lat='43.34107' lon='-1.75334' />
+ <node id='-39377' lat='43.3317' lon='-1.75079' />
+ <node id='-39379' lat='43.27272' lon='-1.40942' />
+ <node id='-39381' lat='43.24511' lon='-1.3758' />
+ <node id='-39383' lat='43.12815' lon='-1.41562' />
+ <node id='-39385' lat='43.08372' lon='-1.47555' />
+ <node id='-39387' lat='43.02658' lon='-1.35272' />
+ <node id='-39389' lat='43.09665' lon='-1.34419' />
+ <node id='-39391' lat='43.1127' lon='-1.32209' />
+ <node id='-39393' lat='43.06859' lon='-1.30531' />
+ <node id='-39395' lat='42.96916' lon='-0.75478' />
+ <node id='-39397' lat='42.82713' lon='-0.50863' />
+ <node id='-39399' lat='42.80132' lon='-0.38833' />
+ <node id='-39401' lat='42.84788' lon='-0.3122' />
+ <node id='-39403' visible='true' lat='42.78974' lon='-0.17939' />
+ <node id='-39405' visible='true' lat='42.79535' lon='-0.16141' />
+ <node id='-39407' lat='42.68513' lon='-0.02468' />
+ <node id='-39409' lat='42.73424' lon='0.17569' />
+ <node id='-39411' lat='42.7174' lon='0.25336' />
+ <node id='-39413' lat='42.69779' lon='0.40214' />
+ <node id='-39415' lat='42.69458' lon='0.67873' />
+ <node id='-39417' lat='42.84021' lon='0.66121' />
+ <node id='-39419' lat='42.86372' lon='0.711' />
+ <node id='-39421' lat='42.79154' lon='0.93089' />
+ <node id='-39423' lat='42.80629' lon='0.96166' />
+ <node id='-39425' lat='42.78754' lon='0.98292' />
+ <node id='-39427' lat='42.78569' lon='1.0804' />
+ <node id='-39429' lat='42.71407' lon='1.15928' />
+ <node id='-39431' lat='42.71944' lon='1.35562' />
+ <node id='-39433' lat='42.50338' lon='1.72515' />
+ <node id='-39435' lat='42.48863' lon='1.76335' />
+ <node id='-39437' lat='42.48395' lon='1.83037' />
+ <node id='-39439' lat='42.4501' lon='1.88853' />
+ <node id='-39441' lat='42.45386' lon='1.93277' />
+ <node id='-39443' lat='42.44316' lon='1.94292' />
+ <node id='-39445' lat='42.42938' lon='1.9405' />
+ <node id='-39447' lat='42.42401' lon='1.9574' />
+ <node id='-39449' lat='42.37787' lon='1.96482' />
+ <node id='-39451' lat='42.35399' lon='2.00488' />
+ <node id='-39453' lat='42.35906' lon='2.06241' />
+ <node id='-39455' lat='42.38393' lon='2.11621' />
+ <node id='-39457' lat='42.41291' lon='2.12789' />
+ <node id='-39459' lat='42.42314' lon='2.16599' />
+ <node id='-39461' lat='42.41633' lon='2.20578' />
+ <node id='-39463' lat='42.43757' lon='2.25551' />
+ <node id='-39465' lat='42.39977' lon='2.38504' />
+ <node id='-39467' lat='42.39423' lon='2.43299' />
+ <node id='-39469' lat='42.37568' lon='2.43508' />
+ <node id='-39471' lat='42.33933' lon='2.48457' />
+ <node id='-39473' lat='42.33406' lon='2.54382' />
+ <node id='-39475' lat='42.35351' lon='2.55516' />
+ <node id='-39477' lat='42.35808' lon='2.57934' />
+ <node id='-39479' lat='42.33974' lon='2.6747' />
+ <node id='-39481' lat='42.38771' lon='2.65311' />
+ <node id='-39483' lat='42.42298' lon='2.72056' />
+ <node id='-39485' lat='42.42578' lon='2.75497' />
+ <node id='-39487' lat='42.41046' lon='2.77464' />
+ <node id='-39489' lat='42.45724' lon='2.84335' />
+ <node id='-39491' lat='42.45444' lon='2.85675' />
+ <node id='-39493' lat='42.46843' lon='2.86983' />
+ <node id='-39495' lat='42.45938' lon='2.88413' />
+ <node id='-39497' lat='42.4573' lon='2.92107' />
+ <node id='-39499' lat='42.48174' lon='2.94283' />
+ <node id='-39501' lat='42.46692' lon='2.96518' />
+ <node id='-39503' lat='42.47363' lon='3.03734' />
+ <node id='-39505' lat='42.42748' lon='3.08167' />
+ <node id='-39507' lat='42.42621' lon='3.10027' />
+ <node id='-39509' lat='42.43646' lon='3.11379' />
+ <node id='-39511' lat='42.43545' lon='3.17156' />
+ <node id='-39513' lat='36.15272' lon='-5.33822' />
+ <node id='-39515' lat='36.15496' lon='-5.36494' />
+ <node id='-39517' lat='35.92591' lon='-5.38491' />
+ <node id='-39519' lat='35.93752' lon='-5.64962' />
+ <node id='-39521' lat='36.96896' lon='-7.37282' />
+ <node id='-39523' visible='true' lat='37.81193' lon='-7.33441' />
+ <node id='-39525' lat='38.01914' lon='-7.00375' />
+ <node id='-39527' lat='39.66717' lon='-7.54121' />
+ <node id='-39529' lat='39.66877' lon='-7.01613' />
+ <node id='-39531' lat='41.02888' lon='-6.9357' />
+ <node id='-39533' lat='41.57638' lon='-6.19128' />
+ <node id='-39535' lat='41.86488' lon='-8.87157' />
+ <node id='-39537' lat='41.86623' lon='-9.14112' />
+ <node id='-39539' lat='44.17365' lon='-10.14298' />
+ <node id='-39541' lat='59.58538' lon='27.85643' />
+ <node id='-39543' lat='59.47017' lon='28.04187' />
+ <node id='-39545' lat='58.98351' lon='27.74429' />
+ <node id='-39547' lat='58.78381' lon='27.36366' />
+ <node id='-39549' lat='58.39525' lon='27.55489' />
+ <node id='-39551' lat='57.89244' lon='27.81841' />
+ <node id='-39553' lat='57.52242' lon='27.34698' />
+ <node id='-39555' lat='58.0831' lon='25.19484' />
+ <node id='-39557' lat='57.87471' lon='24.3579' />
+ <node id='-39559' lat='57.91787' lon='24.26221' />
+ <node id='-39561' lat='10.98533' lon='42.95776' />
+ <node id='-39563' visible='true' lat='8.93028' lon='44.19222' />
+ <node id='-39565' lat='7.9989' lon='46.99339' />
+ <node id='-39567' lat='4.91821' lon='44.98104' />
+ <node id='-39569' lat='4.9451' lon='44.02436' />
+ <node id='-39571' lat='3.97375' lon='41.89488' />
+ <node id='-39573' lat='3.60445' lon='38.45812' />
+ <node id='-39575' lat='4.44406' lon='36.03924' />
+ <node id='-39577' lat='5.50106' lon='35.31188' />
+ <node id='-39579' lat='9.50238' lon='34.10229' />
+ <node id='-39581' lat='69.69193' lon='29.12697' />
+ <node id='-39583' lat='68.19816' lon='28.62982' />
+ <node id='-39585' lat='68.06655' lon='29.34179' />
+ <node id='-39587' lat='67.67523' lon='30.02041' />
+ <node id='-39589' lat='65.39731' lon='24.14112' />
+ <node id='-39591' visible='true' lat='65.84079' lon='24.16341' />
+ <node id='-39593' lat='69.06069' lon='20.55258' />
+ <node id='-39595' lat='69.11874' lon='20.72171' />
+ <node id='-39597' lat='69.0356' lon='21.05775' />
+ <node id='-39599' lat='69.10291' lon='21.11099' />
+ <node id='-39601' lat='69.18809' lon='20.98641' />
+ <node id='-39603' lat='69.31281' lon='21.27827' />
+ <node id='-39605' lat='-17.28904' lon='162.93363' />
+ <node id='-39607' lat='-22.54607' lon='173.07304' />
+ <node id='-39609' visible='true' lat='5.26909' lon='-54.26916' />
+ <node id='-39611' lat='14.96709' lon='-61.51867' />
+ <node id='-39613' lat='15.22234' lon='-60.69955' />
+ <node id='-39615' lat='15.70997' lon='-60.95725' />
+ <node id='-39617' lat='15.79571' lon='-61.44899' />
+ <node id='-39619' lat='15.58058' lon='-61.81728' />
+ <node id='-39621' lat='16.35721' lon='-62.17275' />
+ <node id='-39623' lat='17.64353' lon='-62.76692' />
+ <node id='-39625' lat='17.79659' lon='-63.07669' />
+ <node id='-39627' lat='18.13489' lon='-62.75637' />
+ <node id='-39629' lat='17.8636' lon='-62.54836' />
+ <node id='-39631' lat='49.53775' lon='5.81664' />
+ <node id='-39633' lat='49.52122' lon='5.8354' />
+ <node id='-39635' lat='49.50034' lon='5.94128' />
+ <node id='-39637' lat='49.45513' lon='5.97693' />
+ <node id='-39639' lat='49.44801' lon='6.04176' />
+ <node id='-39641' lat='49.46663' lon='6.05553' />
+ <node id='-39643' lat='49.46351' lon='6.09845' />
+ <node id='-39645' lat='49.49365' lon='6.12814' />
+ <node id='-39647' lat='49.51408' lon='6.2409' />
+ <node id='-39649' visible='true' lat='47.43824' lon='7.40635' />
+ <node id='-39651' lat='47.49455' lon='7.19583' />
+ <node id='-39653' lat='47.0494' lon='6.71531' />
+ <node id='-39655' lat='46.92703' lon='6.43341' />
+ <node id='-39657' lat='46.80336' lon='6.43216' />
+ <node id='-39659' lat='46.77502' lon='6.45209' />
+ <node id='-39661' lat='44.89915' lon='6.75518' />
+ <node id='-39663' lat='44.43112' lon='6.94504' />
+ <node id='-39665' lat='44.42043' lon='6.88784' />
+ <node id='-39667' lat='44.36637' lon='6.89171' />
+ <node id='-39669' lat='43.99943' lon='7.66848' />
+ <node id='-39671' lat='43.9763' lon='7.65266' />
+ <node id='-39673' lat='43.95772' lon='7.60771' />
+ <node id='-39675' lat='43.94506' lon='7.56858' />
+ <node id='-39677' lat='43.89932' lon='7.56075' />
+ <node id='-39679' lat='43.88301' lon='7.51162' />
+ <node id='-39681' lat='43.86551' lon='7.49355' />
+ <node id='-39683' lat='43.84345' lon='7.50423' />
+ <node id='-39685' lat='43.7432' lon='7.45448' />
+ <node id='-39687' lat='43.72478' lon='7.41813' />
+ <node id='-39689' lat='48.91595' lon='-2.5234' />
+ <node id='-39691' lat='49.91866' lon='-2.02963' />
+ <node id='-39693' lat='50.74239' lon='1.17405' />
+ <node id='-39695' lat='1.23368' lon='13.15519' />
+ <node id='-39697' lat='1.39842' lon='14.25186' />
+ <node id='-39699' lat='0.9152' lon='14.48179' />
+ <node id='-39701' lat='-2.33098' lon='13.02759' />
+ <node id='-39703' lat='-2.33379' lon='11.57637' />
+ <node id='-39705' lat='-3.17465' lon='11.70227' />
+ <node id='-39707' lat='-3.71571' lon='11.87083' />
+ <node id='-39709' lat='-3.94169' lon='11.12647' />
+ <node id='-39711' lat='0.69445' lon='9.00916' />
+ <node id='-39713' lat='0.84865' lon='9.35563' />
+ <node id='-39715' lat='0.96418' lon='9.51998' />
+ <node id='-39717' lat='1.0185' lon='9.54793' />
+ <node id='-39719' lat='1.03039' lon='9.62096' />
+ <node id='-39721' lat='1.05865' lon='9.66092' />
+ <node id='-39723' lat='1.06836' lon='9.68638' />
+ <node id='-39725' lat='1.06721' lon='9.73014' />
+ <node id='-39727' lat='1.05949' lon='9.76085' />
+ <node id='-39729' lat='1.03996' lon='9.78058' />
+ <node id='-39731' lat='1.0019' lon='9.79648' />
+ <node id='-39733' lat='1.00251' lon='11.35307' />
+ <node id='-39735' lat='2.17217' lon='11.3561' />
+ <node id='-39737' lat='2.29975' lon='11.37116' />
+ <node id='-39739' lat='17.02632' lon='-62.14123' />
+ <node id='-39741' lat='31.99084' lon='-64.37503' />
+ <node id='-39743' lat='31.98296' lon='-65.22652' />
+ <node id='-39745' lat='32.66274' lon='-65.23529' />
+ <node id='-39747' lat='32.67056' lon='-64.3838' />
+ <node id='-39749' lat='36.09907' lon='-5.28217' />
+ <node id='-39751' lat='36.05935' lon='-5.32837' />
+ <node id='-39753' lat='36.06205' lon='-5.36503' />
+ <node id='-39755' lat='36.14942' lon='-5.27801' />
+ <node id='-39757' visible='true' lat='55.06933' lon='-7.2471' />
+ <node id='-39759' lat='49.31141' lon='-2.9511' />
+ <node id='-39761' lat='49.7273' lon='-6.81839' />
+ <node id='-39763' lat='55.54107' lon='-6.79943' />
+ <node id='-39765' lat='41.43606' lon='42.51772' />
+ <node id='-39767' lat='41.5216' lon='41.54186' />
+ <node id='-39769' lat='11.14075' lon='-0.13493' />
+ <node id='-39771' lat='11.10811' lon='-0.14462' />
+ <node id='-39773' lat='11.08628' lon='-0.05733' />
+ <node id='-39775' lat='11.11202' lon='-0.0275' />
+ <node id='-39777' lat='11.10763' lon='-0.00514' />
+ <node id='-39779' lat='11.06229' lon='0.02395' />
+ <node id='-39781' lat='10.9807' lon='0.03355' />
+ <node id='-39783' lat='10.96417' lon='-0.0063' />
+ <node id='-39785' lat='10.91644' lon='-0.00908' />
+ <node id='-39787' lat='10.8783' lon='-0.02685' />
+ <node id='-39789' lat='10.81916' lon='-0.0228' />
+ <node id='-39791' lat='10.76794' lon='-0.07183' />
+ <node id='-39793' lat='10.71845' lon='-0.07327' />
+ <node id='-39795' lat='10.7147' lon='-0.09141' />
+ <node id='-39797' lat='6.17069' lon='1.19966' />
+ <node id='-39799' lat='5.93551' lon='1.27574' />
+ <node id='-39801' lat='12.40788' lon='-11.37536' />
+ <node id='-39803' lat='10.17117' lon='-7.97971' />
+ <node id='-39805' lat='8.48711' lon='-10.27575' />
+ <node id='-39807' lat='9.99763' lon='-11.89624' />
+ <node id='-39809' lat='9.92386' lon='-12.24262' />
+ <node id='-39811' lat='9.04245' lon='-13.29911' />
+ <node id='-39813' lat='8.64107' lon='-14.36218' />
+ <node id='-39815' lat='10.162' lon='-15.96748' />
+ <node id='-39817' lat='10.89557' lon='-15.07174' />
+ <node id='-39819' lat='13.57989' lon='-15.14917' />
+ <node id='-39821' lat='13.37768' lon='-15.26908' />
+ <node id='-39823' lat='13.34832' lon='-15.80478' />
+ <node id='-39825' lat='13.16729' lon='-15.80355' />
+ <node id='-39827' lat='13.16791' lon='-16.69343' />
+ <node id='-39829' lat='13.06025' lon='-16.74676' />
+ <node id='-39831' lat='13.59273' lon='-17.43598' />
+ <node id='-39833' lat='13.58758' lon='-15.47902' />
+ <node id='-39835' lat='13.79313' lon='-15.36504' />
+ <node id='-39837' lat='11.60713' lon='-14.31513' />
+ <node id='-39839' lat='11.49708' lon='-14.51173' />
+ <node id='-39841' lat='11.51188' lon='-14.66677' />
+ <node id='-39843' visible='true' lat='12.34803' lon='-16.70562' />
+ <node id='-39845' lat='12.6847' lon='-15.17582' />
+ <node id='-39847' lat='12.68013' lon='-13.70523' />
+ <node id='-39849' lat='2.44901' lon='9.6225' />
+ <node id='-39851' lat='2.32428' lon='9.83754' />
+ <node id='-39853' visible='true' lat='2.20457' lon='9.89012' />
+ <node id='-39855' visible='true' lat='2.20049' lon='9.90749' />
+ <node id='-39857' lat='41.70996' lon='26.36799' />
+ <node id='-39859' lat='39.6504' lon='19.98042' />
+ <node id='-39861' lat='41.34104' lon='22.93334' />
+ <node id='-39863' lat='17.81563' lon='-89.14985' />
+ <node id='-39865' lat='15.88619' lon='-89.22683' />
+ <node id='-39867' lat='16.03858' lon='-88.20359' />
+ <node id='-39869' lat='16.07371' lon='-91.73182' />
+ <node id='-39871' lat='16.07573' lon='-90.44567' />
+ <node id='-39873' lat='6.73257' lon='-56.84822' />
+ <node id='-39875' lat='4.89394' lon='-57.8699' />
+ <node id='-39877' lat='3.32121' lon='-57.35891' />
+ <node id='-39879' lat='5.95304' lon='-61.4041' />
+ <node id='-39881' visible='true' lat='6.8631' lon='-60.54873' />
+ <node id='-39883' visible='true' lat='6.94847' lon='-60.39419' />
+ <node id='-39885' visible='true' lat='8.35213' lon='-59.85562' />
+ <node id='-39887' lat='8.53046' lon='-59.98508' />
+ <node id='-39889' lat='17.73736' lon='-83.86109' />
+ <node id='-39891' lat='15.03256' lon='-83.04763' />
+ <node id='-39893' lat='15.00002' lon='-83.13724' />
+ <node id='-39895' visible='true' lat='14.11304' lon='-85.45762' />
+ <node id='-39897' lat='12.98646' lon='-87.37107' />
+ <node id='-39899' lat='13.25228' lon='-87.69751' />
+ <node id='-39901' lat='13.32715' lon='-87.73714' />
+ <node id='-39903' visible='true' lat='13.44169' lon='-87.73841' />
+ <node id='-39905' visible='true' lat='13.46083' lon='-87.72115' />
+ <node id='-39907' lat='14.43013' lon='-89.34776' />
+ <node id='-39909' visible='true' lat='15.14039' lon='-88.97343' />
+ <node id='-39911' lat='15.72294' lon='-88.22552' />
+ <node id='-39913' lat='46.28122' lon='16.8903' />
+ <node id='-39915' lat='45.909' lon='18.81394' />
+ <node id='-39917' lat='45.57253' lon='18.88776' />
+ <node id='-39919' lat='45.302' lon='19.10225' />
+ <node id='-39921' lat='45.01191' lon='19.1011' />
+ <node id='-39923' lat='42.92787' lon='17.5392' />
+ <node id='-39925' lat='42.88641' lon='17.6444' />
+ <node id='-39927' lat='45.4895' lon='13.56979' />
+ <node id='-39929' visible='true' lat='45.45898' lon='13.62902' />
+ <node id='-39931' lat='46.37837' lon='16.30233' />
+ <node id='-39933' lat='48.34628' lon='21.72525' />
+ <node id='-39935' lat='48.4005' lon='22.14689' />
+ <node id='-39937' lat='47.95851' lon='22.89849' />
+ <node id='-39939' lat='46.50693' lon='21.25586' />
+ <node id='-39941' lat='46.14405' lon='20.45377' />
+ <node id='-39943' visible='true' lat='46.1438' lon='20.28324' />
+ <node id='-39945' lat='46.12332' lon='20.26068' />
+ <node id='-39947' lat='46.04015' lon='19.10388' />
+ <node id='-39949' lat='45.84207' lon='17.66545' />
+ <node id='-39951' lat='46.4717' lon='16.60403' />
+ <node id='-39953' lat='46.53303' lon='16.52885' />
+ <node id='-39955' lat='46.56684' lon='16.50139' />
+ <node id='-39957' lat='48.53336' lon='20.5215' />
+ <node id='-39959' lat='48.5824' lon='20.83248' />
+ <node id='-39961' lat='-9.46406' lon='125.09025' />
+ <node id='-39963' lat='-9.41206' lon='124.10539' />
+ <node id='-39965' lat='-9.48493' lon='124.3535' />
+ <node id='-39967' lat='-9.13002' lon='124.46701' />
+ <node id='-39969' lat='-8.85617' lon='124.94011' />
+ <node id='-39971' lat='-9.08128' lon='124.97742' />
+ <node id='-39973' lat='0.68547' lon='141.00167' />
+ <node id='-39975' visible='true' lat='1.94859' lon='109.57443' />
+ <node id='-39977' visible='true' lat='1.91771' lon='109.53794' />
+ <node id='-39979' lat='26.36205' lon='88.01271' />
+ <node id='-39981' lat='27.62149' lon='96.90112' />
+ <node id='-39983' lat='27.45752' lon='96.91431' />
+ <node id='-39985' visible='true' lat='27.29818' lon='96.40779' />
+ <node id='-39987' lat='26.65372' lon='95.30339' />
+ <node id='-39989' lat='26.07338' lon='95.18556' />
+ <node id='-39991' lat='25.93214' lon='95.02858' />
+ <node id='-39993' lat='24.56656' lon='94.45279' />
+ <node id='-39995' lat='23.83333' lon='94.14081' />
+ <node id='-39997' lat='24.0003' lon='93.75952' />
+ <node id='-39999' lat='24.00922' lon='93.62871' />
+ <node id='-40001' lat='24.10151' lon='93.34735' />
+ <node id='-40003' lat='23.38828' lon='93.39981' />
+ <node id='-40005' lat='23.35356' lon='93.3633' />
+ <node id='-40007' lat='21.77397' lon='89.03553' />
+ <node id='-40009' lat='21.42955' lon='89.13606' />
+ <node id='-40011' visible='true' lat='9.159' lon='79.45362' />
+ <node id='-40013' lat='7.85769' lon='77.66782' />
+ <node id='-40015' visible='true' lat='23.13052' lon='68.69125' />
+ <node id='-40017' visible='true' lat='23.15424' lon='68.66066' />
+ <node id='-40019' visible='true' lat='23.15778' lon='68.65406' />
+ <node id='-40021' visible='true' lat='23.16205' lon='68.65065' />
+ <node id='-40023' visible='true' lat='23.17145' lon='68.65113' />
+ <node id='-40025' visible='true' lat='23.18085' lon='68.64967' />
+ <node id='-40027' visible='true' lat='23.19156' lon='68.62257' />
+ <node id='-40029' visible='true' lat='23.20677' lon='68.60914' />
+ <node id='-40031' visible='true' lat='23.22504' lon='68.59995' />
+ <node id='-40033' visible='true' lat='23.24038' lon='68.59571' />
+ <node id='-40035' visible='true' lat='23.23697' lon='68.59832' />
+ <node id='-40037' visible='true' lat='23.22671' lon='68.60939' />
+ <node id='-40039' visible='true' lat='23.24543' lon='68.62013' />
+ <node id='-40041' visible='true' lat='23.25617' lon='68.62322' />
+ <node id='-40043' visible='true' lat='23.26765' lon='68.62306' />
+ <node id='-40045' visible='true' lat='23.25959' lon='68.60532' />
+ <node id='-40047' visible='true' lat='23.25528' lon='68.57781' />
+ <node id='-40049' visible='true' lat='23.25971' lon='68.55226' />
+ <node id='-40051' visible='true' lat='23.27823' lon='68.54103' />
+ <node id='-40053' visible='true' lat='23.31611' lon='68.56105' />
+ <node id='-40055' visible='true' lat='23.31843' lon='68.56853' />
+ <node id='-40057' visible='true' lat='23.32225' lon='68.59913' />
+ <node id='-40059' visible='true' lat='23.32559' lon='68.60694' />
+ <node id='-40061' visible='true' lat='23.33283' lon='68.60304' />
+ <node id='-40063' visible='true' lat='23.34007' lon='68.59205' />
+ <node id='-40065' visible='true' lat='23.34341' lon='68.57838' />
+ <node id='-40067' visible='true' lat='23.34638' lon='68.57106' />
+ <node id='-40069' visible='true' lat='23.35297' lon='68.56666' />
+ <node id='-40071' visible='true' lat='23.35993' lon='68.56373' />
+ <node id='-40073' visible='true' lat='23.36392' lon='68.56105' />
+ <node id='-40075' visible='true' lat='23.36396' lon='68.55519' />
+ <node id='-40077' visible='true' lat='23.36152' lon='68.54851' />
+ <node id='-40079' visible='true' lat='23.35859' lon='68.54314' />
+ <node id='-40081' visible='true' lat='23.357' lon='68.54103' />
+ <node id='-40083' visible='true' lat='23.3631' lon='68.52947' />
+ <node id='-40085' visible='true' lat='23.36921' lon='68.52068' />
+ <node id='-40087' visible='true' lat='23.37702' lon='68.51515' />
+ <node id='-40089' lat='23.53945' lon='68.11329' />
+ <node id='-40091' lat='23.85849' lon='68.20763' />
+ <node id='-40093' lat='23.94592' lon='68.37871' />
+ <node id='-40095' lat='23.96838' lon='68.39339' />
+ <node id='-40097' lat='23.97027' lon='68.74643' />
+ <node id='-40099' lat='24.17007' lon='69.73335' />
+ <node id='-40101' lat='24.172' lon='70.03428' />
+ <node id='-40103' lat='24.30915' lon='70.11712' />
+ <node id='-40105' lat='24.92843' lon='70.94002' />
+ <node id='-40107' lat='25.15064' lon='70.89148' />
+ <node id='-40109' lat='25.93238' lon='70.0985' />
+ <node id='-40111' lat='26.74892' lon='69.50904' />
+ <node id='-40113' lat='26.80555' lon='69.4846' />
+ <node id='-40115' lat='27.00849' lon='69.51444' />
+ <node id='-40117' lat='27.18109' lon='69.58519' />
+ <node id='-40119' lat='27.56627' lon='70.03136' />
+ <node id='-40121' lat='27.8057' lon='70.12502' />
+ <node id='-40123' lat='27.83227' lon='70.68155' />
+ <node id='-40125' lat='27.71829' lon='70.75626' />
+ <node id='-40127' lat='27.96035' lon='71.89921' />
+ <node id='-40129' lat='28.11555' lon='71.9244' />
+ <node id='-40131' lat='28.22326' lon='72.0033' />
+ <node id='-40133' lat='28.3869' lon='72.20329' />
+ <node id='-40135' lat='28.66367' lon='72.29495' />
+ <node id='-40137' lat='28.78283' lon='72.40402' />
+ <node id='-40139' lat='29.02487' lon='72.94272' />
+ <node id='-40141' lat='29.16422' lon='73.01337' />
+ <node id='-40143' lat='29.1878' lon='73.05886' />
+ <node id='-40145' lat='29.56646' lon='73.28094' />
+ <node id='-40147' lat='29.94707' lon='73.3962' />
+ <node id='-40149' lat='30.01848' lon='73.58665' />
+ <node id='-40151' lat='30.06969' lon='73.80299' />
+ <node id='-40153' lat='30.19829' lon='73.97225' />
+ <node id='-40155' lat='30.36305' lon='73.88993' />
+ <node id='-40157' lat='31.04153' lon='74.5616' />
+ <node id='-40159' visible='true' lat='31.30321' lon='74.53223' />
+ <node id='-40161' lat='31.45605' lon='74.64713' />
+ <node id='-40163' lat='31.72227' lon='74.47771' />
+ <node id='-40165' lat='32.26836' lon='75.38046' />
+ <node id='-40167' lat='32.48835' lon='74.68723' />
+ <node id='-40169' lat='32.60985' lon='74.64424' />
+ <node id='-40171' lat='32.66792' lon='74.69542' />
+ <node id='-40173' lat='32.71225' lon='74.65345' />
+ <node id='-40175' lat='33.18908' lon='74.02144' />
+ <node id='-40177' lat='33.56392' lon='74.10115' />
+ <node id='-40179' lat='33.56718' lon='74.03576' />
+ <node id='-40181' lat='33.64061' lon='73.97367' />
+ <node id='-40183' lat='34.70073' lon='74.12897' />
+ <node id='-40185' lat='34.79626' lon='74.31239' />
+ <node id='-40187' lat='34.703' lon='74.6663' />
+ <node id='-40189' lat='34.51827' lon='75.75438' />
+ <node id='-40191' lat='34.96906' lon='76.87193' />
+ <node id='-40193' lat='34.93349' lon='76.99251' />
+ <node id='-40195' lat='35.05419' lon='77.11796' />
+ <node id='-40197' lat='54.09785' lon='-6.26218' />
+ <node id='-40199' lat='37.3464' lon='53.89734' />
+ <node id='-40201' lat='37.32047' lon='54.24565' />
+ <node id='-40203' lat='37.45809' lon='54.58664' />
+ <node id='-40205' lat='37.94705' lon='55.13412' />
+ <node id='-40207' lat='37.98546' lon='57.35042' />
+ <node id='-40209' lat='37.77281' lon='58.21399' />
+ <node id='-40211' lat='37.6856' lon='58.22999' />
+ <node id='-40213' lat='37.53146' lon='59.33507' />
+ <node id='-40215' lat='37.04102' lon='60.00768' />
+ <node id='-40217' lat='36.63214' lon='60.34767' />
+ <node id='-40219' lat='36.64644' lon='61.14516' />
+ <node id='-40221' lat='35.27845' lon='61.0991' />
+ <node id='-40223' lat='34.52857' lon='60.72316' />
+ <node id='-40225' lat='33.73365' lon='60.5025' />
+ <node id='-40227' lat='33.50219' lon='60.88908' />
+ <node id='-40229' lat='33.12944' lon='60.56485' />
+ <node id='-40231' lat='32.03417' lon='60.7991' />
+ <node id='-40233' lat='30.84224' lon='61.80829' />
+ <node id='-40235' lat='29.00507' lon='61.53765' />
+ <node id='-40237' lat='28.42703' lon='62.40259' />
+ <node id='-40239' lat='28.02992' lon='62.7638' />
+ <node id='-40241' lat='27.34381' lon='62.79684' />
+ <node id='-40243' lat='27.22412' lon='62.80604' />
+ <node id='-40245' lat='26.65072' lon='63.1889' />
+ <node id='-40247' lat='26.26601' lon='62.21304' />
+ <node id='-40249' lat='26.26251' lon='61.89391' />
+ <node id='-40251' lat='25.66638' lon='61.683' />
+ <node id='-40253' lat='25.0492' lon='61.57592' />
+ <node id='-40255' lat='24.57287' lon='61.5251' />
+ <node id='-40257' lat='25.03856' lon='56.86325' />
+ <node id='-40259' lat='25.68383' lon='54.39838' />
+ <node id='-40261' lat='27.95295' lon='50.51185' />
+ <node id='-40263' lat='29.78572' lon='48.83867' />
+ <node id='-40265' lat='30.04456' lon='48.4494' />
+ <node id='-40267' lat='37.1431' lon='44.78319' />
+ <node id='-40269' lat='39.19842' lon='44.1043' />
+ <node id='-40271' lat='39.68788' lon='44.47298' />
+ <node id='-40273' lat='37.38615' lon='42.78887' />
+ <node id='-40275' visible='true' lat='37.32015' lon='42.93705' />
+ <node id='-40277' lat='29.66815' lon='48.59531' />
+ <node id='-40279' lat='30.02906' lon='48.06782' />
+ <node id='-40281' lat='29.98906' lon='48.01114' />
+ <node id='-40283' lat='30.10453' lon='47.7095' />
+ <node id='-40285' lat='30.10421' lon='47.37192' />
+ <node id='-40287' lat='29.10283' lon='46.5527' />
+ <node id='-40289' lat='29.05947' lon='46.42415' />
+ <node id='-40291' lat='29.19736' lon='44.72255' />
+ <node id='-40293' lat='30.72204' lon='42.97601' />
+ <node id='-40295' lat='32.05667' lon='40.01521' />
+ <node id='-40297' lat='32.23259' lon='39.29903' />
+ <node id='-40299' lat='34.31604' lon='40.64314' />
+ <node id='-40301' lat='34.39788' lon='40.97676' />
+ <node id='-40303' lat='34.65742' lon='41.12388' />
+ <node id='-40305' lat='35.1508' lon='41.21654' />
+ <node id='-40307' lat='35.42708' lon='41.26569' />
+ <node id='-40309' lat='35.62502' lon='41.38184' />
+ <node id='-40311' lat='35.84095' lon='41.37027' />
+ <node id='-40313' lat='36.06012' lon='41.2564' />
+ <node id='-40315' lat='36.35368' lon='41.28864' />
+ <node id='-40317' lat='36.52502' lon='41.40058' />
+ <node id='-40319' lat='36.58782' lon='41.81736' />
+ <node id='-40321' lat='37.0627' lon='42.36697' />
+ <node id='-40323' visible='true' lat='37.10998' lon='42.35724' />
+ <node id='-40325' lat='37.14878' lon='42.56725' />
+ <node id='-40327' lat='33.1031' lon='35.84802' />
+ <node id='-40329' visible='true' lat='31.76535' lon='35.55941' />
+ <node id='-40331' lat='31.82938' lon='33.62659' />
+ <node id='-40333' lat='33.09318' lon='35.10645' />
+ <node id='-40335' lat='33.3172' lon='35.813' />
+ <node id='-40337' lat='46.5222' lon='13.7148' />
+ <node id='-40339' lat='46.13587' lon='13.64053' />
+ <node id='-40341' lat='46.00546' lon='13.47474' />
+ <node id='-40343' lat='45.89803' lon='13.60913' />
+ <node id='-40345' lat='45.6322' lon='13.9191' />
+ <node id='-40347' lat='45.5825' lon='13.78445' />
+ <node id='-40349' lat='45.92435' lon='7.04151' />
+ <node id='-40351' lat='45.99867' lon='7.98881' />
+ <node id='-40353' visible='true' lat='46.35071' lon='9.73086' />
+ <node id='-40355' lat='46.44479' lon='10.03715' />
+ <node id='-40357' lat='46.53164' lon='10.46136' />
+ <node id='-40359' lat='17.08879' lon='-75.50728' />
+ <node id='-40361' lat='16.57862' lon='-78.34606' />
+ <node id='-40363' lat='18.78765' lon='-78.75694' />
+ <node id='-40365' lat='18.86145' lon='-76.34192' />
+ <node id='-40367' lat='32.30203' lon='39.04251' />
+ <node id='-40369' lat='32.35555' lon='39.26157' />
+ <node id='-40371' lat='30.49998' lon='37.99354' />
+ <node id='-40373' lat='29.49696' lon='36.50005' />
+ <node id='-40375' lat='29.37455' lon='34.88293' />
+ <node id='-40377' lat='29.45305' lon='34.92298' />
+ <node id='-40379' visible='true' lat='32.74428' lon='35.75743' />
+ <node id='-40381' lat='32.31293' lon='36.83946' />
+ <node id='-40383' lat='33.37328' lon='38.79171' />
+ <node id='-40385' lat='32.50304' lon='39.08202' />
+ <node id='-40387' lat='32.47694' lon='38.98762' />
+ <node id='-40389' lat='55.38148' lon='68.90865' />
+ <node id='-40391' lat='55.35545' lon='69.74917' />
+ <node id='-40393' lat='55.10558' lon='70.96009' />
+ <node id='-40395' lat='53.80831' lon='75.07405' />
+ <node id='-40397' lat='53.98652' lon='75.43398' />
+ <node id='-40399' lat='54.16017' lon='76.44076' />
+ <node id='-40401' lat='53.99329' lon='76.54243' />
+ <node id='-40403' lat='49.25142' lon='87.03071' />
+ <node id='-40405' lat='49.23603' lon='87.31465' />
+ <node id='-40407' lat='42.50147' lon='70.97717' />
+ <node id='-40409' lat='42.26238' lon='70.94483' />
+ <node id='-40411' lat='41.03019' lon='68.62221' />
+ <node id='-40413' lat='42.85481' lon='65.85194' />
+ <node id='-40415' lat='45.58671' lon='58.59711' />
+ <node id='-40417' visible='true' lat='44.99622' lon='55.97842' />
+ <node id='-40419' visible='true' lat='44.99622' lon='55.97832' />
+ <node id='-40421' visible='true' lat='44.99617' lon='55.97822' />
+ <node id='-40423' visible='true' lat='44.99617' lon='55.97811' />
+ <node id='-40425' visible='true' lat='44.99612' lon='55.97801' />
+ <node id='-40427' visible='true' lat='44.99607' lon='55.97801' />
+ <node id='-40429' visible='true' lat='44.99607' lon='55.97791' />
+ <node id='-40431' visible='true' lat='44.99607' lon='55.9778' />
+ <node id='-40433' visible='true' lat='44.99601' lon='55.9777' />
+ <node id='-40435' visible='true' lat='44.99596' lon='55.9777' />
+ <node id='-40437' visible='true' lat='44.99591' lon='55.9776' />
+ <node id='-40439' visible='true' lat='44.99591' lon='55.97749' />
+ <node id='-40441' visible='true' lat='44.99591' lon='55.97739' />
+ <node id='-40443' visible='true' lat='44.99586' lon='55.97739' />
+ <node id='-40445' visible='true' lat='44.99586' lon='55.97729' />
+ <node id='-40447' visible='true' lat='44.99581' lon='55.97718' />
+ <node id='-40449' visible='true' lat='44.99576' lon='55.97708' />
+ <node id='-40451' visible='true' lat='44.9957' lon='55.97698' />
+ <node id='-40453' visible='true' lat='44.99565' lon='55.97698' />
+ <node id='-40455' visible='true' lat='44.9956' lon='55.97687' />
+ <node id='-40457' visible='true' lat='44.9956' lon='55.97677' />
+ <node id='-40459' visible='true' lat='44.99555' lon='55.97677' />
+ <node id='-40461' visible='true' lat='44.9955' lon='55.97677' />
+ <node id='-40463' visible='true' lat='44.99545' lon='55.97667' />
+ <node id='-40465' visible='true' lat='44.99539' lon='55.97656' />
+ <node id='-40467' visible='true' lat='44.99534' lon='55.97646' />
+ <node id='-40469' visible='true' lat='44.99529' lon='55.97646' />
+ <node id='-40471' visible='true' lat='44.99524' lon='55.97636' />
+ <node id='-40473' visible='true' lat='44.99519' lon='55.97636' />
+ <node id='-40475' visible='true' lat='44.99514' lon='55.97625' />
+ <node id='-40477' visible='true' lat='44.99508' lon='55.97615' />
+ <node id='-40479' visible='true' lat='44.99503' lon='55.97615' />
+ <node id='-40481' visible='true' lat='44.99498' lon='55.97615' />
+ <node id='-40483' visible='true' lat='44.99493' lon='55.97615' />
+ <node id='-40485' visible='true' lat='44.99483' lon='55.97615' />
+ <node id='-40487' visible='true' lat='44.99477' lon='55.97615' />
+ <node id='-40489' visible='true' lat='44.99477' lon='55.97605' />
+ <node id='-40491' visible='true' lat='44.99467' lon='55.97605' />
+ <node id='-40493' visible='true' lat='44.99462' lon='55.97605' />
+ <node id='-40495' visible='true' lat='44.99457' lon='55.97605' />
+ <node id='-40497' visible='true' lat='44.99452' lon='55.97605' />
+ <node id='-40499' visible='true' lat='44.99446' lon='55.97594' />
+ <node id='-40501' visible='true' lat='44.99441' lon='55.97584' />
+ <node id='-40503' visible='true' lat='44.99436' lon='55.97584' />
+ <node id='-40505' visible='true' lat='44.99431' lon='55.97584' />
+ <node id='-40507' visible='true' lat='44.99426' lon='55.97584' />
+ <node id='-40509' visible='true' lat='44.99421' lon='55.97584' />
+ <node id='-40511' visible='true' lat='44.99415' lon='55.97584' />
+ <node id='-40513' visible='true' lat='44.99405' lon='55.97584' />
+ <node id='-40515' visible='true' lat='44.994' lon='55.97584' />
+ <node id='-40517' visible='true' lat='44.9939' lon='55.97584' />
+ <node id='-40519' visible='true' lat='44.99384' lon='55.97584' />
+ <node id='-40521' visible='true' lat='44.99374' lon='55.97584' />
+ <node id='-40523' visible='true' lat='44.99369' lon='55.97584' />
+ <node id='-40525' visible='true' lat='44.99359' lon='55.97584' />
+ <node id='-40527' visible='true' lat='44.99353' lon='55.97584' />
+ <node id='-40529' visible='true' lat='44.99348' lon='55.97584' />
+ <node id='-40531' visible='true' lat='44.99343' lon='55.97584' />
+ <node id='-40533' visible='true' lat='44.99338' lon='55.97584' />
+ <node id='-40535' visible='true' lat='44.99328' lon='55.97584' />
+ <node id='-40537' visible='true' lat='44.99322' lon='55.97584' />
+ <node id='-40539' lat='41.32584' lon='56.00314' />
+ <node id='-40541' visible='true' lat='41.78034' lon='52.47884' />
+ <node id='-40543' lat='41.69249' lon='52.26048' />
+ <node id='-40545' lat='46.04554' lon='49.88945' />
+ <node id='-40547' lat='46.26944' lon='49.32259' />
+ <node id='-40549' lat='47.40818' lon='48.45173' />
+ <node id='-40551' lat='47.76559' lon='47.64973' />
+ <node id='-40553' lat='48.43019' lon='46.49011' />
+ <node id='-40555' lat='48.95352' lon='46.78392' />
+ <node id='-40557' lat='49.34026' lon='46.78398' />
+ <node id='-40559' lat='49.86707' lon='46.9078' />
+ <node id='-40561' lat='50.09242' lon='48.10044' />
+ <node id='-40563' lat='49.89546' lon='48.68352' />
+ <node id='-40565' lat='51.4936' lon='53.3669' />
+ <node id='-40567' lat='50.54508' lon='55.67774' />
+ <node id='-40569' lat='50.70852' lon='58.87974' />
+ <node id='-40571' lat='50.67705' lon='60.31914' />
+ <node id='-40573' lat='50.6629' lon='60.81833' />
+ <node id='-40575' lat='50.80679' lon='61.4431' />
+ <node id='-40577' lat='52.92217' lon='61.05842' />
+ <node id='-40579' lat='53.94768' lon='62.03913' />
+ <node id='-40581' lat='54.27079' lon='63.80604' />
+ <node id='-40583' lat='54.20013' lon='63.91224' />
+ <node id='-40585' lat='54.4212' lon='64.97216' />
+ <node id='-40587' lat='54.33028' lon='65.11033' />
+ <node id='-40589' lat='54.35721' lon='65.24663' />
+ <node id='-40591' lat='54.55216' lon='65.20174' />
+ <node id='-40593' lat='54.98645' lon='68.21308' />
+ <node id='-40595' lat='4.61933' lon='35.9419' />
+ <node id='-40597' lat='4.44518' lon='36.84474' />
+ <node id='-40599' lat='3.62487' lon='38.14168' />
+ <node id='-40601' lat='3.14314' lon='41.31368' />
+ <node id='-40603' lat='2.82959' lon='40.98767' />
+ <node id='-40605' lat='-0.83068' lon='41.00099' />
+ <node id='-40607' lat='-1.59812' lon='41.56' />
+ <node id='-40609' lat='-1.66375' lon='41.56362' />
+ <node id='-40611' lat='-1.85308' lon='41.75542' />
+ <node id='-40613' lat='-4.93877' lon='39.44306' />
+ <node id='-40615' lat='-3.69179' lon='37.81321' />
+ <node id='-40617' lat='-3.304' lon='37.71745' />
+ <node id='-40619' lat='-3.06222' lon='37.67199' />
+ <node id='-40621' lat='-0.99298' lon='33.93107' />
+ <node id='-40623' lat='4.72162' lon='34.47601' />
+ <node id='-40625' lat='42.44778' lon='79.52921' />
+ <node id='-40627' lat='42.42816' lon='79.97364' />
+ <node id='-40629' lat='42.03211' lon='80.17842' />
+ <node id='-40631' lat='41.39603' lon='78.3732' />
+ <node id='-40633' lat='40.09742' lon='74.35063' />
+ <node id='-40635' lat='39.75073' lon='73.9051' />
+ <node id='-40637' lat='39.39696' lon='72.62027' />
+ <node id='-40639' lat='39.44056' lon='71.62688' />
+ <node id='-40641' lat='39.8127' lon='69.26938' />
+ <node id='-40643' lat='39.93991' lon='69.53615' />
+ <node id='-40645' lat='40.03277' lon='69.5057' />
+ <node id='-40647' lat='40.11125' lon='69.67688' />
+ <node id='-40649' lat='39.9878' lon='70.65946' />
+ <node id='-40651' lat='40.0981' lon='70.65827' />
+ <node id='-40653' lat='40.79122' lon='73.13412' />
+ <node id='-40655' lat='41.5455' lon='70.17682' />
+ <node id='-40657' lat='42.28356' lon='71.13263' />
+ <node id='-40659' visible='true' lat='42.97583' lon='74.86285' />
+ <node id='-40661' lat='39.89808' lon='71.04979' />
+ <node id='-40663' lat='40.1771' lon='71.06305' />
+ <node id='-40665' lat='39.98598' lon='71.86463' />
+ <node id='-40667' lat='39.93701' lon='71.7504' />
+ <node id='-40669' lat='39.77923' lon='70.63105' />
+ <node id='-40671' lat='11.55953' lon='105.87328' />
+ <node id='-40673' lat='10.89839' lon='105.86376' />
+ <node id='-40675' lat='11.03671' lon='105.77751' />
+ <node id='-40677' lat='10.4057' lon='104.49869' />
+ <node id='-40679' lat='10.43046' lon='104.47963' />
+ <node id='-40681' lat='10.42386' lon='104.43778' />
+ <node id='-40683' lat='11.25257' lon='102.52395' />
+ <node id='-40685' lat='11.6563' lon='102.91338' />
+ <node id='-40687' lat='14.34967' lon='105.20894' />
+ <node id='-40689' lat='17.23125' lon='-63.11114' />
+ <node id='-40691' lat='37.70512' lon='126.13074' />
+ <node id='-40693' lat='37.80873' lon='126.46818' />
+ <node id='-40695' lat='37.92576' lon='126.68191' />
+ <node id='-40697' visible='true' lat='38.30722' lon='127.15749' />
+ <node id='-40699' lat='38.33227' lon='127.38727' />
+ <node id='-40701' lat='38.30647' lon='127.49672' />
+ <node id='-40703' lat='38.32257' lon='127.55013' />
+ <node id='-40705' lat='38.31861' lon='128.02917' />
+ <node id='-40707' lat='38.41657' lon='128.27652' />
+ <node id='-40709' lat='38.58462' lon='128.31105' />
+ <node id='-40711' lat='28.81495' lon='49.00421' />
+ <node id='-40713' lat='28.53628' lon='48.42991' />
+ <node id='-40715' lat='28.5221' lon='47.70561' />
+ <node id='-40717' lat='29.0014' lon='47.46202' />
+ <node id='-40719' lat='30.02448' lon='48.17332' />
+ <node id='-40721' lat='22.43372' lon='102.1245' />
+ <node id='-40723' lat='22.40092' lon='102.14099' />
+ <node id='-40725' lat='14.69092' lon='107.54361' />
+ <node id='-40727' lat='20.36369' lon='100.08439' />
+ <node id='-40729' lat='21.17254' lon='101.29326' />
+ <node id='-40731' lat='21.25668' lon='101.54563' />
+ <node id='-40733' lat='33.33609' lon='35.77477' />
+ <node id='-40735' lat='33.19865' lon='35.54228' />
+ <node id='-40737' lat='33.20368' lon='34.78515' />
+ <node id='-40739' lat='34.70851' lon='35.48515' />
+ <node id='-40741' lat='34.63322' lon='35.97386' />
+ <node id='-40743' lat='3.7105' lon='-7.52774' />
+ <node id='-40745' lat='6.15992' lon='-12.15048' />
+ <node id='-40747' lat='7.7739' lon='-10.60422' />
+ <node id='-40749' lat='31.9359' lon='25.63787' />
+ <node id='-40751' lat='21.99535' lon='24.99885' />
+ <node id='-40753' lat='23.49639' lon='15.99566' />
+ <node id='-40755' lat='23.00539' lon='14.99751' />
+ <node id='-40757' lat='22.61719' lon='14.22918' />
+ <node id='-40759' lat='23.16574' lon='13.5631' />
+ <node id='-40761' lat='30.34366' lon='9.76848' />
+ <node id='-40763' lat='30.34074' lon='9.88152' />
+ <node id='-40765' lat='30.90337' lon='10.29516' />
+ <node id='-40767' lat='31.42098' lon='10.12239' />
+ <node id='-40769' lat='33.1409' lon='11.55852' />
+ <node id='-40771' lat='14.23076' lon='-60.5958' />
+ <node id='-40773' lat='13.41452' lon='-60.70539' />
+ <node id='-40775' lat='14.25664' lon='-61.26561' />
+ <node id='-40777' visible='true' lat='-29.45598' lon='29.33204' />
+ <node id='-40779' lat='-30.68072' lon='28.12073' />
+ <node id='-40781' lat='-29.65439' lon='27.01016' />
+ <node id='-40783' lat='53.95052' lon='23.51284' />
+ <node id='-40785' lat='55.18507' lon='21.51095' />
+ <node id='-40787' visible='true' lat='55.21115' lon='21.46766' />
+ <node id='-40789' lat='55.29348' lon='21.38446' />
+ <node id='-40791' lat='55.28427' lon='21.35465' />
+ <node id='-40793' lat='55.24456' lon='21.26425' />
+ <node id='-40795' lat='56.42472' lon='22.10003' />
+ <node id='-40797' lat='50.12964' lon='6.1379' />
+ <node id='-40799' lat='50.09171' lon='6.12055' />
+ <node id='-40801' lat='50.01466' lon='6.13794' />
+ <node id='-40803' lat='50.01056' lon='6.13806' />
+ <node id='-40805' lat='50.00908' lon='6.14948' />
+ <node id='-40807' lat='49.9537' lon='6.17872' />
+ <node id='-40809' lat='49.95622' lon='6.18554' />
+ <node id='-40811' lat='49.95053' lon='6.19856' />
+ <node id='-40813' lat='49.83785' lon='6.33585' />
+ <node id='-40815' lat='49.82263' lon='6.47111' />
+ <node id='-40817' lat='49.81338' lon='6.52121' />
+ <node id='-40819' lat='49.58886' lon='6.37464' />
+ <node id='-40821' lat='49.57813' lon='6.36676' />
+ <node id='-40823' lat='49.52931' lon='6.35666' />
+ <node id='-40825' lat='49.50377' lon='6.36788' />
+ <node id='-40827' lat='49.46937' lon='6.36778' />
+ <node id='-40829' lat='49.4593' lon='6.3687' />
+ <node id='-40831' lat='49.45268' lon='6.10072' />
+ <node id='-40833' lat='49.46399' lon='6.07887' />
+ <node id='-40835' lat='49.4909' lon='5.9716' />
+ <node id='-40837' lat='49.50015' lon='5.86571' />
+ <node id='-40839' lat='49.5425' lon='5.80871' />
+ <node id='-40841' lat='49.54777' lon='5.81838' />
+ <node id='-40843' lat='49.55663' lon='5.84692' />
+ <node id='-40845' lat='49.57539' lon='5.87256' />
+ <node id='-40847' lat='49.58674' lon='5.84971' />
+ <node id='-40849' lat='49.5969' lon='5.84826' />
+ <node id='-40851' lat='49.62047' lon='5.87609' />
+ <node id='-40853' lat='49.63853' lon='5.90599' />
+ <node id='-40855' lat='49.66377' lon='5.9069' />
+ <node id='-40857' lat='49.70951' lon='5.88677' />
+ <node id='-40859' lat='49.72739' lon='5.86503' />
+ <node id='-40861' lat='49.7962' lon='5.78871' />
+ <node id='-40863' lat='49.79239' lon='5.75409' />
+ <node id='-40865' lat='49.83452' lon='5.7404' />
+ <node id='-40867' lat='49.83823' lon='5.74076' />
+ <node id='-40869' lat='49.8711' lon='5.75269' />
+ <node id='-40871' lat='49.87922' lon='5.78415' />
+ <node id='-40873' lat='49.89796' lon='5.73621' />
+ <node id='-40875' lat='49.97142' lon='5.81163' />
+ <node id='-40877' lat='50.01286' lon='5.81866' />
+ <node id='-40879' lat='50.06342' lon='5.85474' />
+ <node id='-40881' lat='50.07824' lon='5.8857' />
+ <node id='-40883' lat='50.17259' lon='5.96453' />
+ <node id='-40885' lat='50.16362' lon='6.03093' />
+ <node id='-40887' lat='56.44959' lon='24.89623' />
+ <node id='-40889' visible='true' lat='56.07818' lon='21.15016' />
+ <node id='-40891' lat='56.04073' lon='20.68447' />
+ <node id='-40893' lat='57.06466' lon='19.64795' />
+ <node id='-40895' lat='57.56697' lon='23.20055' />
+ <node id='-40897' lat='35.88794' lon='-5.27056' />
+ <node id='-40899' lat='35.21494' lon='-3.90602' />
+ <node id='-40901' visible='true' lat='35.20841' lon='-3.88926' />
+ <node id='-40903' lat='35.35051' lon='-2.27707' />
+ <node id='-40905' lat='35.08532' lon='-2.21248' />
+ <node id='-40907' lat='34.74226' lon='-1.73707' />
+ <node id='-40909' lat='34.61907' lon='-1.84569' />
+ <node id='-40911' lat='33.27084' lon='-1.67067' />
+ <node id='-40913' lat='32.07832' lon='-1.22829' />
+ <node id='-40915' lat='32.06557' lon='-2.93873' />
+ <node id='-40917' visible='true' lat='31.79459' lon='-2.82784' />
+ <node id='-40919' lat='30.28343' lon='-4.6058' />
+ <node id='-40921' lat='29.95253' lon='-5.21671' />
+ <node id='-40923' visible='true' lat='29.52322' lon='-5.72121' />
+ <node id='-40925' visible='true' lat='29.44634' lon='-6.78351' />
+ <node id='-40927' lat='26.9898' lon='-8.71787' />
+ <node id='-40929' lat='26.90042' lon='-9.56957' />
+ <node id='-40931' lat='26.71379' lon='-9.81998' />
+ <node id='-40933' lat='26.8505' lon='-11.35695' />
+ <node id='-40935' lat='26.72023' lon='-11.23622' />
+ <node id='-40937' lat='26.04442' lon='-12.06001' />
+ <node id='-40939' lat='24.39502' lon='-12.92147' />
+ <node id='-40941' lat='22.75501' lon='-14.10361' />
+ <node id='-40943' lat='22.00886' lon='-14.48112' />
+ <node id='-40945' lat='21.63839' lon='-14.47329' />
+ <node id='-40947' lat='21.39745' lon='-16.44269' />
+ <node id='-40949' lat='21.36239' lon='-16.9978' />
+ <node id='-40951' lat='21.34022' lon='-17.02707' />
+ <node id='-40953' lat='21.34226' lon='-17.21511' />
+ <node id='-40955' lat='43.51859' lon='7.50102' />
+ <node id='-40957' lat='43.72937' lon='7.40809' />
+ <node id='-40959' lat='43.74102' lon='7.42198' />
+ <node id='-40961' lat='43.74932' lon='7.43677' />
+ <node id='-40963' lat='48.46109' lon='27.76276' />
+ <node id='-40965' lat='48.32825' lon='27.94854' />
+ <node id='-40967' lat='48.03392' lon='28.8414' />
+ <node id='-40969' lat='47.55001' lon='29.11743' />
+ <node id='-40971' lat='47.13581' lon='29.57696' />
+ <node id='-40973' lat='47.12878' lon='29.49732' />
+ <node id='-40975' lat='47.09114' lon='29.53353' />
+ <node id='-40977' lat='46.40114' lon='29.94114' />
+ <node id='-40979' lat='46.35851' lon='29.88329' />
+ <node id='-40981' lat='46.25852' lon='28.94953' />
+ <node id='-40983' lat='46.09176' lon='28.94643' />
+ <node id='-40985' lat='45.54744' lon='28.30201' />
+ <node id='-40987' lat='46.01105' lon='28.08612' />
+ <node id='-40989' lat='47.48113' lon='27.47942' />
+ <node id='-40991' lat='48.25804' lon='26.62823' />
+ <node id='-40993' lat='48.37534' lon='27.27855' />
+ <node id='-40995' lat='48.4434' lon='27.32159' />
+ <node id='-40997' lat='-12.74579' lon='51.94557' />
+ <node id='-40999' lat='-26.33102' lon='47.18248' />
+ <node id='-41001' lat='-25.64228' lon='42.93867' />
+ <node id='-41003' visible='true' lat='31.33364' lon='-111.06712' />
+ <node id='-41005' lat='31.33316' lon='-108.20979' />
+ <node id='-41007' lat='31.78534' lon='-108.20899' />
+ <node id='-41009' lat='31.784' lon='-106.529' />
+ <node id='-41011' lat='31.76922' lon='-106.51251' />
+ <node id='-41013' lat='31.76155' lon='-106.50962' />
+ <node id='-41015' lat='31.75714' lon='-106.50111' />
+ <node id='-41017' lat='31.75054' lon='-106.47298' />
+ <node id='-41019' lat='31.75478' lon='-106.43419' />
+ <node id='-41021' lat='31.73151' lon='-106.38003' />
+ <node id='-41023' lat='31.71165' lon='-106.3718' />
+ <node id='-41025' lat='31.69663' lon='-106.34864' />
+ <node id='-41027' lat='31.66303' lon='-106.33419' />
+ <node id='-41029' lat='31.56173' lon='-106.28084' />
+ <node id='-41031' lat='31.54193' lon='-106.24612' />
+ <node id='-41033' lat='31.51262' lon='-106.23711' />
+ <node id='-41035' lat='31.46305' lon='-106.20346' />
+ <node id='-41037' lat='31.40569' lon='-106.09025' />
+ <node id='-41039' lat='31.39181' lon='-106.00363' />
+ <node id='-41041' lat='28.93865' lon='-103.15787' />
+ <node id='-41043' lat='29.7744' lon='-101.47277' />
+ <node id='-41045' visible='true' lat='25.96583' lon='-97.13927' />
+ <node id='-41047' lat='17.80373' lon='-87.24084' />
+ <node id='-41049' lat='18.18511' lon='-87.84815' />
+ <node id='-41051' lat='18.18266' lon='-87.85693' />
+ <node id='-41053' lat='18.19971' lon='-87.86657' />
+ <node id='-41055' lat='18.18313' lon='-87.87604' />
+ <node id='-41057' lat='18.15213' lon='-87.90671' />
+ <node id='-41059' lat='18.47617' lon='-88.26593' />
+ <node id='-41061' lat='17.81655' lon='-90.98678' />
+ <node id='-41063' visible='true' lat='17.25192' lon='-90.99199' />
+ <node id='-41065' lat='17.25373' lon='-91.43809' />
+ <node id='-41067' lat='16.70697' lon='-90.69064' />
+ <node id='-41069' lat='16.49832' lon='-90.61212' />
+ <node id='-41071' lat='15.26077' lon='-92.20983' />
+ <node id='-41073' lat='15.07406' lon='-92.0621' />
+ <node id='-41075' lat='14.53423' lon='-92.2261' />
+ <node id='-41077' lat='14.39277' lon='-92.37213' />
+ <node id='-41079' visible='true' lat='32.53167' lon='-117.12512' />
+ <node id='-41081' lat='32.71894' lon='-114.71871' />
+ <node id='-41083' lat='32.49742' lon='-114.82044' />
+ <node id='-41085' lat='42.25915' lon='21.58992' />
+ <node id='-41087' lat='17.00432' lon='4.26762' />
+ <node id='-41089' lat='16.39923' lon='4.19893' />
+ <node id='-41091' lat='15.35934' lon='3.50368' />
+ <node id='-41093' lat='15.42221' lon='3.03134' />
+ <node id='-41095' lat='15.27978' lon='1.31275' />
+ <node id='-41097' lat='14.98275' lon='0.96711' />
+ <node id='-41099' lat='10.24877' lon='-7.13331' />
+ <node id='-41101' lat='15.4396' lon='-9.40447' />
+ <node id='-41103' lat='15.69412' lon='-9.31106' />
+ <node id='-41105' lat='25.0002' lon='-6.57191' />
+ <node id='-41107' lat='21.56129' lon='101.15156' />
+ <node id='-41109' lat='20.08614' lon='99.416' />
+ <node id='-41111' lat='19.7419' lon='98.98679' />
+ <node id='-41113' lat='19.67807' lon='98.56065' />
+ <node id='-41115' lat='19.80941' lon='98.03314' />
+ <node id='-41117' lat='19.65755' lon='98.04364' />
+ <node id='-41119' lat='19.39429' lon='97.78769' />
+ <node id='-41121' lat='19.29526' lon='97.84186' />
+ <node id='-41123' lat='19.26769' lon='97.78606' />
+ <node id='-41125' lat='19.22217' lon='97.84024' />
+ <node id='-41127' lat='18.9812' lon='97.73654' />
+ <node id='-41129' lat='18.9371' lon='97.66487' />
+ <node id='-41131' lat='18.88478' lon='97.73836' />
+ <node id='-41133' lat='18.58097' lon='97.76752' />
+ <node id='-41135' lat='18.54596' lon='97.34522' />
+ <node id='-41137' lat='18.23846' lon='97.60841' />
+ <node id='-41139' lat='17.97912' lon='97.73723' />
+ <node id='-41141' lat='17.58432' lon='97.90731' />
+ <node id='-41143' lat='17.33847' lon='98.10439' />
+ <node id='-41145' lat='16.81934' lon='98.53833' />
+ <node id='-41147' lat='16.11706' lon='98.8376' />
+ <node id='-41149' lat='15.87197' lon='98.59853' />
+ <node id='-41151' lat='15.65406' lon='98.541' />
+ <node id='-41153' lat='15.33471' lon='98.56027' />
+ <node id='-41155' lat='15.39154' lon='98.4866' />
+ <node id='-41157' lat='15.34177' lon='98.39351' />
+ <node id='-41159' lat='15.13125' lon='98.18821' />
+ <node id='-41161' lat='14.83013' lon='98.24874' />
+ <node id='-41163' lat='14.37701' lon='98.56762' />
+ <node id='-41165' lat='14.04868' lon='98.97356' />
+ <node id='-41167' lat='13.72621' lon='99.16695' />
+ <node id='-41169' lat='13.20575' lon='99.20617' />
+ <node id='-41171' lat='12.84799' lon='99.18905' />
+ <node id='-41173' lat='12.60603' lon='99.409' />
+ <node id='-41175' lat='11.62434' lon='99.47598' />
+ <node id='-41177' visible='true' lat='11.32081' lon='99.31573' />
+ <node id='-41179' lat='10.92962' lon='98.99701' />
+ <node id='-41181' lat='42.21682' lon='18.45131' />
+ <node id='-41183' lat='50.4648' lon='105.32528' />
+ <node id='-41185' visible='true' lat='49.97612' lon='107.36407' />
+ <node id='-41187' lat='49.93191' lon='107.96116' />
+ <node id='-41189' lat='49.60772' lon='113.02647' />
+ <node id='-41191' lat='49.83356' lon='113.20216' />
+ <node id='-41193' lat='49.83813' lon='116.71193' />
+ <node id='-41195' lat='48.51781' lon='115.78876' />
+ <node id='-41197' lat='48.25699' lon='115.811' />
+ <node id='-41199' lat='47.91988' lon='115.57128' />
+ <node id='-41201' visible='true' lat='47.80693' lon='116.08431' />
+ <node id='-41203' lat='47.83662' lon='116.4465' />
+ <node id='-41205' lat='47.88836' lon='116.87527' />
+ <node id='-41207' lat='47.82242' lon='117.08918' />
+ <node id='-41209' lat='48.01661' lon='117.80196' />
+ <node id='-41211' lat='47.99277' lon='118.55766' />
+ <node id='-41213' lat='47.66458' lon='119.12343' />
+ <node id='-41215' lat='47.48104' lon='119.35892' />
+ <node id='-41217' lat='46.57862' lon='117.41782' />
+ <node id='-41219' lat='46.30211' lon='116.58612' />
+ <node id='-41221' lat='45.6227' lon='115.91898' />
+ <node id='-41223' lat='44.74326' lon='113.63821' />
+ <node id='-41225' lat='45.09074' lon='111.98695' />
+ <node id='-41227' lat='43.68709' lon='111.93776' />
+ <node id='-41229' lat='43.6637' lon='111.79758' />
+ <node id='-41231' lat='42.63111' lon='109.89402' />
+ <node id='-41233' lat='41.7442' lon='105.24708' />
+ <node id='-41235' lat='41.8706' lon='104.52258' />
+ <node id='-41237' lat='41.78246' lon='103.92804' />
+ <node id='-41239' lat='42.56535' lon='99.50671' />
+ <node id='-41241' lat='42.7964' lon='97.1777' />
+ <node id='-41243' lat='44.02407' lon='95.32891' />
+ <node id='-41245' lat='45.19667' lon='90.89169' />
+ <node id='-41247' lat='45.73437' lon='90.70907' />
+ <node id='-41249' lat='47.98528' lon='89.0711' />
+ <node id='-41251' lat='48.95853' lon='87.88171' />
+ <node id='-41253' lat='49.17354' lon='87.81333' />
+ <node id='-41255' lat='49.48821' lon='88.42449' />
+ <node id='-41257' lat='50.69585' lon='92.07173' />
+ <node id='-41259' lat='50.57498' lon='94.30823' />
+ <node id='-41261' lat='51.46579' lon='98.22053' />
+ <node id='-41263' visible='true' lat='51.71832' lon='98.33222' />
+ <node id='-41265' lat='-26.92273' lon='33.10054' />
+ <node id='-41267' visible='true' lat='-26.86027' lon='32.35222' />
+ <node id='-41269' visible='true' lat='-26.852' lon='32.29584' />
+ <node id='-41271' visible='true' lat='-26.84136' lon='32.22302' />
+ <node id='-41273' visible='true' lat='-26.84032' lon='32.19409' />
+ <node id='-41275' lat='-26.84345' lon='32.13315' />
+ <node id='-41277' lat='-26.00978' lon='32.08599' />
+ <node id='-41279' lat='-25.95387' lon='31.974' />
+ <node id='-41281' lat='-21.31246' lon='32.41234' />
+ <node id='-41283' lat='-16.92259' lon='32.84113' />
+ <node id='-41285' lat='-15.9962' lon='30.42568' />
+ <node id='-41287' lat='-15.62269' lon='30.41902' />
+ <node id='-41289' lat='-14.99447' lon='30.22098' />
+ <node id='-41291' lat='-17.13235' lon='35.0923' />
+ <node id='-41293' lat='-16.11371' lon='35.43355' />
+ <node id='-41295' lat='-16.10147' lon='35.70107' />
+ <node id='-41297' lat='-16.03907' lon='35.80487' />
+ <node id='-41299' lat='-15.41913' lon='35.85303' />
+ <node id='-41301' lat='-15.17428' lon='35.78799' />
+ <node id='-41303' lat='-14.89514' lon='35.91812' />
+ <node id='-41305' lat='-14.67481' lon='35.86945' />
+ <node id='-41307' lat='-13.48958' lon='34.86229' />
+ <node id='-41309' lat='-13.48487' lon='34.60253' />
+ <node id='-41311' lat='-12.17408' lon='34.37831' />
+ <node id='-41313' lat='-12.0174' lon='34.46088' />
+ <node id='-41315' lat='-12.15652' lon='34.70739' />
+ <node id='-41317' lat='-12.04837' lon='34.82903' />
+ <node id='-41319' lat='-11.87849' lon='34.57917' />
+ <node id='-41321' lat='-11.57499' lon='34.64241' />
+ <node id='-41323' lat='-10.4618' lon='40.44265' />
+ <node id='-41325' lat='16.49919' lon='-5.60725' />
+ <node id='-41327' lat='16.33354' lon='-5.33435' />
+ <node id='-41329' lat='15.50061' lon='-5.50165' />
+ <node id='-41331' lat='15.50032' lon='-9.32979' />
+ <node id='-41333' lat='15.7044' lon='-9.33314' />
+ <node id='-41335' lat='15.60553' lon='-9.44673' />
+ <node id='-41337' lat='15.11001' lon='-10.90932' />
+ <node id='-41339' visible='true' lat='15.62339' lon='-11.43483' />
+ <node id='-41341' lat='14.76324' lon='-12.23936' />
+ <node id='-41343' lat='15.52116' lon='-13.11029' />
+ <node id='-41345' lat='16.61495' lon='-14.32144' />
+ <node id='-41347' lat='16.09753' lon='-16.44814' />
+ <node id='-41349' lat='16.09032' lon='-16.50854' />
+ <node id='-41351' lat='20.76408' lon='-17.0471' />
+ <node id='-41353' lat='20.92697' lon='-17.06781' />
+ <node id='-41355' lat='20.9961' lon='-17.0396' />
+ <node id='-41357' visible='true' lat='21.33343' lon='-13.01525' />
+ <node id='-41359' lat='22.53866' lon='-13.08438' />
+ <node id='-41361' lat='22.89493' lon='-13.10753' />
+ <node id='-41363' lat='23.02297' lon='-13.00412' />
+ <node id='-41365' lat='23.3187' lon='-12.36213' />
+ <node id='-41367' lat='25.99918' lon='-8.66721' />
+ <node id='-41369' visible='true' lat='-9.62442' lon='33.48052' />
+ <node id='-41371' lat='-10.12279' lon='34.51911' />
+ <node id='-41373' lat='-11.01611' lon='34.61161' />
+ <node id='-41375' lat='-11.57354' lon='34.96296' />
+ <node id='-41377' lat='-14.00019' lon='33.24249' />
+ <node id='-41379' lat='-13.47292' lon='32.86113' />
+ <node id='-41381' lat='-9.36712' lon='32.99397' />
+ <node id='-41383' lat='5.61613' lon='101.14062' />
+ <node id='-41385' visible='true' lat='6.20475' lon='102.06666' />
+ <node id='-41387' lat='1.33529' lon='104.34728' />
+ <node id='-41389' lat='1.43322' lon='104.07348' />
+ <node id='-41391' lat='1.44691' lon='104.04622' />
+ <node id='-41393' lat='1.4438' lon='104.02277' />
+ <node id='-41395' lat='1.35255' lon='103.62738' />
+ <node id='-41397' lat='1.19719' lon='103.56591' />
+ <node id='-41399' lat='5.99868' lon='99.31854' />
+ <node id='-41401' lat='6.42105' lon='100.12' />
+ <node id='-41403' lat='7.43869' lon='116.79524' />
+ <node id='-41405' lat='5.09568' lon='119.44841' />
+ <node id='-41407' lat='4.59798' lon='118.75416' />
+ <node id='-41409' lat='4.15511' lon='118.07935' />
+ <node id='-41411' lat='2.08014' lon='109.64506' />
+ <node id='-41413' visible='true' lat='4.82087' lon='115.02955' />
+ <node id='-41415' lat='5.35005' lon='115.02521' />
+ <node id='-41417' lat='-17.49501' lon='24.70864' />
+ <node id='-41419' lat='-17.79571' lon='25.26433' />
+ <node id='-41421' lat='-28.63117' lon='16.45332' />
+ <node id='-41423' lat='-29.23989' lon='15.70388' />
+ <node id='-41425' lat='21.99339' lon='15.19692' />
+ <node id='-41427' lat='21.49365' lon='15.20213' />
+ <node id='-41429' lat='21.44557' lon='15.28332' />
+ <node id='-41431' lat='20.95395' lon='15.62515' />
+ <node id='-41433' lat='20.86507' lon='15.55382' />
+ <node id='-41435' lat='20.79488' lon='15.56004' />
+ <node id='-41437' lat='20.74039' lon='15.59841' />
+ <node id='-41439' lat='20.70069' lon='15.6721' />
+ <node id='-41441' lat='20.35364' lon='15.99632' />
+ <node id='-41443' lat='19.93002' lon='15.75098' />
+ <node id='-41445' lat='18.77402' lon='15.6032' />
+ <node id='-41447' lat='16.89649' lon='15.50373' />
+ <node id='-41449' lat='15.72591' lon='14.37425' />
+ <node id='-41451' lat='15.04043' lon='13.86301' />
+ <node id='-41453' lat='14.40881' lon='13.47559' />
+ <node id='-41455' lat='13.73627' lon='5.21026' />
+ <node id='-41457' lat='13.78' lon='4.87425' />
+ <node id='-41459' lat='13.47725' lon='4.23456' />
+ <node id='-41461' lat='12.52223' lon='3.65111' />
+ <node id='-41463' lat='12.25884' lon='3.66364' />
+ <node id='-41465' lat='12.11826' lon='3.63136' />
+ <node id='-41467' lat='11.83042' lon='3.63063' />
+ <node id='-41469' lat='11.80865' lon='3.67122' />
+ <node id='-41471' lat='11.69181' lon='3.61075' />
+ <node id='-41473' lat='13.64564' lon='6.15771' />
+ <node id='-41475' lat='13.67835' lon='6.27411' />
+ <node id='-41477' lat='13.71094' lon='13.6302' />
+ <node id='-41479' lat='6.38038' lon='2.70566' />
+ <node id='-41481' lat='11.70269' lon='3.59375' />
+ <node id='-41483' lat='11.75429' lon='3.67988' />
+ <node id='-41485' lat='11.91847' lon='3.61955' />
+ <node id='-41487' lat='11.97599' lon='3.67775' />
+ <node id='-41489' lat='12.74979' lon='3.94339' />
+ <node id='-41491' lat='12.98862' lon='4.10006' />
+ <node id='-41493' lat='13.17189' lon='4.14367' />
+ <node id='-41495' lat='13.47586' lon='4.14186' />
+ <node id='-41497' lat='13.68286' lon='4.4668' />
+ <node id='-41499' lat='13.8845' lon='5.52957' />
+ <node id='-41501' lat='14.49418' lon='-82.06974' />
+ <node id='-41503' lat='11.91792' lon='-82.56142' />
+ <node id='-41505' lat='11.01562' lon='-83.68276' />
+ <node id='-41507' lat='13.13228' lon='-87.7346' />
+ <node id='-41509' lat='13.12523' lon='-87.55124' />
+ <node id='-41511' lat='-54.71036' lon='3.87126' />
+ <node id='-41513' lat='-54.70531' lon='2.85578' />
+ <node id='-41515' lat='-54.15099' lon='2.86398' />
+ <node id='-41517' lat='-54.15611' lon='3.87947' />
+ <node id='-41519' lat='69.80584' lon='30.84095' />
+ <node id='-41521' lat='69.04774' lon='28.91738' />
+ <node id='-41523' lat='69.04469' lon='20.0695' />
+ <node id='-41525' lat='67.96537' lon='17.90787' />
+ <node id='-41527' visible='true' lat='64.58402' lon='13.64276' />
+ <node id='-41529' lat='64.46674' lon='14.11117' />
+ <node id='-41531' visible='true' lat='64.18725' lon='14.16051' />
+ <node id='-41533' lat='64.00953' lon='13.98222' />
+ <node id='-41535' visible='true' lat='64.09087' lon='13.23411' />
+ <node id='-41537' lat='61.7147' lon='12.14746' />
+ <node id='-41539' visible='true' lat='58.89604' lon='11.45199' />
+ <node id='-41541' lat='58.99022' lon='11.4601' />
+ <node id='-41543' lat='27.88015' lon='88.13378' />
+ <node id='-41545' lat='28.83087' lon='80.07129' />
+ <node id='-41547' lat='30.20059' lon='81.03953' />
+ <node id='-41549' lat='-0.26' lon='167.2' />
+ <node id='-41551' lat='-0.8' lon='167.2' />
+ <node id='-41553' lat='-0.8' lon='166.65' />
+ <node id='-41555' lat='-0.26' lon='166.65' />
+ <node id='-41557' lat='22.55394' lon='61.45114' />
+ <node id='-41559' lat='17.24021' lon='56.66759' />
+ <node id='-41561' lat='19.00083' lon='52.00311' />
+ <node id='-41563' lat='20.00083' lon='54.99756' />
+ <node id='-41565' lat='21.99658' lon='55.66469' />
+ <node id='-41567' lat='26.58649' lon='56.2644' />
+ <node id='-41569' lat='26.76645' lon='56.68954' />
+ <node id='-41571' lat='29.85181' lon='66.24175' />
+ <node id='-41573' lat='30.06321' lon='66.23609' />
+ <node id='-41575' lat='31.59687' lon='68.91078' />
+ <node id='-41577' lat='32.29119' lon='69.27932' />
+ <node id='-41579' lat='32.88843' lon='69.49854' />
+ <node id='-41581' lat='34.26619' lon='71.12815' />
+ <node id='-41583' lat='34.87728' lon='71.29472' />
+ <node id='-41585' lat='35.50583' lon='71.58997' />
+ <node id='-41587' lat='36.04134' lon='71.19505' />
+ <node id='-41589' lat='36.66128' lon='72.20741' />
+ <node id='-41591' lat='36.84601' lon='72.6323' />
+ <node id='-41593' lat='36.82648' lon='74.04856' />
+ <node id='-41595' lat='6.97312' lon='-82.13751' />
+ <node id='-41597' lat='-12.50689' lon='-68.65044' />
+ <node id='-41599' lat='-15.61358' lon='-69.40336' />
+ <node id='-41601' lat='-17.49583' lon='-69.4748' />
+ <node id='-41603' lat='-9.48146' lon='144.30183' />
+ <node id='-41605' lat='-9.19253' lon='142.23304' />
+ <node id='-41607' lat='-9.19923' lon='142.1462' />
+ <node id='-41609' lat='-9.23534' lon='142.0953' />
+ <node id='-41611' lat='-9.56571' lon='142.0601' />
+ <node id='-41613' lat='-9.34945' lon='140.88922' />
+ <node id='-41615' visible='true' lat='-9.1242' lon='141.00782' />
+ <node id='-41617' lat='55.25302' lon='18.57853' />
+ <node id='-41619' lat='54.36264' lon='22.79705' />
+ <node id='-41621' lat='49.83607' lon='22.97476' />
+ <node id='-41623' lat='49.53094' lon='22.64534' />
+ <node id='-41625' lat='49.17529' lon='22.7098' />
+ <node id='-41627' lat='49.22136' lon='22.04427' />
+ <node id='-41629' lat='49.37176' lon='21.09799' />
+ <node id='-41631' lat='49.1813' lon='20.08238' />
+ <node id='-41633' lat='49.27806' lon='19.82237' />
+ <node id='-41635' lat='53.74464' lon='14.27249' />
+ <node id='-41637' lat='42.52158' lon='130.55143' />
+ <node id='-41639' lat='42.31114' lon='130.67288' />
+ <node id='-41641' lat='38.61914' lon='128.65655' />
+ <node id='-41643' lat='38.62345' lon='128.37487' />
+ <node id='-41645' lat='37.84095' lon='126.43239' />
+ <node id='-41647' lat='37.83113' lon='126.24402' />
+ <node id='-41649' lat='37.74728' lon='126.18776' />
+ <node id='-41651' lat='37.62643' lon='125.37112' />
+ <node id='-41653' lat='37.66334' lon='125.06408' />
+ <node id='-41655' lat='37.977' lon='124.84224' />
+ <node id='-41657' lat='39.61248' lon='124.09174' />
+ <node id='-41659' lat='-22.09157' lon='-57.98625' />
+ <node id='-41661' lat='-22.29008' lon='-55.8331' />
+ <node id='-41663' lat='-23.9657' lon='-55.41784' />
+ <node id='-41665' lat='-24.04274' lon='-54.29191' />
+ <node id='-41667' lat='-27.30427' lon='-55.97778' />
+ <node id='-41669' visible='true' lat='-27.31296' lon='-58.60017' />
+ <node id='-41671' lat='-25.13863' lon='-57.80821' />
+ <node id='-41673' lat='24.74049' lon='50.8133' />
+ <node id='-41675' lat='25.57887' lon='50.57069' />
+ <node id='-41677' lat='26.70231' lon='51.83682' />
+ <node id='-41679' lat='24.66608' lon='51.58834' />
+ <node id='-41681' lat='47.98538' lon='27.15622' />
+ <node id='-41683' lat='47.73722' lon='27.29069' />
+ <node id='-41685' lat='46.97621' lon='28.09095' />
+ <node id='-41687' lat='46.50434' lon='28.21423' />
+ <node id='-41689' lat='45.6051' lon='28.08927' />
+ <node id='-41691' lat='45.46895' lon='28.21139' />
+ <node id='-41693' lat='43.70874' lon='29.24336' />
+ <node id='-41695' lat='44.6619' lon='22.30844' />
+ <node id='-41697' lat='44.8887' lon='21.55264' />
+ <node id='-41699' lat='45.49788' lon='20.77217' />
+ <node id='-41701' lat='45.77738' lon='20.82364' />
+ <node id='-41703' lat='45.82801' lon='20.65645' />
+ <node id='-41705' lat='45.99356' lon='20.35862' />
+ <node id='-41707' lat='47.96858' lon='23.4979' />
+ <node id='-41709' lat='47.95062' lon='24.61994' />
+ <node id='-41711' lat='47.93919' lon='25.77723' />
+ <node id='-41713' lat='54.44203' lon='19.8038' />
+ <node id='-41715' lat='71.53642' lon='180.0' />
+ <node id='-41717' lat='49.32325' lon='108.53969' />
+ <node id='-41719' lat='51.35566' lon='102.14032' />
+ <node id='-41721' lat='49.46934' lon='88.17223' />
+ <node id='-41723' lat='41.95365' lon='48.80971' />
+ <node id='-41725' lat='43.06294' lon='39.81147' />
+ <node id='-41727' lat='47.12069' lon='38.22955' />
+ <node id='-41729' lat='47.61631' lon='38.35062' />
+ <node id='-41731' lat='47.69346' lon='38.76379' />
+ <node id='-41733' lat='47.87719' lon='38.87979' />
+ <node id='-41735' lat='47.82876' lon='39.73935' />
+ <node id='-41737' lat='48.59368' lon='39.67226' />
+ <node id='-41739' lat='48.99454' lon='39.6683' />
+ <node id='-41741' lat='49.05121' lon='39.6836' />
+ <node id='-41743' lat='49.05709' lon='39.93437' />
+ <node id='-41745' lat='50.00904' lon='38.68677' />
+ <node id='-41747' lat='50.34935' lon='37.08468' />
+ <node id='-41749' lat='52.10266' lon='32.2777' />
+ <node id='-41751' lat='52.08085' lon='32.23331' />
+ <node id='-41753' lat='52.03319' lon='32.08813' />
+ <node id='-41755' lat='52.11406' lon='31.7822' />
+ <node id='-41757' lat='52.32146' lon='31.57971' />
+ <node id='-41759' lat='52.69707' lon='31.50406' />
+ <node id='-41761' lat='53.031' lon='31.24147' />
+ <node id='-41763' lat='53.33494' lon='32.73257' />
+ <node id='-41765' lat='54.24714' lon='31.32851' />
+ <node id='-41767' lat='54.80699' lon='30.75165' />
+ <node id='-41769' lat='54.94064' lon='30.81759' />
+ <node id='-41771' lat='55.28223' lon='30.87944' />
+ <node id='-41773' lat='55.27931' lon='30.81946' />
+ <node id='-41775' lat='60.52722' lon='27.77352' />
+ <node id='-41777' lat='-1.0555' lon='30.47194' />
+ <node id='-41779' lat='-1.43244' lon='30.71974' />
+ <node id='-41781' lat='-1.39016' lon='29.59061' />
+ <node id='-41783' lat='-1.06896' lon='30.35212' />
+ <node id='-41785' lat='27.31569' lon='-8.66674' />
+ <node id='-41787' lat='25.9986' lon='-12.0002' />
+ <node id='-41789' lat='23.4538' lon='-12.00251' />
+ <node id='-41791' lat='23.41935' lon='-12.14969' />
+ <node id='-41793' lat='23.28975' lon='-12.5741' />
+ <node id='-41795' lat='22.75649' lon='-13.15313' />
+ <node id='-41797' lat='21.33997' lon='-16.95474' />
+ <node id='-41799' lat='21.12142' lon='-16.99806' />
+ <node id='-41801' lat='21.05368' lon='-17.0357' />
+ <node id='-41803' lat='20.85742' lon='-17.0695' />
+ <node id='-41805' lat='21.36587' lon='-14.78487' />
+ <node id='-41807' lat='22.41636' lon='-14.1291' />
+ <node id='-41809' lat='23.77231' lon='-13.75627' />
+ <node id='-41811' lat='24.01923' lon='-13.00628' />
+ <node id='-41813' lat='25.13682' lon='-12.12281' />
+ <node id='-41815' lat='26.05229' lon='-11.62052' />
+ <node id='-41817' lat='26.611' lon='-11.38635' />
+ <node id='-41819' lat='26.98639' lon='-9.08698' />
+ <node id='-41821' lat='27.66663' lon='-8.77527' />
+ <node id='-41823' lat='26.53976' lon='50.38162' />
+ <node id='-41825' lat='25.87592' lon='50.302' />
+ <node id='-41827' lat='24.54396' lon='50.92992' />
+ <node id='-41829' lat='16.40371' lon='42.76801' />
+ <node id='-41831' lat='27.99552' lon='34.46254' />
+ <node id='-41833' lat='29.18469' lon='36.07081' />
+ <node id='-41835' lat='29.86903' lon='36.75083' />
+ <node id='-41837' lat='29.99949' lon='37.4971' />
+ <node id='-41839' lat='30.33245' lon='37.66395' />
+ <node id='-41841' visible='true' lat='31.50081' lon='36.99791' />
+ <node id='-41843' lat='31.99721' lon='38.99233' />
+ <node id='-41845' lat='22.00903' lon='37.8565' />
+ <node id='-41847' lat='15.69575' lon='23.99997' />
+ <node id='-41849' lat='19.49944' lon='23.99539' />
+ <node id='-41851' lat='20.00038' lon='23.99715' />
+ <node id='-41853' lat='19.99661' lon='24.99794' />
+ <node id='-41855' lat='4.77382' lon='35.82118' />
+ <node id='-41857' lat='3.75068' lon='33.51264' />
+ <node id='-41859' lat='3.77812' lon='33.18356' />
+ <node id='-41861' lat='5.06541' lon='27.45596' />
+ <node id='-41863' lat='16.13961' lon='-13.80075' />
+ <node id='-41865' lat='11.92379' lon='-17.4623' />
+ <node id='-41867' lat='13.04579' lon='-17.43966' />
+ <node id='-41869' lat='14.63444' lon='-18.35085' />
+ <node id='-41871' lat='16.07139' lon='-17.15288' />
+ <node id='-41873' lat='16.0496' lon='-16.48967' />
+ <node id='-41875' lat='1.42405' lon='104.00131' />
+ <node id='-41877' lat='1.42015' lon='104.08871' />
+ <node id='-41879' lat='1.39694' lon='104.09162' />
+ <node id='-41881' lat='1.35998' lon='104.08072' />
+ <node id='-41883' lat='1.27714' lon='104.12282' />
+ <node id='-41885' lat='1.26954' lon='104.03085' />
+ <node id='-41887' lat='1.12902' lon='103.74084' />
+ <node id='-41889' lat='1.43166' lon='103.67468' />
+ <node id='-41891' lat='1.46108' lon='103.7219' />
+ <node id='-41893' lat='1.4502' lon='103.74161' />
+ <node id='-41895' lat='1.42926' lon='103.93384' />
+ <node id='-41897' lat='8.04829' lon='-10.57523' />
+ <node id='-41899' lat='8.04072' lon='-10.60492' />
+ <node id='-41901' lat='9.86834' lon='-12.47254' />
+ <node id='-41903' lat='9.87203' lon='-12.12634' />
+ <node id='-41905' lat='9.93927' lon='-11.91023' />
+ <node id='-41907' lat='13.41078' lon='-87.84675' />
+ <node id='-41909' lat='13.35689' lon='-87.80177' />
+ <node id='-41911' lat='12.63306' lon='-88.11443' />
+ <node id='-41913' lat='12.8866' lon='-90.55276' />
+ <node id='-41915' lat='43.89369' lon='12.45648' />
+ <node id='-41917' lat='43.9024' lon='12.40935' />
+ <node id='-41919' lat='43.98052' lon='12.47853' />
+ <node id='-41921' lat='43.99122' lon='12.51463' />
+ <node id='-41923' lat='43.97131' lon='12.50622' />
+ <node id='-41925' lat='43.96198' lon='12.50875' />
+ <node id='-41927' lat='43.94096' lon='12.51553' />
+ <node id='-41929' lat='43.89706' lon='12.48771' />
+ <node id='-41931' lat='8.00124' lon='47.97917' />
+ <node id='-41933' lat='11.56816' lon='48.95249' />
+ <node id='-41935' lat='12.56479' lon='51.12877' />
+ <node id='-41937' lat='46.19005' lon='19.66007' />
+ <node id='-41939' lat='45.24148' lon='21.29398' />
+ <node id='-41941' lat='45.01747' lon='21.36233' />
+ <node id='-41943' lat='44.66165' lon='21.7795' />
+ <node id='-41945' lat='44.47258' lon='22.45436' />
+ <node id='-41947' lat='44.21564' lon='22.67173' />
+ <node id='-41949' lat='43.47225' lon='22.53397' />
+ <node id='-41951' lat='43.19279' lon='23.00806' />
+ <node id='-41953' lat='42.56851' lon='22.43983' />
+ <node id='-41955' lat='42.74888' lon='21.39045' />
+ <node id='-41957' lat='42.8335' lon='20.35692' />
+ <node id='-41959' lat='43.5264' lon='19.22807' />
+ <node id='-41961' visible='true' lat='2.67798' lon='-54.28534' />
+ <node id='-41963' lat='2.32856' lon='-54.6084' />
+ <node id='-41965' visible='true' lat='2.02964' lon='-56.70519' />
+ <node id='-41967' lat='5.0208' lon='-57.37442' />
+ <node id='-41969' lat='6.2264' lon='-53.7094' />
+ <node id='-41971' lat='48.92857' lon='22.42934' />
+ <node id='-41973' lat='45.4436' lon='13.67398' />
+ <node id='-41975' lat='45.59464' lon='13.45644' />
+ <node id='-41977' lat='45.59352' lon='13.7198' />
+ <node id='-41979' lat='45.59811' lon='13.74587' />
+ <node id='-41981' lat='45.58185' lon='13.84106' />
+ <node id='-41983' lat='45.8072' lon='13.59784' />
+ <node id='-41985' lat='55.1553' lon='14.28399' />
+ <node id='-41987' lat='55.13257' lon='12.84405' />
+ <node id='-41989' lat='55.42675' lon='12.60345' />
+ <node id='-41991' lat='55.63369' lon='12.88472' />
+ <node id='-41993' lat='55.91371' lon='12.6372' />
+ <node id='-41995' lat='56.29488' lon='12.07466' />
+ <node id='-41997' lat='-25.999' lon='32.00916' />
+ <node id='-41999' lat='-26.5317' lon='32.13409' />
+ <node id='-42001' lat='-26.8096' lon='32.00893' />
+ <node id='-42003' lat='-27.31675' lon='31.97592' />
+ <node id='-42005' lat='-27.31549' lon='31.49834' />
+ <node id='-42007' lat='-25.71886' lon='31.4175' />
+ <node id='-42009' visible='true' lat='37.2863' lon='42.23683' />
+ <node id='-42011' lat='33.40479' lon='35.82577' />
+ <node id='-42013' lat='33.47886' lon='35.94816' />
+ <node id='-42015' lat='34.64977' lon='35.98718' />
+ <node id='-42017' lat='35.92109' lon='35.931' />
+ <node id='-42019' lat='35.94107' lon='35.98499' />
+ <node id='-42021' lat='35.92403' lon='36.01844' />
+ <node id='-42023' lat='36.22088' lon='36.39206' />
+ <node id='-42025' lat='36.23677' lon='36.68672' />
+ <node id='-42027' lat='36.82901' lon='36.66727' />
+ <node id='-42029' lat='36.75997' lon='36.99557' />
+ <node id='-42031' lat='36.63495' lon='37.08279' />
+ <node id='-42033' lat='36.6736' lon='37.21988' />
+ <node id='-42035' lat='36.63243' lon='37.47253' />
+ <node id='-42037' lat='36.66904' lon='37.49103' />
+ <node id='-42039' lat='36.75065' lon='37.68048' />
+ <node id='-42041' visible='true' lat='36.76055' lon='37.81974' />
+ <node id='-42043' lat='36.91842' lon='38.21064' />
+ <node id='-42045' lat='36.90064' lon='38.38859' />
+ <node id='-42047' lat='36.84429' lon='38.55908' />
+ <node id='-42049' lat='36.70629' lon='38.74042' />
+ <node id='-42051' lat='36.70911' lon='39.03217' />
+ <node id='-42053' lat='36.66834' lon='39.21538' />
+ <node id='-42055' lat='36.75538' lon='39.81589' />
+ <node id='-42057' lat='37.0996' lon='40.69136' />
+ <node id='-42059' lat='37.13147' lon='40.90856' />
+ <node id='-42061' lat='37.07665' lon='41.21937' />
+ <node id='-42063' lat='37.08084' lon='41.515' />
+ <node id='-42065' lat='37.17209' lon='42.00894' />
+ <node id='-42067' lat='37.28569' lon='42.18225' />
+ <node id='-42069' visible='true' lat='37.31323' lon='42.19301' />
+ <node id='-42071' visible='true' lat='37.32491' lon='42.2112' />
+ <node id='-42073' visible='true' lat='37.31395' lon='42.22257' />
+ <node id='-42075' visible='true' lat='37.30238' lon='42.22381' />
+ <node id='-42077' lat='37.28715' lon='42.20454' />
+ <node id='-42079' lat='37.28026' lon='42.21548' />
+ <node id='-42081' lat='7.22462' lon='102.46318' />
+ <node id='-42083' lat='6.50233' lon='99.91873' />
+ <node id='-42085' lat='6.44501' lon='99.50117' />
+ <node id='-42087' lat='8.18901' lon='97.19814' />
+ <node id='-42089' lat='39.88294' lon='70.51996' />
+ <node id='-42091' lat='40.90612' lon='70.68112' />
+ <node id='-42093' lat='40.98941' lon='70.57501' />
+ <node id='-42095' lat='40.98787' lon='70.54223' />
+ <node id='-42097' lat='41.00642' lon='70.56077' />
+ <node id='-42099' lat='40.72825' lon='70.80009' />
+ <node id='-42101' lat='40.45174' lon='70.32626' />
+ <node id='-42103' visible='true' lat='40.26421' lon='70.56394' />
+ <node id='-42105' lat='40.17396' lon='70.62342' />
+ <node id='-42107' lat='40.217' lon='70.8607' />
+ <node id='-42109' lat='40.12797' lon='70.7928' />
+ <node id='-42111' lat='39.93677' lon='70.48776' />
+ <node id='-42113' lat='40.00891' lon='70.58297' />
+ <node id='-42115' lat='40.23288' lon='70.01283' />
+ <node id='-42117' lat='39.92877' lon='69.43557' />
+ <node id='-42119' lat='40.01994' lon='69.35649' />
+ <node id='-42121' lat='39.52516' lon='69.3594' />
+ <node id='-42123' lat='39.58792' lon='70.64087' />
+ <node id='-42125' lat='39.35116' lon='72.85934' />
+ <node id='-42127' visible='true' lat='37.46495' lon='73.29633' />
+ <node id='-42129' lat='37.02014' lon='72.66381' />
+ <node id='-42131' lat='36.68084' lon='71.83229' />
+ <node id='-42133' lat='37.06007' lon='71.42975' />
+ <node id='-42135' lat='37.9318' lon='71.25424' />
+ <node id='-42137' lat='37.93276' lon='70.17206' />
+ <node id='-42139' lat='37.09098' lon='69.25255' />
+ <node id='-42141' lat='36.91923' lon='68.02194' />
+ <node id='-42143' lat='37.31594' lon='67.8474' />
+ <node id='-42145' lat='37.93' lon='68.12635' />
+ <node id='-42147' lat='38.39435' lon='68.06274' />
+ <node id='-42149' lat='38.82115' lon='68.06948' />
+ <node id='-42151' lat='39.02589' lon='68.09704' />
+ <node id='-42153' lat='39.00775' lon='67.68915' />
+ <node id='-42155' lat='39.53929' lon='68.54166' />
+ <node id='-42157' lat='40.5473' lon='69.20755' />
+ <node id='-42159' lat='40.62615' lon='69.69434' />
+ <node id='-42161' lat='41.04438' lon='70.45251' />
+ <node id='-42163' lat='41.21694' lon='60.5078' />
+ <node id='-42165' lat='38.95561' lon='64.19086' />
+ <node id='-42167' lat='38.29052' lon='65.55873' />
+ <node id='-42169' lat='37.35409' lon='66.55743' />
+ <node id='-42171' lat='37.34388' lon='65.64263' />
+ <node id='-42173' lat='40.29239' lon='51.7708' />
+ <node id='-42175' lat='41.25435' lon='57.03423' />
+ <node id='-42177' lat='-9.34243' lon='124.04286' />
+ <node id='-42179' lat='-8.41485' lon='127.53551' />
+ <node id='-42181' lat='-8.75859' lon='124.92337' />
+ <node id='-42183' lat='-8.22976' lon='125.31127' />
+ <node id='-42185' lat='-8.06136' lon='125.65946' />
+ <node id='-42187' lat='-8.31789' lon='125.87691' />
+ <node id='-42189' lat='37.6713' lon='11.2718' />
+ <node id='-42191' lat='33.34642' lon='11.66543' />
+ <node id='-42193' lat='33.16754' lon='11.56255' />
+ <node id='-42195' lat='33.09826' lon='11.51549' />
+ <node id='-42197' lat='31.72648' lon='10.31364' />
+ <node id='-42199' lat='30.23971' lon='9.55544' />
+ <node id='-42201' lat='32.07865' lon='9.07483' />
+ <node id='-42203' lat='33.42114' lon='7.73687' />
+ <node id='-42205' lat='34.20167' lon='7.66174' />
+ <node id='-42207' lat='34.16492' lon='7.74207' />
+ <node id='-42209' lat='34.3987' lon='7.86264' />
+ <node id='-42211' lat='35.23376' lon='8.47318' />
+ <node id='-42213' lat='36.9401' lon='8.64044' />
+ <node id='-42215' lat='37.14286' lon='8.59123' />
+ <node id='-42217' lat='41.98371' lon='28.32297' />
+ <node id='-42219' lat='40.73051' lon='26.03489' />
+ <node id='-42221' lat='36.10365' lon='29.69611' />
+ <node id='-42223' lat='36.14179' lon='29.61805' />
+ <node id='-42225' lat='36.1731' lon='29.61002' />
+ <node id='-42227' lat='36.18377' lon='29.48192' />
+ <node id='-42229' lat='36.14836' lon='29.08523' />
+ <node id='-42231' lat='36.69898' lon='27.89482' />
+ <node id='-42233' lat='25.98197' lon='122.26612' />
+ <node id='-42235' lat='-0.99911' lon='30.80408' />
+ <node id='-42237' lat='-10.25691' lon='40.74206' />
+ <node id='-42239' visible='true' lat='-4.44681' lon='29.63827' />
+ <node id='-42241' lat='-2.41404' lon='30.54501' />
+ <node id='-42243' visible='true' lat='-1.91477' lon='30.80802' />
+ <node id='-42245' lat='3.48867' lon='30.85153' />
+ <node id='-42247' lat='3.89296' lon='33.02852' />
+ <node id='-42249' lat='4.23316' lon='33.9873' />
+ <node id='-42251' lat='46.98085' lon='38.3384' />
+ <node id='-42253' lat='46.86078' lon='38.12112' />
+ <node id='-42255' lat='45.79231' lon='35.23066' />
+ <node id='-42257' lat='46.10317' lon='33.57318' />
+ <node id='-42259' lat='46.06013' lon='33.59087' />
+ <node id='-42261' lat='46.0123' lon='33.54017' />
+ <node id='-42263' lat='45.08461' lon='30.04414' />
+ <node id='-42265' lat='45.43907' lon='28.28504' />
+ <node id='-42267' lat='49.08865' lon='22.56155' />
+ <node id='-42269' lat='49.00725' lon='22.89122' />
+ <node id='-42271' lat='50.38248' lon='23.71382' />
+ <node id='-42273' lat='50.60752' lon='24.0996' />
+ <node id='-42275' lat='51.07697' lon='23.90376' />
+ <node id='-42277' lat='51.40871' lon='23.69905' />
+ <node id='-42279' lat='51.50491' lon='23.61756' />
+ <node id='-42281' lat='51.97143' lon='25.20228' />
+ <node id='-42283' lat='51.77291' lon='27.20602' />
+ <node id='-42285' lat='51.66988' lon='28.23452' />
+ <node id='-42287' lat='51.54505' lon='28.37592' />
+ <node id='-42289' lat='18.71009' lon='-74.7289' />
+ <node id='-42291' lat='18.06252' lon='-74.76465' />
+ <node id='-42293' lat='18.17213' lon='-75.27909' />
+ <node id='-42295' lat='18.6531' lon='-75.24866' />
+ <node id='-42297' lat='19.02804' lon='166.94111' />
+ <node id='-42299' lat='19.02484' lon='166.27567' />
+ <node id='-42301' lat='19.60026' lon='166.27257' />
+ <node id='-42303' lat='19.60345' lon='166.93801' />
+ <node id='-42305' lat='65.98512' lon='-168.95635' />
+ <node id='-42307' lat='40.01404' lon='71.78838' />
+ <node id='-42309' lat='39.95026' lon='71.1427' />
+ <node id='-42311' visible='true' lat='39.88423' lon='71.16101' />
+ <node id='-42313' lat='40.05481' lon='71.01035' />
+ <node id='-42315' lat='40.18154' lon='71.00236' />
+ <node id='-42317' lat='40.86947' lon='72.59136' />
+ <node id='-42319' lat='40.28761' lon='70.95789' />
+ <node id='-42321' lat='40.22392' lon='70.9818' />
+ <node id='-42323' lat='41.90056' lon='12.45181' />
+ <node id='-42325' lat='41.90095' lon='12.44834' />
+ <node id='-42327' lat='41.90326' lon='12.44815' />
+ <node id='-42329' lat='41.90545' lon='12.44984' />
+ <node id='-42331' lat='41.90629' lon='12.45561' />
+ <node id='-42333' lat='41.90143' lon='12.45435' />
+ <node id='-42335' lat='12.38063' lon='-70.24399' />
+ <node id='-42337' lat='11.18974' lon='-61.62505' />
+ <node id='-42339' lat='10.04435' lon='-62.08693' />
+ <node id='-42341' lat='8.10026' lon='109.55486' />
+ <node id='-42343' lat='8.03101' lon='104.81582' />
+ <node id='-42345' lat='17.36399' lon='106.09019' />
+ <node id='-42347' lat='16.16312' lon='53.34372' />
+ <node id='-42349' lat='12.12478' lon='55.69862' />
+ <node id='-42351' lat='11.68582' lon='52.253' />
+ <node id='-42353' lat='12.3823' lon='43.90659' />
+ <node id='-42355' lat='-25.99973' lon='31.86881' />
+ <node id='-42357' lat='-26.84722' lon='30.81101' />
+ <node id='-42359' lat='-26.79622' lon='30.88826' />
+ <node id='-42361' lat='-26.92706' lon='30.97757' />
+ <node id='-42363' lat='-27.0245' lon='30.96088' />
+ <node id='-42365' lat='-27.20151' lon='31.15027' />
+ <node id='-42367' lat='-28.42622' lon='19.99882' />
+ <node id='-42369' lat='-24.81004' lon='20.03678' />
+ <node id='-42371' lat='-22.19581' lon='29.37703' />
+ <node id='-42373' visible='true' lat='-28.7293' lon='28.1317' />
+ <node id='-42375' lat='-9.40138' lon='32.95389' />
+ <node id='-42377' lat='-13.80755' lon='32.79015' />
+ <node id='-42379' lat='-15.93805' lon='29.01298' />
+ <node id='-42381' lat='-16.96274' lon='27.83141' />
+ <node id='-42383' lat='-17.24365' lon='27.62795' />
+ <node id='-42385' lat='-17.34378' lon='27.61377' />
+ <node id='-42387' lat='-18.07411' lon='26.68403' />
+ <node id='-42389' visible='true' lat='-17.86232' lon='25.51646' />
+ <node id='-42391' lat='-17.62877' lon='23.47474' />
+ <node id='-42393' lat='-16.18028' lon='22.00323' />
+ <node id='-42395' lat='-12.14898' lon='29.8139' />
+ <node id='-42397' lat='-9.44726' lon='28.51627' />
+ <node id='-42399' lat='-19.36098' lon='32.77966' />
+ <node id='-42401' lat='-21.32873' lon='32.48236' />
+ <node id='-42403' lat='-22.422' lon='31.30611' />
+ <node id='-42405' lat='83.41631' lon='-85.36473' />
+ <node id='-42407' lat='83.40597' lon='-62.36036' />
+ <node id='-42409' lat='82.31398' lon='-59.93819' />
+ <node id='-42411' lat='81.66522' lon='-63.1988' />
+ <node id='-42413' lat='78.42484' lon='-73.91222' />
+ <node id='-42415' lat='80.75493' lon='-67.48417' />
+ <node id='-42417' lat='75.70014' lon='-74.12379' />
+ <node id='-42419' lat='48.53282' lon='-125.03842' />
+ <node id='-42421' lat='48.21223' lon='-123.50039' />
+ <node id='-42423' lat='48.35395' lon='-123.15614' />
+ <node id='-42425' lat='48.6959' lon='-123.26565' />
+ <node id='-42427' lat='48.76586' lon='-123.0093' />
+ <node id='-42429' lat='48.83186' lon='-123.0093' />
+ <node id='-42431' lat='49.00419' lon='-123.32163' />
+ <node id='-42433' lat='33.57011' lon='-122.18305' />
+ <node id='-42435' lat='32.5991' lon='-118.48109' />
+ <node id='-42437' lat='48.51151' lon='-133.36909' />
+ <node id='-42439' lat='54.62289' lon='-133.92876' />
+ <node id='-42441' lat='54.70835' lon='-130.61931' />
+ <node id='-42443' lat='54.76912' lon='-130.64499' />
+ <node id='-42445' lat='54.85377' lon='-130.44184' />
+ <node id='-42447' lat='54.97174' lon='-130.27203' />
+ <node id='-42449' lat='55.07744' lon='-130.18765' />
+ <node id='-42451' lat='55.21556' lon='-130.08035' />
+ <node id='-42453' lat='55.28029' lon='-129.97513' />
+ <node id='-42455' lat='43.71683' lon='-59.437' />
+ <node id='-42457' lat='44.90965' lon='-66.96824' />
+ <node id='-42459' lat='44.83078' lon='-66.96824' />
+ <node id='-42461' lat='44.82597' lon='-66.93432' />
+ <node id='-42463' lat='44.87071' lon='-66.98249' />
+ <node id='-42465' lat='27.02964' lon='-79.36558' />
+ <node id='-42467' lat='24.23074' lon='-82.02215' />
+ <node id='-42469' lat='84.11035' lon='-34.32457' />
+ <node id='-42471' lat='55.43944' lon='-45.64471' />
+ <node id='-42473' lat='82.6752' lon='-3.52068' />
+ <node id='-42475' lat='-23.49588' lon='166.93331' />
+ <node id='-42477' lat='-15.7108' lon='158.60851' />
+ <node id='-42479' lat='-18.93777' lon='157.46481' />
+ <node id='-42481' lat='-53.87687' lon='71.08716' />
+ <node id='-42483' lat='-9.05052' lon='127.55165' />
+ <node id='-42485' lat='-9.24611' lon='142.31447' />
+ <node id='-42487' lat='-9.35994' lon='142.5723' />
+ <node id='-42489' lat='-9.31709' lon='142.81927' />
+ <node id='-42491' lat='-12.9001' lon='155.22803' />
+ <node id='-42493' lat='-21.86428' lon='158.4748' />
+ <node id='-42495' lat='-54.25538' lon='159.92772' />
+ <node id='-42497' lat='-53.19756' lon='169.00308' />
+ <node id='-42499' lat='-50.04657' lon='179.49541' />
+ <node id='-42501' lat='-36.79303' lon='179.49541' />
+ <node id='-42503' lat='-29.09191' lon='169.6687' />
+ <node id='-42505' lat='8.98767' lon='79.37385' />
+ <node id='-42507' lat='5.46963' lon='79.9245' />
+ <node id='-42509' lat='6.54691' lon='82.74996' />
+ <node id='-42511' lat='10.20786' lon='80.48418' />
+ <node id='-42513' lat='9.80115' lon='79.42124' />
+ <node id='-42515' lat='53.385' lon='172.01045' />
+ <node id='-42517' lat='51.06331' lon='171.97544' />
+ <node id='-42519' lat='51.0171' lon='180.0' />
+ <node id='-42521' lat='53.34113' lon='180.0' />
+ <node id='-42523' lat='53.9242' lon='169.19658' />
+ <node id='-42525' lat='44.571' lon='145.82343' />
+ <node id='-42527' lat='43.76813' lon='145.23667' />
+ <node id='-42529' lat='43.50342' lon='145.76215' />
+ <node id='-42531' lat='43.07828' lon='145.97944' />
+ <node id='-42533' lat='62.52334' lon='180.0' />
+ <node id='-42535' lat='45.92937' lon='140.9182' />
+ <node id='-42537' lat='41.5445' lon='131.95041' />
+ <node id='-42539' lat='77.7025' lon='157.93051' />
+ <node id='-42541' lat='81.82849' lon='94.09128' />
+ <node id='-42543' lat='82.16972' lon='56.59649' />
+ <node id='-42545' lat='70.16571' lon='31.59909' />
+ <node id='-42547' lat='50.81807' lon='-179.55295' />
+ <node id='-42549' lat='57.62081' lon='-179.55295' />
+ <node id='-42551' lat='63.77445' lon='-172.76104' />
+ <node id='-42553' lat='65.48473' lon='-169.03888' />
+ <node id='-42555' lat='71.99091' lon='-168.25765' />
+ <node id='-42557' lat='62.99867' lon='-25.58144' />
+ <node id='-42559' lat='63.06873' lon='-12.08632' />
+ <node id='-42561' lat='70.09565' lon='-10.71459' />
+ <node id='-42563' lat='67.46637' lon='-25.70385' />
+ <node id='-42565' lat='23.44484' lon='-80.16442' />
+ <node id='-42567' lat='20.6935' lon='-73.62304' />
+ <node id='-42569' lat='20.79216' lon='-72.94479' />
+ <node id='-42571' lat='22.40371' lon='-72.41726' />
+ <node id='-42573' lat='26.86841' lon='-76.80329' />
+ <node id='-42575' lat='27.53866' lon='-78.4311' />
+ <node id='-42577' lat='17.48384' lon='-64.35558' />
+ <node id='-42579' lat='18.10286' lon='-64.646' />
+ <node id='-42581' lat='18.39954' lon='-64.86049' />
+ <node id='-42583' lat='18.36478' lon='-64.64067' />
+ <node id='-42585' lat='7.6285' lon='72.15131' />
+ <node id='-42587' lat='22.26271' lon='68.54518' />
+ <node id='-42589' lat='7.70688' lon='74.03744' />
+ <node id='-42591' lat='-1.22734' lon='74.20495' />
+ <node id='-42593' lat='-1.32013' lon='72.64576' />
+ <node id='-42595' lat='-4.95745' lon='70.64754' />
+ <node id='-42597' lat='-4.96078' lon='73.19979' />
+ <node id='-42599' lat='-7.72081' lon='73.19616' />
+ <node id='-42601' lat='-7.71751' lon='70.64391' />
+ <node id='-42603' lat='-36.04977' lon='80.15867' />
+ <node id='-42605' lat='-51.14192' lon='70.67507' />
+ <node id='-42607' lat='-46.28749' lon='46.31615' />
+ <node id='-42609' lat='-20.37973' lon='54.32269' />
+ <node id='-42611' lat='-20.2711' lon='56.62373' />
+ <node id='-42613' lat='-21.9174' lon='56.73473' />
+ <node id='-42615' lat='-22.02482' lon='54.43368' />
+ <node id='-42617' lat='-9.1938' lon='63.47388' />
+ <node id='-42619' lat='-21.5783' lon='64.11105' />
+ <node id='-42621' lat='-9.55401' lon='56.09755' />
+ <node id='-42623' lat='-3.53165' lon='53.06458' />
+ <node id='-42625' lat='-2.9998' lon='56.94974' />
+ <node id='-42627' lat='-7.697' lon='57.144' />
+ <node id='-42629' lat='-10.83678' lon='46.52682' />
+ <node id='-42631' lat='-9.09441' lon='45.39948' />
+ <node id='-42633' lat='-10.78153' lon='51.51407' />
+ <node id='-42635' lat='-11.11413' lon='42.93552' />
+ <node id='-42637' lat='-11.04481' lon='44.69407' />
+ <node id='-42639' lat='-12.58368' lon='44.75722' />
+ <node id='-42641' lat='-12.65261' lon='42.99868' />
+ <node id='-42643' lat='-10.8109' lon='48.86266' />
+ <node id='-42645' lat='-16.09877' lon='43.72277' />
+ <node id='-42647' lat='-23.17181' lon='40.40841' />
+ <node id='-42649' lat='48.52441' lon='-5.81385' />
+ <node id='-42651' lat='49.22209' lon='-2.56423' />
+ <node id='-42653' lat='48.86706' lon='-2.00491' />
+ <node id='-42655' lat='49.23037' lon='-1.83944' />
+ <node id='-42657' lat='49.46288' lon='-2.09454' />
+ <node id='-42659' lat='52.03902' lon='-5.79914' />
+ <node id='-42661' lat='53.63269' lon='-5.37267' />
+ <node id='-42663' lat='53.87749' lon='-5.83481' />
+ <node id='-42665' lat='57.60709' lon='-14.78497' />
+ <node id='-42667' lat='61.32236' lon='-0.3751' />
+ <node id='-42669' lat='62.35338' lon='-8.51774' />
+ <node id='-42671' lat='62.77194' lon='-5.70102' />
+ <node id='-42673' lat='60.95272' lon='-6.51083' />
+ <node id='-42675' lat='64.74703' lon='-179.99933' />
+ <node id='-42677' lat='71.90735' lon='-179.9843' />
+ <node id='-42679' lat='55.27952' lon='-6.71944' />
+ <node id='-42681' lat='55.19878' lon='-6.9734' />
+ <node id='-42683' lat='39.07068' lon='-32.42346' />
+ <node id='-42685' lat='29.50503' lon='-15.92339' />
+ <node id='-42687' lat='41.4962' lon='-30.18705' />
+ <node id='-42689' lat='37.16868' lon='-7.39769' />
+ <node id='-42691' lat='47.3339' lon='-56.67989' />
+ <node id='-42693' lat='46.51478' lon='-56.70773' />
+ <node id='-42695' lat='44.41383' lon='61.01475' />
+ <node id='-42697' lat='43.51008' lon='62.01711' />
+ <node id='-42699' lat='43.64003' lon='63.34656' />
+ <node id='-42701' lat='43.56941' lon='64.53885' />
+ <node id='-42703' lat='43.74748' lon='64.96464' />
+ <node id='-42705' lat='41.94455' lon='66.00546' />
+ <node id='-42707' lat='41.87388' lon='66.53302' />
+ <node id='-42709' lat='41.1311' lon='66.69129' />
+ <node id='-42711' lat='23.60141' lon='155.16731' />
+ <node id='-42713' lat='23.54946' lon='122.20217' />
+ <node id='-42715' lat='27.24938' lon='123.1407' />
+ <node id='-42717' lat='32.33183' lon='127.42045' />
+ <node id='-42719' lat='34.87122' lon='129.2669' />
+ <node id='-42721' lat='37.41' lon='133.61399' />
+ <node id='-42723' lat='33.39749' lon='123.59627' />
+ <node id='-42725' lat='38.08134' lon='123.96588' />
+ <node id='-42727' lat='37.81462' lon='126.19097' />
+ <node id='-42729' lat='37.72949' lon='125.81159' />
+ <node id='-42731' lat='38.05679' lon='124.67666' />
+ <node id='-42733' lat='37.80827' lon='124.87921' />
+ <node id='-42735' lat='30.65625' lon='123.38925' />
+ <node id='-42737' lat='25.22863' lon='120.49232' />
+ <node id='-42739' lat='24.33015' lon='118.179' />
+ <node id='-42741' lat='24.54644' lon='118.42453' />
+ <node id='-42743' lat='21.52331' lon='120.69238' />
+ <node id='-42745' lat='21.77688' lon='121.8109' />
+ <node id='-42747' lat='25.44232' lon='122.32924' />
+ <node id='-42749' lat='23.51406' lon='121.75634' />
+ <node id='-42751' lat='15.61902' lon='112.88221' />
+ <node id='-42753' lat='15.19951' lon='110.2534' />
+ <node id='-42755' lat='18.66249' lon='107.44022' />
+ <node id='-42757' lat='21.47338' lon='108.10003' />
+ <node id='-42759' lat='20.07614' lon='108.26073' />
+ <node id='-42761' lat='10.48391' lon='103.99198' />
+ <node id='-42763' lat='5.42408' lon='108.10426' />
+ <node id='-42765' lat='2.32059' lon='109.71058' />
+ <node id='-42767' lat='1.79674' lon='134.40878' />
+ <node id='-42769' lat='3.08804' lon='128.97621' />
+ <node id='-42771' lat='6.02692' lon='126.69413' />
+ <node id='-42773' lat='4.82064' lon='124.97752' />
+ <node id='-42775' lat='3.99509' lon='118.41402' />
+ <node id='-42777' lat='3.86466' lon='99.75778' />
+ <node id='-42779' lat='5.70549' lon='97.65314' />
+ <node id='-42781' lat='6.60903' lon='94.98735' />
+ <node id='-42783' lat='5.96666' lon='94.19973' />
+ <node id='-42785' lat='-7.16134' lon='96.82918' />
+ <node id='-42787' lat='-11.65621' lon='122.91521' />
+ <node id='-42789' lat='-8.97063' lon='139.41724' />
+ <node id='-42791' lat='42.4581' lon='34.8305' />
+ <node id='-42793' lat='41.72528' lon='40.89217' />
+ <node id='-42795' lat='35.92555' lon='29.73302' />
+ <node id='-42797' lat='45.19227' lon='29.69272' />
+ <node id='-42799' lat='54.45423' lon='19.64312' />
+ <node id='-42801' lat='54.32395' lon='21.41123' />
+ <node id='-42803' lat='46.13561' lon='33.61467' />
+ <node id='-42805' lat='46.14147' lon='33.63854' />
+ <node id='-42807' lat='46.22615' lon='33.61517' />
+ <node id='-42809' lat='46.23028' lon='33.646' />
+ <node id='-42811' lat='46.18555' lon='33.74047' />
+ <node id='-42813' lat='46.20482' lon='33.79715' />
+ <node id='-42815' lat='46.19863' lon='33.85234' />
+ <node id='-42817' lat='46.15938' lon='33.91549' />
+ <node id='-42819' lat='46.10838' lon='34.05272' />
+ <node id='-42821' lat='46.11769' lon='34.07311' />
+ <node id='-42823' lat='46.10494' lon='34.12929' />
+ <node id='-42825' lat='46.06804' lon='34.181' />
+ <node id='-42827' lat='46.0532' lon='34.25111' />
+ <node id='-42829' lat='46.06114' lon='34.33912' />
+ <node id='-42831' lat='46.00245' lon='34.41221' />
+ <node id='-42833' lat='45.95995' lon='34.44155' />
+ <node id='-42835' lat='45.94267' lon='34.48729' />
+ <node id='-42837' lat='45.95097' lon='34.52011' />
+ <node id='-42839' lat='45.99347' lon='34.55889' />
+ <node id='-42841' lat='45.99347' lon='34.60861' />
+ <node id='-42843' lat='45.97136' lon='34.66679' />
+ <node id='-42845' lat='45.90705' lon='34.75479' />
+ <node id='-42847' lat='45.90047' lon='34.80153' />
+ <node id='-42849' lat='45.81009' lon='34.79905' />
+ <node id='-42851' lat='45.75634' lon='34.96015' />
+ <node id='-42853' lat='46.82615' lon='37.62608' />
+ <node id='-42855' lat='45.50633' lon='31.62627' />
+ <node id='-42857' lat='43.9825' lon='33.66142' />
+ <node id='-42859' lat='51.37112' lon='3.36263' />
+ <node id='-42861' lat='54.82438' lon='12.85844' />
+ <node id='-42863' lat='54.63689' lon='11.00303' />
+ <node id='-42865' lat='54.84171' lon='9.89314' />
+ <node id='-42867' lat='54.8247' lon='9.73563' />
+ <node id='-42869' lat='54.85548' lon='9.61187' />
+ <node id='-42871' lat='54.88057' lon='9.62734' />
+ <node id='-42873' lat='54.88785' lon='9.58937' />
+ <node id='-42875' lat='54.80273' lon='9.34107' />
+ <node id='-42877' lat='54.83968' lon='9.38532' />
+ <node id='-42879' lat='54.8948' lon='8.76387' />
+ <node id='-42881' lat='54.90452' lon='8.92795' />
+ <node id='-42883' lat='54.87249' lon='9.04629' />
+ <node id='-42885' lat='54.87421' lon='9.14275' />
+ <node id='-42887' lat='54.84044' lon='13.93395' />
+ <node id='-42889' lat='55.54655' lon='15.79951' />
+ <node id='-42891' lat='54.73263' lon='15.36991' />
+ <node id='-42893' lat='5.08515' lon='-3.10675' />
+ <node id='-42895' lat='5.12675' lon='-3.11073' />
+ <node id='-42897' lat='5.10397' lon='-2.96554' />
+ <node id='-42899' lat='5.12477' lon='-2.95261' />
+ <node id='-42901' lat='5.13665' lon='-3.063' />
+ <node id='-42903' lat='6.11522' lon='1.19771' />
+ <node id='-42905' lat='5.15655' lon='1.07031' />
+ <node id='-42907' lat='3.78489' lon='5.87055' />
+ <node id='-42909' lat='13.95915' lon='92.61282' />
+ <node id='-42911' lat='13.6468' lon='93.69443' />
+ <node id='-42913' lat='14.00732' lon='94.6395' />
+ <node id='-42915' lat='9.92804' lon='98.55174' />
+ <node id='-42917' lat='9.91973' lon='98.33094' />
+ <node id='-42919' lat='9.56576' lon='98.21525' />
+ <node id='-42921' lat='9.60854' lon='97.63455' />
+ <node id='-42923' lat='11.79791' lon='97.16045' />
+ <node id='-42925' lat='-22.5' lon='174.0' />
+ <node id='-42927' lat='-11.5' lon='179.99999' />
+ <node id='-42929' lat='-22.5' lon='179.99999' />
+ <node id='-42931' lat='3.9' lon='178.0' />
+ <node id='-42933' lat='-3.5' lon='178.0' />
+ <node id='-42935' lat='-3.5' lon='169.0' />
+ <node id='-42937' lat='-5.0' lon='174.0' />
+ <node id='-42939' lat='-5.0' lon='179.99999' />
+ <node id='-42941' lat='-11.5' lon='174.0' />
+ <node id='-42943' lat='-12.67903' lon='165.31108' />
+ <node id='-42945' lat='-12.74443' lon='168.14096' />
+ <node id='-42947' lat='-4.77078' lon='159.32766' />
+ <node id='-42949' lat='-9.22564' lon='171.21374' />
+ <node id='-42951' lat='-12.81344' lon='171.12712' />
+ <node id='-42953' lat='-13.44534' lon='160.37269' />
+ <node id='-42955' lat='-7.33315' lon='154.74815' />
+ <node id='-42957' lat='-6.92266' lon='155.60735' />
+ <node id='-42959' lat='-6.84664' lon='155.92557' />
+ <node id='-42961' lat='-6.65703' lon='156.03993' />
+ <node id='-42963' lat='-6.92661' lon='155.69784' />
+ <node id='-42965' lat='21.03576' lon='144.18594' />
+ <node id='-42967' lat='21.00809' lon='146.6755' />
+ <node id='-42969' lat='12.82462' lon='144.61642' />
+ <node id='-42971' lat='3.9' lon='169.0' />
+ <node id='-42973' lat='5.70687' lon='173.53711' />
+ <node id='-42975' lat='15.77133' lon='169.29099' />
+ <node id='-42977' lat='10.59067' lon='159.04653' />
+ <node id='-42979' lat='12.45908' lon='136.04605' />
+ <node id='-42981' lat='6.73747' lon='136.27107' />
+ <node id='-42983' lat='-1.39237' lon='156.88247' />
+ <node id='-42985' lat='6.367' lon='165.35175' />
+ <node id='-42987' lat='44.84989' lon='49.2134' />
+ <node id='-42989' lat='9.66162' lon='102.47649' />
+ <node id='-42991' lat='1.44271' lon='104.56723' />
+ <node id='-42993' lat='3.24936' lon='105.01437' />
+ <node id='-42995' lat='1.18825' lon='103.66049' />
+ <node id='-42997' lat='1.45183' lon='103.76395' />
+ <node id='-42999' lat='1.47953' lon='103.81181' />
+ <node id='-43001' lat='1.46288' lon='103.86383' />
+ <node id='-43003' lat='1.42841' lon='103.89565' />
+ <node id='-43005' lat='1.30383' lon='103.03657' />
+ <node id='-43007' lat='6.4045' lon='100.0756' />
+ <node id='-43009' lat='9.92389' lon='98.52291' />
+ <node id='-43011' lat='9.95782' lon='98.47298' />
+ <node id='-43013' lat='39.8232' lon='124.17532' />
+ <node id='-43015' lat='39.76947' lon='124.17337' />
+ <node id='-43017' lat='63.06556' lon='20.15877' />
+ <node id='-43019' lat='60.19152' lon='19.08191' />
+ <node id='-43021' lat='60.3893' lon='27.71177' />
+ <node id='-43023' lat='60.22766' lon='27.44953' />
+ <node id='-43025' lat='60.00121' lon='26.32936' />
+ <node id='-43027' lat='59.63819' lon='26.90044' />
+ <node id='-43029' lat='59.11672' lon='11.34459' />
+ <node id='-43031' lat='59.07862' lon='11.15367' />
+ <node id='-43033' lat='58.98745' lon='11.08911' />
+ <node id='-43035' lat='58.89391' lon='10.64958' />
+ <node id='-43037' lat='56.60205' lon='12.16597' />
+ <node id='-43039' lat='55.5623' lon='14.89259' />
+ <node id='-43041' lat='59.15546' lon='20.5104' />
+ <node id='-43043' lat='57.57876' lon='19.84909' />
+ <node id='-43045' lat='57.87798' lon='22.80496' />
+ <node id='-43047' lat='55.27994' lon='20.95181' />
+ <node id='-43049' lat='55.40986' lon='20.60454' />
+ <node id='-43051' lat='53.8664' lon='14.21323' />
+ <node id='-43053' lat='53.29807' lon='77.90383' />
+ <node id='-43055' lat='52.01171' lon='79.11255' />
+ <node id='-43057' lat='7.52841' lon='117.17735' />
+ <node id='-43059' lat='7.3895' lon='117.43832' />
+ <node id='-43061' lat='6.25755' lon='117.89159' />
+ <node id='-43063' lat='5.53889' lon='119.34756' />
+ <node id='-43065' lat='4.44172' lon='118.8663' />
+ <node id='-43067' lat='4.16535' lon='117.67641' />
+ <node id='-43069' lat='4.16637' lon='117.89538' />
+ <node id='-43071' lat='4.88201' lon='114.99417' />
+ <node id='-43073' lat='4.72871' lon='114.77303' />
+ <node id='-43075' lat='4.81905' lon='114.88841' />
+ <node id='-43077' lat='4.75062' lon='114.8266' />
+ <node id='-43079' lat='4.12205' lon='114.78539' />
+ <node id='-43081' lat='-8.22363' lon='127.21788' />
+ <node id='-43083' lat='-9.19281' lon='124.97892' />
+ <node id='-43085' lat='-9.16434' lon='125.18907' />
+ <node id='-43087' lat='-8.96359' lon='125.11764' />
+ <node id='-43089' lat='-9.03142' lon='125.18632' />
+ <node id='-43091' lat='-9.30263' lon='124.45971' />
+ <node id='-43093' lat='-9.3582' lon='124.38554' />
+ <node id='-43095' lat='-9.43002' lon='124.35258' />
+ <node id='-43097' lat='-9.50453' lon='124.28115' />
+ <node id='-43099' lat='-9.42324' lon='124.14517' />
+ <node id='-43101' lat='-9.36904' lon='124.21247' />
+ <node id='-43103' lat='-9.42189' lon='124.28115' />
+ <node id='-43105' lat='-9.22671' lon='124.04628' />
+ <node id='-43107' lat='-9.11416' lon='124.33472' />
+ <node id='-43109' lat='-9.85176' lon='125.68138' />
+ <node id='-43111' lat='-6.90181' lon='141.01763' />
+ <node id='-43113' lat='-6.3233' lon='140.99813' />
+ <node id='-43115' lat='-6.72996' lon='140.85295' />
+ <node id='-43117' lat='-5.69776' lon='157.60997' />
+ <node id='-43119' lat='-6.55528' lon='156.03296' />
+ <node id='-43121' lat='34.76642' lon='33.98684' />
+ <node id='-43123' lat='34.73974' lon='33.83531' />
+ <node id='-43125' lat='34.97592' lon='33.86432' />
+ <node id='-43127' lat='34.97075' lon='33.84811' />
+ <node id='-43129' lat='34.98108' lon='33.83505' />
+ <node id='-43131' lat='34.98956' lon='33.85621' />
+ <node id='-43133' lat='35.001' lon='33.85891' />
+ <node id='-43135' lat='35.00579' lon='33.85216' />
+ <node id='-43137' lat='35.00616' lon='33.84045' />
+ <node id='-43139' lat='35.01685' lon='33.82875' />
+ <node id='-43141' lat='35.02865' lon='33.83055' />
+ <node id='-43143' lat='35.04192' lon='33.81524' />
+ <node id='-43145' lat='35.04786' lon='33.8012' />
+ <node id='-43147' lat='35.0667' lon='33.82051' />
+ <node id='-43149' lat='35.05777' lon='33.8355' />
+ <node id='-43151' lat='35.0574' lon='33.85261' />
+ <node id='-43153' lat='35.07877' lon='33.88367' />
+ <node id='-43155' lat='35.06873' lon='33.89485' />
+ <node id='-43157' lat='35.07686' lon='33.90247' />
+ <node id='-43159' lat='35.11377' lon='33.89853' />
+ <node id='-43161' lat='35.08688' lon='33.91789' />
+ <node id='-43163' lat='35.07579' lon='33.91299' />
+ <node id='-43165' lat='35.11408' lon='33.88737' />
+ <node id='-43167' lat='35.07201' lon='33.8541' />
+ <node id='-43169' lat='35.08881' lon='33.87479' />
+ <node id='-43171' lat='35.09389' lon='33.87097' />
+ <node id='-43173' lat='35.10457' lon='33.87622' />
+ <node id='-43175' lat='35.12293' lon='33.87224' />
+ <node id='-43177' lat='35.12449' lon='33.88561' />
+ <node id='-43179' lat='35.12007' lon='33.88943' />
+ <node id='-43181' lat='35.07826' lon='33.82067' />
+ <node id='-43183' lat='35.06823' lon='33.84168' />
+ <node id='-43185' lat='35.05104' lon='33.78581' />
+ <node id='-43187' lat='35.03722' lon='33.71482' />
+ <node id='-43189' lat='35.04882' lon='33.70209' />
+ <node id='-43191' lat='35.01754' lon='33.69731' />
+ <node id='-43193' lat='35.03123' lon='33.69938' />
+ <node id='-43195' lat='35.03866' lon='33.67678' />
+ <node id='-43197' lat='35.06602' lon='33.68474' />
+ <node id='-43199' lat='35.05963' lon='33.67742' />
+ <node id='-43201' lat='35.07644' lon='33.70861' />
+ <node id='-43203' lat='35.07279' lon='33.7161' />
+ <node id='-43205' lat='35.06237' lon='33.69095' />
+ <node id='-43207' lat='35.00294' lon='33.71514' />
+ <node id='-43209' lat='34.99303' lon='33.70639' />
+ <node id='-43211' lat='34.97947' lon='33.70575' />
+ <node id='-43213' lat='34.98854' lon='33.78149' />
+ <node id='-43215' lat='34.67027' lon='32.93693' />
+ <node id='-43217' lat='34.67111' lon='32.94379' />
+ <node id='-43219' lat='34.68471' lon='32.95539' />
+ <node id='-43221' lat='34.67268' lon='32.98668' />
+ <node id='-43223' lat='34.6587' lon='32.94796' />
+ <node id='-43225' lat='34.65204' lon='32.94976' />
+ <node id='-43227' lat='34.64528' lon='32.95471' />
+ <node id='-43229' lat='34.64046' lon='32.96968' />
+ <node id='-43231' lat='60.30648' lon='-141.00116' />
+ <node id='-43233' lat='60.22077' lon='-140.5227' />
+ <node id='-43235' lat='60.18027' lon='-139.98024' />
+ <node id='-43237' lat='60.30919' lon='-140.45648' />
+ <node id='-43239' lat='60.33693' lon='-139.68991' />
+ <node id='-43241' lat='60.08896' lon='-139.20603' />
+ <node id='-43243' lat='60.35205' lon='-139.05831' />
+ <node id='-43245' lat='59.24465' lon='-137.60623' />
+ <node id='-43247' lat='59.76431' lon='-138.62145' />
+ <node id='-43249' lat='59.99655' lon='-139.05365' />
+ <node id='-43251' lat='59.90728' lon='-138.71149' />
+ <node id='-43253' lat='58.42773' lon='-133.38523' />
+ <node id='-43255' lat='58.89415' lon='-137.4925' />
+ <node id='-43257' lat='59.79937' lon='-135.48007' />
+ <node id='-43259' lat='59.16198' lon='-136.82619' />
+ <node id='-43261' lat='59.46617' lon='-136.47323' />
+ <node id='-43263' lat='59.16752' lon='-136.52365' />
+ <node id='-43265' lat='59.59083' lon='-136.31566' />
+ <node id='-43267' lat='59.44466' lon='-136.33727' />
+ <node id='-43269' lat='59.55526' lon='-136.22381' />
+ <node id='-43271' lat='59.56208' lon='-135.03069' />
+ <node id='-43273' lat='58.73543' lon='-133.84645' />
+ <node id='-43275' lat='59.28745' lon='-135.00267' />
+ <node id='-43277' lat='59.2458' lon='-134.7047' />
+ <node id='-43279' lat='58.8634' lon='-134.27175' />
+ <node id='-43281' lat='59.1297' lon='-134.55699' />
+ <node id='-43283' lat='59.13231' lon='-134.48059' />
+ <node id='-43285' lat='56.62247' lon='-131.8271' />
+ <node id='-43287' lat='56.12178' lon='-130.10173' />
+ <node id='-43289' lat='56.00325' lon='-130.00093' />
+ <node id='-43291' lat='55.74895' lon='-130.15373' />
+ <node id='-43293' lat='55.91344' lon='-130.00857' />
+ <node id='-43295' lat='56.36185' lon='-130.77769' />
+ <node id='-43297' lat='56.10849' lon='-130.33965' />
+ <node id='-43299' lat='49.36579' lon='-94.99532' />
+ <node id='-43301' lat='49.37056' lon='-95.12903' />
+ <node id='-43303' lat='49.11998' lon='-94.77355' />
+ <node id='-43305' lat='48.71543' lon='-94.54885' />
+ <node id='-43307' lat='48.71049' lon='-94.4174' />
+ <node id='-43309' lat='48.70232' lon='-94.27153' />
+ <node id='-43311' lat='48.68404' lon='-94.25172' />
+ <node id='-43313' lat='48.58232' lon='-93.80676' />
+ <node id='-43315' lat='48.60599' lon='-93.3712' />
+ <node id='-43317' lat='48.62787' lon='-93.33946' />
+ <node id='-43319' lat='48.49573' lon='-92.69927' />
+ <node id='-43321' lat='48.46081' lon='-92.71323' />
+ <node id='-43323' lat='48.31251' lon='-92.30939' />
+ <node id='-43325' lat='48.35651' lon='-92.26662' />
+ <node id='-43327' lat='48.36578' lon='-92.14732' />
+ <node id='-43329' lat='48.25409' lon='-91.98929' />
+ <node id='-43331' lat='48.02607' lon='-89.77248' />
+ <node id='-43333' lat='42.95423' lon='-82.4253' />
+ <node id='-43335' lat='42.93139' lon='-82.45331' />
+ <node id='-43337' lat='42.8068' lon='-82.4826' />
+ <node id='-43339' lat='43.07845' lon='-79.07486' />
+ <node id='-43341' lat='43.06659' lon='-79.01055' />
+ <node id='-43343' lat='43.01983' lon='-79.02424' />
+ <node id='-43345' lat='43.05612' lon='-78.99941' />
+ <node id='-43347' lat='42.98444' lon='-79.02074' />
+ <node id='-43349' lat='42.97' lon='-78.98126' />
+ <node id='-43351' lat='42.95509' lon='-78.96312' />
+ <node id='-43353' lat='42.95229' lon='-78.93224' />
+ <node id='-43355' lat='43.12029' lon='-79.06881' />
+ <node id='-43357' lat='43.10937' lon='-79.05671' />
+ <node id='-43359' lat='43.13934' lon='-79.0427' />
+ <node id='-43361' lat='43.16396' lon='-79.04652' />
+ <node id='-43363' lat='43.20133' lon='-79.05002' />
+ <node id='-43365' lat='43.17418' lon='-79.05384' />
+ <node id='-43367' lat='43.25375' lon='-79.05512' />
+ <node id='-43369' lat='43.21224' lon='-79.05544' />
+ <node id='-43371' lat='45.31573' lon='-71.01866' />
+ <node id='-43373' lat='45.34819' lon='-71.0107' />
+ <node id='-43375' lat='45.29849' lon='-70.91169' />
+ <node id='-43377' lat='45.2398' lon='-70.89864' />
+ <node id='-43379' lat='45.39828' lon='-70.82638' />
+ <node id='-43381' lat='45.43269' lon='-70.78372' />
+ <node id='-43383' lat='45.37592' lon='-70.65383' />
+ <node id='-43385' lat='45.42286' lon='-70.62518' />
+ <node id='-43387' lat='45.56964' lon='-70.68516' />
+ <node id='-43389' lat='45.67291' lon='-70.54019' />
+ <node id='-43391' lat='46.1453' lon='-70.23855' />
+ <node id='-43393' lat='46.18832' lon='-70.29078' />
+ <node id='-43395' lat='47.24399' lon='-68.70125' />
+ <node id='-43397' lat='47.24659' lon='-68.60575' />
+ <node id='-43399' lat='47.10377' lon='-67.87993' />
+ <node id='-43401' lat='8.04729' lon='129.01382' />
+ <node id='-43403' lat='8.2483' lon='116.28201' />
+ <node id='-43405' lat='31.77509' lon='-106.52266' />
+ <node id='-43407' lat='31.74769' lon='-106.48815' />
+ <node id='-43409' lat='31.75998' lon='-106.46726' />
+ <node id='-43411' lat='31.76523' lon='-106.45244' />
+ <node id='-43413' lat='31.75196' lon='-106.41773' />
+ <node id='-43415' lat='31.62154' lon='-106.30305' />
+ <node id='-43417' lat='30.4236' lon='-104.77674' />
+ <node id='-43419' lat='29.64671' lon='-104.5171' />
+ <node id='-43421' lat='29.57105' lon='-104.3969' />
+ <node id='-43423' lat='29.54255' lon='-104.37752' />
+ <node id='-43425' lat='29.55396' lon='-104.39363' />
+ <node id='-43427' lat='29.8192' lon='-102.60596' />
+ <node id='-43429' lat='29.296' lon='-100.87982' />
+ <node id='-43431' lat='28.75598' lon='-100.52313' />
+ <node id='-43433' lat='27.49775' lon='-99.50158' />
+ <node id='-43435' lat='26.40461' lon='-99.07809' />
+ <node id='-43437' lat='26.09318' lon='-98.24119' />
+ <node id='-43439' lat='28.66117' lon='-100.50029' />
+ <node id='-43441' lat='26.01708' lon='-97.66511' />
+ <node id='-43443' lat='25.83911' lon='-97.42878' />
+ <node id='-43445' lat='25.92189' lon='-97.35946' />
+ <node id='-43447' lat='25.83854' lon='-97.37332' />
+ <node id='-43449' lat='14.98143' lon='-92.1454' />
+ <node id='-43451' lat='14.84147' lon='-92.18161' />
+ <node id='-43453' lat='14.6804' lon='-92.1454' />
+ <node id='-43455' lat='14.88647' lon='-92.1423' />
+ <node id='-43457' lat='16.40524' lon='-90.40499' />
+ <node id='-43459' lat='16.92175' lon='-91.04436' />
+ <node id='-43461' lat='17.95104' lon='-89.15105' />
+ <node id='-43463' lat='18.0067' lon='-89.03839' />
+ <node id='-43465' lat='17.89535' lon='-88.8716' />
+ <node id='-43467' lat='18.49164' lon='-88.48242' />
+ <node id='-43469' lat='18.0707' lon='-88.71505' />
+ <node id='-43471' lat='5.68785' lon='-54.01074' />
+ <node id='-43473' lat='5.52789' lon='-54.01877' />
+ <node id='-43475' lat='4.91964' lon='-54.4717' />
+ <node id='-43477' lat='4.13222' lon='-54.38444' />
+ <node id='-43479' lat='3.58697' lon='-53.9849' />
+ <node id='-43481' lat='4.14596' lon='-51.61983' />
+ <node id='-43483' lat='3.17896' lon='-52.31787' />
+ <node id='-43485' lat='2.1881' lon='-52.96539' />
+ <node id='-43487' lat='2.10779' lon='-54.16286' />
+ <node id='-43489' lat='2.34412' lon='-53.78743' />
+ <node id='-43491' lat='2.42442' lon='-54.42864' />
+ <node id='-43493' lat='4.8383' lon='-51.35485' />
+ <node id='-43495' lat='5.33714' lon='-57.31629' />
+ <node id='-43497' lat='5.15605' lon='-57.22536' />
+ <node id='-43499' lat='3.95513' lon='-58.0307' />
+ <node id='-43501' lat='2.02003' lon='-56.55439' />
+ <node id='-43503' lat='1.89861' lon='-55.89863' />
+ <node id='-43505' lat='2.27723' lon='-56.13054' />
+ <node id='-43507' lat='2.53188' lon='-55.96292' />
+ <node id='-43509' lat='2.40342' lon='-55.71493' />
+ <node id='-43511' lat='2.05236' lon='-55.92159' />
+ <node id='-43513' lat='2.564' lon='-55.01919' />
+ <node id='-43515' lat='-51.98018' lon='-71.99889' />
+ <node id='-43517' lat='-52.00845' lon='-69.97824' />
+ <node id='-43519' lat='-52.33516' lon='-68.41683' />
+ <node id='-43521' lat='-51.59954' lon='-72.33873' />
+ <node id='-43523' lat='-49.79461' lon='-73.45156' />
+ <node id='-43525' lat='-50.78337' lon='-73.15765' />
+ <node id='-43527' lat='-49.92488' lon='-73.55259' />
+ <node id='-43529' lat='5.7955' lon='100.99021' />
+ <node id='-43531' lat='5.91013' lon='101.02708' />
+ <node id='-43533' lat='5.9193' lon='101.087' />
+ <node id='-43535' lat='6.11411' lon='101.12388' />
+ <node id='-43537' lat='6.14161' lon='101.06165' />
+ <node id='-43539' lat='6.19431' lon='101.12618' />
+ <node id='-43541' lat='6.25617' lon='101.10313' />
+ <node id='-43543' lat='6.24929' lon='100.85884' />
+ <node id='-43545' lat='6.45086' lon='100.81045' />
+ <node id='-43547' lat='6.46231' lon='100.74822' />
+ <node id='-43549' lat='6.50811' lon='100.74361' />
+ <node id='-43551' lat='6.45086' lon='100.66986' />
+ <node id='-43553' lat='6.54932' lon='100.35413' />
+ <node id='-43555' lat='6.72559' lon='100.19511' />
+ <node id='-43557' lat='6.68439' lon='100.29651' />
+ <node id='-43559' lat='5.71065' lon='101.25755' />
+ <node id='-43561' lat='5.78633' lon='101.25524' />
+ <node id='-43563' lat='5.93534' lon='101.58019' />
+ <node id='-43565' lat='5.75881' lon='101.69773' />
+ <node id='-43567' lat='6.14161' lon='102.09182' />
+ <node id='-43569' lat='5.97431' lon='101.93511' />
+ <node id='-43571' lat='5.85511' lon='101.92819' />
+ <node id='-43573' lat='5.79091' lon='101.75074' />
+ <node id='-43575' lat='5.74505' lon='101.80144' />
+ <node id='-43577' lat='4.57' lon='114.15813' />
+ <node id='-43579' lat='4.49878' lon='114.26876' />
+ <node id='-43581' lat='4.34942' lon='114.32176' />
+ <node id='-43583' lat='4.2552' lon='114.32176' />
+ <node id='-43585' lat='4.27588' lon='114.4416' />
+ <node id='-43587' lat='4.13108' lon='114.49922' />
+ <node id='-43589' lat='4.00694' lon='114.64211' />
+ <node id='-43591' lat='4.30806' lon='115.31275' />
+ <node id='-43593' lat='4.33563' lon='115.36346' />
+ <node id='-43595' lat='4.42295' lon='115.2851' />
+ <node id='-43597' lat='4.63661' lon='115.27819' />
+ <node id='-43599' lat='1.80624' lon='109.57923' />
+ <node id='-43601' lat='1.79972' lon='109.66397' />
+ <node id='-43603' lat='1.60425' lon='109.66397' />
+ <node id='-43605' lat='0.88088' lon='110.49182' />
+ <node id='-43607' lat='1.0764' lon='111.21538' />
+ <node id='-43609' lat='0.97864' lon='111.55434' />
+ <node id='-43611' lat='1.17416' lon='112.141' />
+ <node id='-43613' lat='1.44135' lon='112.2127' />
+ <node id='-43615' lat='1.56516' lon='112.48648' />
+ <node id='-43617' lat='1.57819' lon='113.021' />
+ <node id='-43619' lat='1.42832' lon='113.01448' />
+ <node id='-43621' lat='1.23933' lon='113.64677' />
+ <node id='-43623' lat='1.44787' lon='114.03788' />
+ <node id='-43625' lat='1.5' lon='114.57892' />
+ <node id='-43627' lat='1.92351' lon='114.80706' />
+ <node id='-43629' lat='2.21665' lon='114.80706' />
+ <node id='-43631' lat='2.49671' lon='115.1721' />
+ <node id='-43633' lat='2.82879' lon='115.11343' />
+ <node id='-43635' lat='3.14776' lon='115.53713' />
+ <node id='-43637' lat='3.93499' lon='115.58276' />
+ <node id='-43639' lat='4.37708' lon='115.90217' />
+ <node id='-43641' lat='4.35108' lon='117.25801' />
+ <node id='-43643' lat='4.18857' lon='117.47313' />
+ <node id='-43645' lat='40.45387' lon='124.86913' />
+ <node id='-43647' lat='40.87908' lon='125.76869' />
+ <node id='-43649' lat='40.92835' lon='126.00335' />
+ <node id='-43651' lat='41.3701' lon='126.48246' />
+ <node id='-43653' lat='41.65565' lon='126.60631' />
+ <node id='-43655' lat='41.48008' lon='127.2549' />
+ <node id='-43657' lat='41.74568' lon='128.15119' />
+ <node id='-43659' lat='42.43739' lon='129.72541' />
+ <node id='-43661' lat='42.41574' lon='129.28541' />
+ <node id='-43663' lat='42.17224' lon='129.15178' />
+ <node id='-43665' lat='42.44702' lon='129.42882' />
+ <node id='-43667' lat='42.37001' lon='129.52985' />
+ <node id='-43669' lat='42.44461' lon='129.60482' />
+ <node id='-43671' lat='43.01202' lon='129.934' />
+ <node id='-43673' lat='42.71127' lon='130.2385' />
+ <node id='-43675' lat='42.61636' lon='130.50123' />
+ <node id='-43677' lat='42.54849' lon='130.44361' />
+ <node id='-43679' lat='42.6011' lon='130.41826' />
+ <node id='-43681' lat='42.44143' lon='130.57728' />
+ <node id='-43683' lat='42.41422' lon='130.64181' />
+ <node id='-43685' lat='42.58413' lon='130.62107' />
+ <node id='-43687' lat='42.68925' lon='130.56576' />
+ <node id='-43689' lat='42.70788' lon='130.40213' />
+ <node id='-43691' lat='42.76205' lon='130.44361' />
+ <node id='-43693' lat='42.86518' lon='131.02438' />
+ <node id='-43695' lat='42.94114' lon='131.135' />
+ <node id='-43697' lat='42.91246' lon='131.02668' />
+ <node id='-43699' lat='43.04734' lon='131.10274' />
+ <node id='-43701' lat='43.39498' lon='131.30324' />
+ <node id='-43703' lat='43.21385' lon='131.19031' />
+ <node id='-43705' lat='43.13654' lon='131.20414' />
+ <node id='-43707' lat='43.53047' lon='131.19492' />
+ <node id='-43709' lat='43.46695' lon='131.29402' />
+ <node id='-43711' lat='43.82383' lon='131.21105' />
+ <node id='-43713' lat='43.94011' lon='131.26176' />
+ <node id='-43715' lat='44.03131' lon='131.25484' />
+ <node id='-43717' lat='43.96085' lon='131.23583' />
+ <node id='-43719' lat='44.70266' lon='131.1108' />
+ <node id='-43721' lat='44.85154' lon='130.95639' />
+ <node id='-43723' lat='44.99513' lon='131.48415' />
+ <node id='-43725' lat='45.12374' lon='131.68466' />
+ <node id='-43727' lat='45.2196' lon='131.66852' />
+ <node id='-43729' lat='45.33636' lon='131.86903' />
+ <node id='-43731' lat='45.22609' lon='131.76532' />
+ <node id='-43733' lat='45.0212' lon='132.96373' />
+ <node id='-43735' lat='45.25693' lon='133.09279' />
+ <node id='-43737' lat='45.51913' lon='133.19419' />
+ <node id='-43739' lat='45.57723' lon='133.41083' />
+ <node id='-43741' lat='45.86203' lon='133.48457' />
+ <node id='-43743' lat='45.90053' lon='133.60442' />
+ <node id='-43745' lat='46.14697' lon='133.68047' />
+ <node id='-43747' lat='46.25066' lon='133.88097' />
+ <node id='-43749' lat='46.75668' lon='134.03538' />
+ <node id='-43751' lat='47.33458' lon='134.20016' />
+ <node id='-43753' lat='47.4812' lon='134.50898' />
+ <node id='-43755' lat='47.72051' lon='134.7671' />
+ <node id='-43757' lat='47.98651' lon='134.55508' />
+ <node id='-43759' lat='48.36763' lon='134.75328' />
+ <node id='-43761' lat='48.42884' lon='134.49516' />
+ <node id='-43763' lat='47.96491' lon='132.66989' />
+ <node id='-43765' lat='47.71741' lon='132.57309' />
+ <node id='-43767' lat='47.6957' lon='130.95985' />
+ <node id='-43769' lat='48.87645' lon='130.23619' />
+ <node id='-43771' lat='48.88251' lon='130.66946' />
+ <node id='-43773' lat='48.63334' lon='130.51736' />
+ <node id='-43775' lat='48.30942' lon='130.84462' />
+ <node id='-43777' lat='48.10052' lon='130.65103' />
+ <node id='-43779' lat='47.90623' lon='130.90915' />
+ <node id='-43781' lat='49.41014' lon='129.48488' />
+ <node id='-43783' lat='49.5748' lon='127.83476' />
+ <node id='-43785' lat='49.58676' lon='128.72896' />
+ <node id='-43787' lat='49.36813' lon='129.11153' />
+ <node id='-43789' lat='49.84306' lon='127.53516' />
+ <node id='-43791' lat='50.01516' lon='127.49368' />
+ <node id='-43793' lat='50.28393' lon='127.37384' />
+ <node id='-43795' lat='50.72075' lon='127.28165' />
+ <node id='-43797' lat='51.0841' lon='126.93135' />
+ <node id='-43799' lat='51.3238' lon='126.90369' />
+ <node id='-43801' lat='53.07229' lon='125.6131' />
+ <node id='-43803' lat='52.13738' lon='126.558' />
+ <node id='-43805' lat='53.21881' lon='124.46078' />
+ <node id='-43807' lat='53.20225' lon='125.17522' />
+ <node id='-43809' lat='53.49391' lon='123.86158' />
+ <node id='-43811' lat='53.47196' lon='122.2806' />
+ <node id='-43813' lat='53.28499' lon='120.85633' />
+ <node id='-43815' lat='52.7359' lon='120.0451' />
+ <node id='-43817' lat='52.58773' lon='120.04049' />
+ <node id='-43819' lat='52.63811' lon='120.46454' />
+ <node id='-43821' lat='52.20805' lon='120.77337' />
+ <node id='-43823' lat='51.671' lon='120.10963' />
+ <node id='-43825' lat='50.35162' lon='119.38598' />
+ <node id='-43827' lat='50.13348' lon='119.27996' />
+ <node id='-43829' lat='49.52696' lon='117.82343' />
+ <node id='-43831' lat='49.93809' lon='118.61623' />
+ <node id='-43833' lat='50.28098' lon='114.325' />
+ <node id='-43835' lat='50.04477' lon='116.22402' />
+ <node id='-43837' lat='49.92919' lon='116.62502' />
+ <node id='-43839' lat='50.19254' lon='114.9703' />
+ <node id='-43841' lat='49.97367' lon='115.26068' />
+ <node id='-43843' lat='49.8906' lon='115.72161' />
+ <node id='-43845' lat='54.83124' lon='-7.47712' />
+ <node id='-43847' lat='54.94498' lon='-7.40004' />
+ <node id='-43849' lat='55.04688' lon='-7.34464' />
+ <node id='-43851' lat='55.00391' lon='-7.4033' />
+ <node id='-43853' lat='54.9403' lon='-7.44404' />
+ <node id='-43855' lat='54.87003' lon='-7.4473' />
+ <node id='-43857' lat='54.74606' lon='-7.54671' />
+ <node id='-43859' lat='54.79401' lon='-7.54508' />
+ <node id='-43861' lat='54.4212' lon='-7.02034' />
+ <node id='-43863' lat='54.7103' lon='-7.75041' />
+ <node id='-43865' lat='54.75265' lon='-7.64449' />
+ <node id='-43867' lat='54.73854' lon='-7.83352' />
+ <node id='-43869' lat='54.66603' lon='-7.93293' />
+ <node id='-43871' lat='54.62077' lon='-7.70315' />
+ <node id='-43873' lat='54.53671' lon='-7.8596' />
+ <node id='-43875' lat='54.54427' lon='-7.99812' />
+ <node id='-43877' lat='54.48941' lon='-8.04538' />
+ <node id='-43879' lat='54.46763' lon='-8.179' />
+ <node id='-43881' lat='54.35572' lon='-8.0356' />
+ <node id='-43883' lat='54.29299' lon='-7.87101' />
+ <node id='-43885' lat='54.21779' lon='-7.8596' />
+ <node id='-43887' lat='54.20159' lon='-7.81397' />
+ <node id='-43889' lat='54.20731' lon='-7.69501' />
+ <node id='-43891' lat='54.12239' lon='-7.55812' />
+ <node id='-43893' lat='54.12239' lon='-7.4799' />
+ <node id='-43895' lat='54.1539' lon='-7.44567' />
+ <node id='-43897' lat='54.11475' lon='-7.32834' />
+ <node id='-43899' lat='54.13863' lon='-7.26316' />
+ <node id='-43901' lat='54.20063' lon='-7.25012' />
+ <node id='-43903' lat='54.22732' lon='-7.14908' />
+ <node id='-43905' lat='54.31296' lon='-7.19145' />
+ <node id='-43907' lat='54.12013' lon='-7.29493' />
+ <node id='-43909' lat='54.11869' lon='-7.30553' />
+ <node id='-43911' lat='54.14698' lon='-7.34005' />
+ <node id='-43913' lat='54.17191' lon='-7.29157' />
+ <node id='-43915' lat='54.16714' lon='-7.28017' />
+ <node id='-43917' lat='54.1354' lon='-7.29687' />
+ <node id='-43919' lat='54.34682' lon='-6.87775' />
+ <node id='-43921' lat='54.22791' lon='-6.81583' />
+ <node id='-43923' lat='54.18788' lon='-6.74575' />
+ <node id='-43925' lat='54.20218' lon='-6.70175' />
+ <node id='-43927' lat='54.17071' lon='-6.6382' />
+ <node id='-43929' lat='54.0666' lon='-6.66264' />
+ <node id='-43931' lat='54.03503' lon='-6.62842' />
+ <node id='-43933' lat='54.07234' lon='-6.36605' />
+ <node id='-43935' lat='54.06947' lon='-6.47849' />
+ <node id='-43937' lat='54.11248' lon='-6.36279' />
+ <node id='-43939' lat='54.09337' lon='-6.32694' />
+ <node id='-43941' lat='54.11278' lon='-6.29003' />
+ <node id='-43943' lat='41.91219' lon='-8.81314' />
+ <node id='-43945' lat='41.92553' lon='-8.76914' />
+ <node id='-43947' lat='41.95099' lon='-8.74795' />
+ <node id='-43949' lat='41.9728' lon='-8.73981' />
+ <node id='-43951' lat='41.99703' lon='-8.6681' />
+ <node id='-43953' lat='42.02972' lon='-8.65832' />
+ <node id='-43955' lat='42.0515' lon='-8.62573' />
+ <node id='-43957' lat='42.05755' lon='-8.52958' />
+ <node id='-43959' lat='42.08296' lon='-8.53121' />
+ <node id='-43961' lat='42.08537' lon='-8.44158' />
+ <node id='-43963' lat='42.15307' lon='-8.19225' />
+ <node id='-43965' lat='42.08658' lon='-8.3601' />
+ <node id='-43967' lat='42.06844' lon='-8.18573' />
+ <node id='-43969' lat='42.08537' lon='-8.11729' />
+ <node id='-43971' lat='42.01398' lon='-8.08796' />
+ <node id='-43973' lat='42.05876' lon='-8.08633' />
+ <node id='-43975' lat='41.9134' lon='-8.21507' />
+ <node id='-43977' lat='41.98855' lon='-8.1564' />
+ <node id='-43979' lat='41.87944' lon='-8.16944' />
+ <node id='-43981' lat='41.87459' lon='-8.19551' />
+ <node id='-43983' lat='41.81753' lon='-8.16455' />
+ <node id='-43985' lat='41.81024' lon='-8.0961' />
+ <node id='-43987' lat='41.83453' lon='-8.01136' />
+ <node id='-43989' lat='41.87337' lon='-7.9804' />
+ <node id='-43991' lat='41.8758' lon='-7.92336' />
+ <node id='-43993' lat='41.92432' lon='-7.90707' />
+ <node id='-43995' lat='41.92553' lon='-7.88751' />
+ <node id='-43997' lat='41.84546' lon='-7.88914' />
+ <node id='-43999' lat='41.8758' lon='-6.51374' />
+ <node id='-44001' lat='41.96674' lon='-6.58544' />
+ <node id='-44003' lat='41.99097' lon='-6.81196' />
+ <node id='-44005' lat='41.98855' lon='-7.14115' />
+ <node id='-44007' lat='41.88065' lon='-7.84188' />
+ <node id='-44009' lat='41.90977' lon='-7.69848' />
+ <node id='-44011' lat='41.87944' lon='-7.58603' />
+ <node id='-44013' lat='39.0243' lon='-6.95211' />
+ <node id='-44015' lat='38.21454' lon='-6.93418' />
+ <node id='-44017' lat='38.17227' lon='-7.09389' />
+ <node id='-44019' lat='37.98884' lon='-7.24544' />
+ <node id='-44021' lat='38.00296' lon='-7.12648' />
+ <node id='-44023' lat='38.04404' lon='-7.10366' />
+ <node id='-44025' lat='38.01966' lon='-7.05966' />
+ <node id='-44027' lat='37.90145' lon='-7.27314' />
+ <node id='-44029' lat='37.56119' lon='-7.51759' />
+ <node id='-44031' lat='37.45002' lon='-7.46381' />
+ <node id='-44033' lat='37.75729' lon='-7.41981' />
+ <node id='-44035' lat='38.44336' lon='-7.32529' />
+ <node id='-44037' lat='38.27597' lon='-7.15581' />
+ <node id='-44039' lat='38.72107' lon='-7.26174' />
+ <node id='-44041' lat='38.61674' lon='-7.265' />
+ <node id='-44043' lat='38.87221' lon='-7.03848' />
+ <node id='-44045' lat='38.90393' lon='-7.045' />
+ <node id='-44047' lat='39.27579' lon='-7.23403' />
+ <node id='-44049' lat='39.17101' lon='-7.12811' />
+ <node id='-44051' lat='39.20132' lon='-7.23566' />
+ <node id='-44053' lat='39.11287' lon='-7.14929' />
+ <node id='-44055' lat='39.11919' lon='-7.04011' />
+ <node id='-44057' lat='39.07619' lon='-6.97004' />
+ <node id='-44059' lat='39.10275' lon='-7.10692' />
+ <node id='-44061' lat='39.45847' lon='-7.2927' />
+ <node id='-44063' lat='39.36026' lon='-7.3204' />
+ <node id='-44065' lat='39.58794' lon='-7.49477' />
+ <node id='-44067' lat='39.64569' lon='-7.33507' />
+ <node id='-44069' lat='39.66576' lon='-7.24707' />
+ <node id='-44071' lat='40.18564' lon='-7.02544' />
+ <node id='-44073' lat='40.01986' lon='-6.86737' />
+ <node id='-44075' lat='40.10716' lon='-6.94233' />
+ <node id='-44077' lat='40.12087' lon='-7.00589' />
+ <node id='-44079' lat='39.81488' lon='-6.97492' />
+ <node id='-44081' lat='39.86618' lon='-6.91463' />
+ <node id='-44083' lat='40.56801' lon='-6.84292' />
+ <node id='-44085' lat='40.26776' lon='-6.86085' />
+ <node id='-44087' lat='40.23169' lon='-7.00426' />
+ <node id='-44089' lat='40.36468' lon='-6.78426' />
+ <node id='-44091' lat='40.42177' lon='-6.84618' />
+ <node id='-44093' lat='40.2976' lon='-6.86085' />
+ <node id='-44095' lat='40.33239' lon='-6.80218' />
+ <node id='-44097' lat='40.55067' lon='-6.80218' />
+ <node id='-44099' lat='40.46394' lon='-6.84944' />
+ <node id='-44101' lat='40.51723' lon='-6.7973' />
+ <node id='-44103' lat='40.84472' lon='-6.82337' />
+ <node id='-44105' lat='40.84842' lon='-6.79892' />
+ <node id='-44107' lat='40.88047' lon='-6.80707' />
+ <node id='-44109' lat='40.89771' lon='-6.84292' />
+ <node id='-44111' lat='40.93958' lon='-6.8527' />
+ <node id='-44113' lat='40.74603' lon='-6.82826' />
+ <node id='-44115' lat='40.65955' lon='-6.79567' />
+ <node id='-44117' lat='41.13502' lon='-6.77285' />
+ <node id='-44119' lat='41.03922' lon='-6.913' />
+ <node id='-44121' lat='41.02692' lon='-6.84781' />
+ <node id='-44123' lat='41.10187' lon='-6.75655' />
+ <node id='-44125' lat='41.05397' lon='-6.79241' />
+ <node id='-44127' lat='41.25397' lon='-6.64085' />
+ <node id='-44129' lat='41.24417' lon='-6.55937' />
+ <node id='-44131' lat='41.35558' lon='-6.38826' />
+ <node id='-44133' lat='41.66432' lon='-6.29863' />
+ <node id='-44135' lat='41.74219' lon='-6.56426' />
+ <node id='-44137' lat='41.68623' lon='-6.54633' />
+ <node id='-44139' lat='41.65823' lon='-6.49907' />
+ <node id='-44141' lat='41.68258' lon='-6.44204' />
+ <node id='-44143' lat='41.94371' lon='-6.5447' />
+ <node id='-44145' lat='41.88429' lon='-6.56752' />
+ <node id='-44147' lat='41.98734' lon='-6.76959' />
+ <node id='-44149' lat='41.94129' lon='-6.75004' />
+ <node id='-44151' lat='41.94008' lon='-6.61967' />
+ <node id='-44153' lat='41.94977' lon='-7.01078' />
+ <node id='-44155' lat='41.94493' lon='-6.82174' />
+ <node id='-44157' lat='41.9425' lon='-6.93744' />
+ <node id='-44159' lat='41.96553' lon='-6.95537' />
+ <node id='-44161' lat='41.9728' lon='-6.98144' />
+ <node id='-44163' lat='41.94977' lon='-7.06944' />
+ <node id='-44165' lat='41.97401' lon='-7.08574' />
+ <node id='-44167' lat='41.97401' lon='-7.18189' />
+ <node id='-44169' lat='41.88793' lon='-7.18677' />
+ <node id='-44171' lat='41.8406' lon='-7.32366' />
+ <node id='-44173' lat='41.88308' lon='-7.65774' />
+ <node id='-44175' lat='41.83089' lon='-7.62188' />
+ <node id='-44177' lat='41.83939' lon='-7.52737' />
+ <node id='-44179' lat='41.87095' lon='-7.49803' />
+ <node id='-44181' lat='41.86488' lon='-7.45566' />
+ <node id='-44183' lat='41.80781' lon='-7.42796' />
+ <node id='-44185' lat='41.85031' lon='-7.37092' />
+ <node id='-44187' lat='42.61515' lon='1.73452' />
+ <node id='-44189' lat='42.59098' lon='1.72588' />
+ <node id='-44191' lat='42.57698' lon='1.7858' />
+ <node id='-44193' lat='42.55492' lon='1.73683' />
+ <node id='-44195' lat='42.62957' lon='1.63485' />
+ <node id='-44197' lat='42.61346' lon='1.47986' />
+ <node id='-44199' lat='42.63296' lon='1.46718' />
+ <node id='-44201' lat='42.65203' lon='1.48043' />
+ <node id='-44203' lat='42.65669' lon='1.55418' />
+ <node id='-44205' lat='42.62703' lon='1.60085' />
+ <node id='-44207' lat='42.43724' lon='1.44529' />
+ <node id='-44209' lat='42.50949' lon='1.46661' />
+ <node id='-44211' lat='42.53539' lon='1.41245' />
+ <node id='-44213' lat='42.54431' lon='1.44759' />
+ <node id='-44215' lat='42.48315' lon='1.41648' />
+ <node id='-44217' lat='42.47848' lon='1.43838' />
+ <node id='-44219' lat='42.43299' lon='1.55073' />
+ <node id='-44221' lat='42.47125' lon='1.65674' />
+ <node id='-44223' lat='42.50779' lon='1.66826' />
+ <node id='-44225' lat='42.48867' lon='1.70571' />
+ <node id='-44227' lat='42.45808' lon='1.55937' />
+ <node id='-44229' lat='42.44957' lon='1.57953' />
+ <node id='-44231' lat='42.46275' lon='1.58933' />
+ <node id='-44233' lat='42.42959' lon='1.5127' />
+ <node id='-44235' lat='42.55959' lon='1.4234' />
+ <node id='-44237' lat='42.56722' lon='1.44529' />
+ <node id='-44239' lat='42.58292' lon='1.42512' />
+ <node id='-44241' lat='42.61982' lon='1.6625' />
+ <node id='-44243' lat='42.62533' lon='1.68267' />
+ <node id='-44245' lat='42.64483' lon='1.50867' />
+ <node id='-44247' lat='42.49569' lon='1.98022' />
+ <node id='-44249' lat='42.48487' lon='1.97227' />
+ <node id='-44251' lat='42.48081' lon='1.97003' />
+ <node id='-44253' lat='42.75872' lon='0.65421' />
+ <node id='-44255' lat='42.67431' lon='0.29407' />
+ <node id='-44257' lat='42.72282' lon='0.36251' />
+ <node id='-44259' lat='42.72761' lon='-0.10519' />
+ <node id='-44261' lat='42.79939' lon='-0.44334' />
+ <node id='-44263' lat='42.80776' lon='-0.41319' />
+ <node id='-44265' lat='42.77846' lon='-0.55497' />
+ <node id='-44267' lat='42.92541' lon='-0.72037' />
+ <node id='-44269' lat='42.88303' lon='-0.67637' />
+ <node id='-44271' lat='42.91228' lon='-0.73422' />
+ <node id='-44273' lat='42.87945' lon='-0.69837' />
+ <node id='-44275' lat='42.89318' lon='-0.72608' />
+ <node id='-44277' lat='43.05534' lon='-1.22881' />
+ <node id='-44279' lat='42.99279' lon='-1.00963' />
+ <node id='-44281' lat='42.96239' lon='-0.97133' />
+ <node id='-44283' lat='42.95166' lon='-0.81652' />
+ <node id='-44285' lat='43.0059' lon='-1.10333' />
+ <node id='-44287' lat='43.04164' lon='-1.25244' />
+ <node id='-44289' lat='43.11961' lon='-1.27118' />
+ <node id='-44291' lat='43.09581' lon='-1.30052' />
+ <node id='-44293' lat='43.047' lon='-1.44067' />
+ <node id='-44295' lat='43.29481' lon='-1.73074' />
+ <node id='-44297' lat='43.32979' lon='-1.7397' />
+ <node id='-44299' lat='43.31378' lon='-1.69407' />
+ <node id='-44301' lat='43.30726' lon='-1.62481' />
+ <node id='-44303' lat='43.25269' lon='-1.61341' />
+ <node id='-44305' lat='43.28591' lon='-1.63052' />
+ <node id='-44307' lat='43.25269' lon='-1.57674' />
+ <node id='-44309' lat='43.28828' lon='-1.55963' />
+ <node id='-44311' lat='43.29481' lon='-1.50992' />
+ <node id='-44313' lat='43.27049' lon='-1.45289' />
+ <node id='-44315' lat='43.90498' lon='12.44184' />
+ <node id='-44317' lat='43.89991' lon='12.41641' />
+ <node id='-44319' lat='43.90956' lon='12.41233' />
+ <node id='-44321' lat='43.92379' lon='12.40733' />
+ <node id='-44323' lat='43.92984' lon='12.41551' />
+ <node id='-44325' lat='43.95485' lon='12.40415' />
+ <node id='-44327' lat='43.94325' lon='12.40506' />
+ <node id='-44329' lat='43.95698' lon='12.43662' />
+ <node id='-44331' lat='43.95273' lon='12.41414' />
+ <node id='-44333' lat='43.9578' lon='12.42005' />
+ <node id='-44335' lat='43.96597' lon='12.44684' />
+ <node id='-44337' lat='43.99113' lon='12.50678' />
+ <node id='-44339' lat='43.98508' lon='12.5154' />
+ <node id='-44341' lat='43.97201' lon='12.51109' />
+ <node id='-44343' lat='43.98165' lon='12.51064' />
+ <node id='-44345' lat='43.95796' lon='12.50655' />
+ <node id='-44347' lat='43.94897' lon='12.51427' />
+ <node id='-44349' lat='43.90973' lon='12.49429' />
+ <node id='-44351' lat='43.91774' lon='12.49247' />
+ <node id='-44353' lat='43.93017' lon='12.50496' />
+ <node id='-44355' lat='43.92363' lon='12.50269' />
+ <node id='-44357' lat='43.92248' lon='12.49724' />
+ <node id='-44359' lat='43.93769' lon='12.41165' />
+ <node id='-44361' lat='43.97463' lon='12.46205' />
+ <node id='-44363' lat='43.98492' lon='12.49406' />
+ <node id='-44365' lat='44.03009' lon='7.6597' />
+ <node id='-44367' lat='44.07578' lon='7.72508' />
+ <node id='-44369' lat='44.12795' lon='7.66878' />
+ <node id='-44371' lat='44.17487' lon='7.68694' />
+ <node id='-44373' lat='44.17877' lon='7.63245' />
+ <node id='-44375' lat='44.14881' lon='7.62155' />
+ <node id='-44377' lat='44.11882' lon='7.36364' />
+ <node id='-44379' lat='44.14359' lon='7.34547' />
+ <node id='-44381' lat='44.23736' lon='7.00764' />
+ <node id='-44383' lat='44.20352' lon='7.16929' />
+ <node id='-44385' lat='44.1462' lon='7.27827' />
+ <node id='-44387' lat='44.28289' lon='6.98221' />
+ <node id='-44389' lat='44.49834' lon='6.86233' />
+ <node id='-44391' lat='44.53072' lon='6.85507' />
+ <node id='-44393' lat='44.62129' lon='6.96042' />
+ <node id='-44395' lat='44.66264' lon='6.95133' />
+ <node id='-44397' lat='44.84322' lon='6.90774' />
+ <node id='-44399' lat='44.8664' lon='6.93499' />
+ <node id='-44401' lat='44.82519' lon='7.02217' />
+ <node id='-44403' lat='44.68073' lon='7.07484' />
+ <node id='-44405' lat='44.78782' lon='7.00401' />
+ <node id='-44407' lat='44.69364' lon='7.00582' />
+ <node id='-44409' lat='45.01939' lon='6.74791' />
+ <node id='-44411' lat='45.02324' lon='6.66981' />
+ <node id='-44413' lat='45.11175' lon='6.62803' />
+ <node id='-44415' lat='45.16044' lon='6.7697' />
+ <node id='-44417' lat='45.13226' lon='6.85144' />
+ <node id='-44419' lat='45.25386' lon='7.13115' />
+ <node id='-44421' lat='45.32924' lon='7.10572' />
+ <node id='-44423' lat='45.40071' lon='7.18019' />
+ <node id='-44425' lat='45.509' lon='7.00037' />
+ <node id='-44427' lat='45.63869' lon='6.98948' />
+ <node id='-44429' lat='45.71864' lon='6.80785' />
+ <node id='-44431' lat='45.83265' lon='6.80785' />
+ <node id='-44433' lat='45.85163' lon='6.95315' />
+ <node id='-44435' lat='45.97421' lon='7.56343' />
+ <node id='-44437' lat='45.91485' lon='7.85949' />
+ <node id='-44439' lat='45.99945' lon='7.9049' />
+ <node id='-44441' lat='46.39171' lon='6.8024' />
+ <node id='-44443' lat='46.06502' lon='6.93862' />
+ <node id='-44445' lat='45.9944' lon='7.00946' />
+ <node id='-44447' lat='46.03855' lon='6.87868' />
+ <node id='-44449' lat='46.12548' lon='6.89321' />
+ <node id='-44451' lat='46.14058' lon='6.78968' />
+ <node id='-44453' lat='46.28512' lon='6.86052' />
+ <node id='-44455' lat='46.34784' lon='6.77152' />
+ <node id='-44457' lat='46.57649' lon='6.11084' />
+ <node id='-44459' lat='46.41676' lon='6.06407' />
+ <node id='-44461' lat='46.54402' lon='6.1567' />
+ <node id='-44463' lat='46.46244' lon='6.07269' />
+ <node id='-44465' lat='46.36759' lon='6.16987' />
+ <node id='-44467' lat='46.45431' lon='6.53358' />
+ <node id='-44469' lat='46.28512' lon='6.1013' />
+ <node id='-44471' lat='46.3632' lon='6.25432' />
+ <node id='-44473' lat='46.31304' lon='6.21981' />
+ <node id='-44475' lat='46.24745' lon='6.26749' />
+ <node id='-44477' lat='46.25059' lon='6.12446' />
+ <node id='-44479' lat='46.21478' lon='5.97053' />
+ <node id='-44481' lat='46.12925' lon='5.95781' />
+ <node id='-44483' lat='46.17392' lon='5.98188' />
+ <node id='-44485' lat='46.16543' lon='6.18803' />
+ <node id='-44487' lat='46.26221' lon='6.29474' />
+ <node id='-44489' lat='46.22421' lon='6.29337' />
+ <node id='-44491' lat='46.303' lon='6.24638' />
+ <node id='-44493' lat='46.27822' lon='6.23775' />
+ <node id='-44495' lat='46.29014' lon='6.25137' />
+ <node id='-44497' lat='46.244' lon='6.31222' />
+ <node id='-44499' lat='46.20567' lon='6.24774' />
+ <node id='-44501' lat='46.20661' lon='6.23321' />
+ <node id='-44503' lat='46.17895' lon='6.18553' />
+ <node id='-44505' lat='46.1409' lon='6.12968' />
+ <node id='-44507' lat='46.14373' lon='6.09926' />
+ <node id='-44509' lat='46.13712' lon='6.03614' />
+ <node id='-44511' lat='46.15191' lon='6.05203' />
+ <node id='-44513' lat='46.15191' lon='6.09199' />
+ <node id='-44515' lat='46.14939' lon='6.07655' />
+ <node id='-44517' lat='46.13303' lon='5.97893' />
+ <node id='-44519' lat='46.14499' lon='5.9871' />
+ <node id='-44521' lat='46.17046' lon='5.98846' />
+ <node id='-44523' lat='46.19561' lon='5.96576' />
+ <node id='-44525' lat='46.18587' lon='5.99573' />
+ <node id='-44527' lat='46.23866' lon='6.03523' />
+ <node id='-44529' lat='46.23175' lon='6.04568' />
+ <node id='-44531' lat='46.24494' lon='6.06202' />
+ <node id='-44533' lat='46.24651' lon='6.08563' />
+ <node id='-44535' lat='46.23772' lon='6.10243' />
+ <node id='-44537' lat='46.33844' lon='6.13876' />
+ <node id='-44539' lat='46.29547' lon='6.11697' />
+ <node id='-44541' lat='46.31116' lon='6.11878' />
+ <node id='-44543' lat='46.3491' lon='6.15738' />
+ <node id='-44545' lat='46.40768' lon='6.09926' />
+ <node id='-44547' lat='46.44305' lon='6.08427' />
+ <node id='-44549' lat='46.68251' lon='6.27135' />
+ <node id='-44551' lat='46.73171' lon='6.38351' />
+ <node id='-44553' lat='46.88865' lon='6.46456' />
+ <node id='-44555' lat='47.35335' lon='6.87959' />
+ <node id='-44557' lat='47.36996' lon='7.03125' />
+ <node id='-44559' lat='47.28747' lon='6.94316' />
+ <node id='-44561' lat='47.33304' lon='7.05305' />
+ <node id='-44563' lat='47.43388' lon='6.93953' />
+ <node id='-44565' lat='47.45415' lon='6.99674' />
+ <node id='-44567' lat='47.53821' lon='7.49691' />
+ <node id='-44569' lat='47.4695' lon='7.45264' />
+ <node id='-44571' lat='47.48362' lon='7.42357' />
+ <node id='-44573' lat='47.49712' lon='7.43356' />
+ <node id='-44575' lat='47.47932' lon='7.47534' />
+ <node id='-44577' lat='47.49651' lon='7.51076' />
+ <node id='-44579' lat='47.51798' lon='7.49804' />
+ <node id='-44581' lat='47.51644' lon='7.5229' />
+ <node id='-44583' lat='47.52856' lon='7.50588' />
+ <node id='-44585' lat='47.53515' lon='7.51904' />
+ <node id='-44587' lat='47.5284' lon='7.53199' />
+ <node id='-44589' lat='47.57785' lon='7.56684' />
+ <node id='-44591' lat='47.57536' lon='7.58386' />
+ <node id='-44593' lat='47.54546' lon='7.50873' />
+ <node id='-44595' lat='47.54578' lon='7.51723' />
+ <node id='-44597' lat='47.55347' lon='7.52831' />
+ <node id='-44599' lat='47.55553' lon='7.53634' />
+ <node id='-44601' lat='47.56507' lon='7.55721' />
+ <node id='-44603' lat='47.57232' lon='7.55689' />
+ <node id='-44605' lat='47.60058' lon='7.59301' />
+ <node id='-44607' lat='47.61628' lon='7.57423' />
+ <node id='-44609' lat='47.60794' lon='7.58851' />
+ <node id='-44611' lat='46.10331' lon='8.02906' />
+ <node id='-44613' lat='46.11577' lon='8.11383' />
+ <node id='-44615' lat='46.1834' lon='8.15493' />
+ <node id='-44617' lat='46.26692' lon='8.08814' />
+ <node id='-44619' lat='46.38044' lon='8.31162' />
+ <node id='-44621' lat='46.41587' lon='8.30648' />
+ <node id='-44623' lat='46.46367' lon='8.42464' />
+ <node id='-44625' lat='46.26869' lon='8.45032' />
+ <node id='-44627' lat='46.43712' lon='8.46317' />
+ <node id='-44629' lat='46.12112' lon='8.62242' />
+ <node id='-44631' lat='46.0748' lon='8.85617' />
+ <node id='-44633' lat='45.99063' lon='8.78551' />
+ <node id='-44635' lat='45.86682' lon='8.9408' />
+ <node id='-44637' lat='45.95465' lon='8.88904' />
+ <node id='-44639' lat='45.89906' lon='9.09065' />
+ <node id='-44641' lat='45.82127' lon='9.0298' />
+ <node id='-44643' lat='45.8333' lon='8.90992' />
+ <node id='-44645' lat='45.83899' lon='8.97077' />
+ <node id='-44647' lat='45.9698' lon='8.99257' />
+ <node id='-44649' lat='46.04928' lon='9.01618' />
+ <node id='-44651' lat='46.23616' lon='9.24503' />
+ <node id='-44653' lat='46.49685' lon='9.28136' />
+ <node id='-44655' lat='46.50873' lon='9.45936' />
+ <node id='-44657' lat='46.37481' lon='9.46117' />
+ <node id='-44659' lat='46.32717' lon='9.29226' />
+ <node id='-44661' lat='46.43743' lon='9.25502' />
+ <node id='-44663' lat='46.5081' lon='9.36128' />
+ <node id='-44665' lat='46.46621' lon='9.40487' />
+ <node id='-44667' lat='46.2958' lon='9.57015' />
+ <node id='-44669' lat='46.29266' lon='9.71273' />
+ <node id='-44671' lat='46.38045' lon='9.95249' />
+ <node id='-44673' lat='46.21668' lon='10.07055' />
+ <node id='-44675' lat='46.25626' lon='10.17862' />
+ <node id='-44677' lat='46.3372' lon='10.10506' />
+ <node id='-44679' lat='46.41051' lon='10.165' />
+ <node id='-44681' lat='46.57432' lon='10.25309' />
+ <node id='-44683' lat='46.63484' lon='10.23674' />
+ <node id='-44685' lat='46.67847' lon='10.38659' />
+ <node id='-44687' lat='46.63671' lon='10.40475' />
+ <node id='-44689' lat='46.62049' lon='10.49375' />
+ <node id='-44691' lat='46.86942' lon='10.22675' />
+ <node id='-44693' lat='46.93147' lon='10.24128' />
+ <node id='-44695' lat='47.00212' lon='10.36933' />
+ <node id='-44697' lat='46.92093' lon='10.30031' />
+ <node id='-44699' lat='46.93891' lon='10.48376' />
+ <node id='-44701' lat='47.17124' lon='9.56539' />
+ <node id='-44703' lat='47.14685' lon='9.62623' />
+ <node id='-44705' lat='47.07732' lon='9.61216' />
+ <node id='-44707' lat='47.08443' lon='9.63395' />
+ <node id='-44709' lat='47.22585' lon='9.55176' />
+ <node id='-44711' lat='47.24281' lon='9.56766' />
+ <node id='-44713' lat='47.20673' lon='9.58264' />
+ <node id='-44715' lat='47.21845' lon='9.56947' />
+ <node id='-44717' lat='47.05257' lon='9.47548' />
+ <node id='-44719' lat='47.06495' lon='9.54041' />
+ <node id='-44721' lat='47.04762' lon='9.55721' />
+ <node id='-44723' lat='47.06402' lon='9.47139' />
+ <node id='-44725' lat='47.08505' lon='9.51362' />
+ <node id='-44727' lat='47.10019' lon='9.52089' />
+ <node id='-44729' lat='47.13727' lon='9.51044' />
+ <node id='-44731' lat='47.17402' lon='9.48774' />
+ <node id='-44733' lat='47.19346' lon='9.4891' />
+ <node id='-44735' lat='47.24959' lon='9.52406' />
+ <node id='-44737' lat='47.22153' lon='9.50318' />
+ <node id='-44739' lat='47.29919' lon='9.55857' />
+ <node id='-44741' lat='47.34671' lon='9.59978' />
+ <node id='-44743' lat='47.36639' lon='9.62476' />
+ <node id='-44745' lat='47.36824' lon='9.65427' />
+ <node id='-44747' lat='47.48344' lon='9.58208' />
+ <node id='-44749' lat='47.4641' lon='9.59388' />
+ <node id='-44751' lat='47.46165' lon='9.60205' />
+ <node id='-44753' lat='47.47178' lon='9.60841' />
+ <node id='-44755' lat='47.45858' lon='9.62158' />
+ <node id='-44757' lat='47.45489' lon='9.65518' />
+ <node id='-44759' lat='47.45059' lon='9.66018' />
+ <node id='-44761' lat='47.4377' lon='9.64565' />
+ <node id='-44763' lat='47.42019' lon='9.65155' />
+ <node id='-44765' lat='47.40452' lon='9.65291' />
+ <node id='-44767' lat='47.39591' lon='9.6629' />
+ <node id='-44769' lat='47.37746' lon='9.67153' />
+ <node id='-44771' lat='47.39191' lon='9.67334' />
+ <node id='-44773' lat='47.56158' lon='7.63381' />
+ <node id='-44775' lat='47.58519' lon='7.60523' />
+ <node id='-44777' lat='47.57869' lon='7.60459' />
+ <node id='-44779' lat='47.57782' lon='7.62032' />
+ <node id='-44781' lat='47.5958' lon='7.64601' />
+ <node id='-44783' lat='47.59212' lon='7.67395' />
+ <node id='-44785' lat='47.56569' lon='7.67587' />
+ <node id='-44787' lat='47.57133' lon='7.68904' />
+ <node id='-44789' lat='47.59905' lon='7.68229' />
+ <node id='-44791' lat='47.60099' lon='7.69385' />
+ <node id='-44793' lat='47.59601' lon='7.68486' />
+ <node id='-44795' lat='47.5867' lon='7.6733' />
+ <node id='-44797' lat='47.54662' lon='7.65083' />
+ <node id='-44799' lat='47.54554' lon='7.66174' />
+ <node id='-44801' lat='47.53752' lon='7.6656' />
+ <node id='-44803' lat='47.53232' lon='7.68101' />
+ <node id='-44805' lat='47.53297' lon='7.69642' />
+ <node id='-44807' lat='47.5841' lon='7.84412' />
+ <node id='-44809' lat='47.55031' lon='7.91251' />
+ <node id='-44811' lat='47.57674' lon='7.90673' />
+ <node id='-44813' lat='47.54511' lon='7.94494' />
+ <node id='-44815' lat='47.55789' lon='7.95682' />
+ <node id='-44817' lat='47.55096' lon='8.02136' />
+ <node id='-44819' lat='47.55616' lon='8.00113' />
+ <node id='-44821' lat='47.56374' lon='8.06663' />
+ <node id='-44823' lat='47.55768' lon='8.08557' />
+ <node id='-44825' lat='47.56504' lon='8.10002' />
+ <node id='-44827' lat='47.55443' lon='8.04383' />
+ <node id='-44829' lat='47.58432' lon='8.13662' />
+ <node id='-44831' lat='47.5841' lon='8.11543' />
+ <node id='-44833' lat='47.59147' lon='8.13823' />
+ <node id='-44835' lat='47.59558' lon='8.14947' />
+ <node id='-44837' lat='47.5945' lon='8.1652' />
+ <node id='-44839' lat='47.61636' lon='8.19378' />
+ <node id='-44841' lat='47.60576' lon='8.22492' />
+ <node id='-44843' lat='47.6181' lon='8.22011' />
+ <node id='-44845' lat='47.61204' lon='8.23809' />
+ <node id='-44847' lat='47.61571' lon='8.25863' />
+ <node id='-44849' lat='47.6103' lon='8.26313' />
+ <node id='-44851' lat='47.61225' lon='8.2824' />
+ <node id='-44853' lat='47.5919' lon='8.29524' />
+ <node id='-44855' lat='47.57133' lon='8.32735' />
+ <node id='-44857' lat='47.57826' lon='8.39477' />
+ <node id='-44859' lat='47.56699' lon='8.4333' />
+ <node id='-44861' lat='47.58107' lon='8.49431' />
+ <node id='-44863' lat='47.588' lon='8.48949' />
+ <node id='-44865' lat='47.58389' lon='8.46637' />
+ <node id='-44867' lat='47.60121' lon='8.45578' />
+ <node id='-44869' lat='47.62394' lon='8.55756' />
+ <node id='-44871' lat='47.59537' lon='8.57586' />
+ <node id='-44873' lat='47.61204' lon='8.60348' />
+ <node id='-44875' lat='47.64298' lon='8.59545' />
+ <node id='-44877' lat='47.65098' lon='8.62884' />
+ <node id='-44879' lat='47.65271' lon='8.60701' />
+ <node id='-44881' lat='47.63757' lon='8.62049' />
+ <node id='-44883' lat='47.63735' lon='8.60412' />
+ <node id='-44885' lat='47.64514' lon='8.61471' />
+ <node id='-44887' lat='47.67088' lon='8.56141' />
+ <node id='-44889' lat='47.66158' lon='8.57683' />
+ <node id='-44891' lat='47.65379' lon='8.44711' />
+ <node id='-44893' lat='47.65747' lon='8.4667' />
+ <node id='-44895' lat='47.64103' lon='8.46605' />
+ <node id='-44897' lat='47.64687' lon='8.5322' />
+ <node id='-44899' lat='47.64709' lon='8.49656' />
+ <node id='-44901' lat='47.67499' lon='8.40473' />
+ <node id='-44903' lat='47.68407' lon='8.4211' />
+ <node id='-44905' lat='47.69855' lon='8.40569' />
+ <node id='-44907' lat='47.72426' lon='8.44807' />
+ <node id='-44909' lat='47.7493' lon='8.45771' />
+ <node id='-44911' lat='47.72879' lon='8.71264' />
+ <node id='-44913' lat='47.75168' lon='8.74251' />
+ <node id='-44915' lat='47.76571' lon='8.71778' />
+ <node id='-44917' lat='47.80066' lon='8.65292' />
+ <node id='-44919' lat='47.76398' lon='8.64425' />
+ <node id='-44921' lat='47.78599' lon='8.68022' />
+ <node id='-44923' lat='47.75686' lon='8.68985' />
+ <node id='-44925' lat='47.68969' lon='8.65967' />
+ <node id='-44927' lat='47.71367' lon='8.66416' />
+ <node id='-44929' lat='47.71453' lon='8.70237' />
+ <node id='-44931' lat='47.69088' lon='8.71773' />
+ <node id='-44933' lat='47.6979' lon='8.67508' />
+ <node id='-44935' lat='47.68536' lon='8.66898' />
+ <node id='-44937' lat='47.69552' lon='8.68985' />
+ <node id='-44939' lat='47.68904' lon='8.70847' />
+ <node id='-44941' lat='47.68969' lon='8.75856' />
+ <node id='-44943' lat='47.70222' lon='8.79966' />
+ <node id='-44945' lat='47.67045' lon='8.87383' />
+ <node id='-44947' lat='47.65596' lon='8.94093' />
+ <node id='-44949' lat='47.67801' lon='9.09891' />
+ <node id='-44951' lat='47.6672' lon='9.15413' />
+ <node id='-44953' lat='50.13668' lon='6.1137' />
+ <node id='-44955' lat='50.17246' lon='6.08577' />
+ <node id='-44957' lat='50.16374' lon='6.12028' />
+ <node id='-44959' lat='50.02683' lon='5.8551' />
+ <node id='-44961' lat='49.97823' lon='5.83467' />
+ <node id='-44963' lat='49.99662' lon='5.82331' />
+ <node id='-44965' lat='49.93646' lon='5.77314' />
+ <node id='-44967' lat='49.96056' lon='5.77291' />
+ <node id='-44969' lat='49.96451' lon='5.80833' />
+ <node id='-44971' lat='49.85368' lon='5.74567' />
+ <node id='-44973' lat='49.85631' lon='5.75861' />
+ <node id='-44975' lat='49.84811' lon='5.75884' />
+ <node id='-44977' lat='49.84709' lon='5.74953' />
+ <node id='-44979' lat='49.83933' lon='5.74975' />
+ <node id='-44981' lat='49.81428' lon='5.74953' />
+ <node id='-44983' lat='49.74729' lon='5.83149' />
+ <node id='-44985' lat='49.72161' lon='5.84193' />
+ <node id='-44987' lat='49.6511' lon='5.90164' />
+ <node id='-44989' lat='49.63507' lon='5.88552' />
+ <node id='-44991' lat='49.62802' lon='5.88393' />
+ <node id='-44993' lat='49.58756' lon='5.86986' />
+ <node id='-44995' lat='49.5425' lon='5.83648' />
+ <node id='-44997' lat='49.53027' lon='5.84466' />
+ <node id='-44999' lat='49.52717' lon='5.83467' />
+ <node id='-45001' lat='49.45594' lon='6.08373' />
+ <node id='-45003' lat='49.4735' lon='6.12346' />
+ <node id='-45005' lat='49.4707' lon='6.10325' />
+ <node id='-45007' lat='49.48796' lon='6.14321' />
+ <node id='-45009' lat='49.49297' lon='6.16115' />
+ <node id='-45011' lat='49.50226' lon='6.15366' />
+ <node id='-45013' lat='49.50934' lon='6.17386' />
+ <node id='-45015' lat='49.50536' lon='6.19543' />
+ <node id='-45017' lat='49.503' lon='6.27875' />
+ <node id='-45019' lat='49.48471' lon='6.29033' />
+ <node id='-45021' lat='49.55855' lon='6.38228' />
+ <node id='-45023' lat='49.57593' lon='6.38024' />
+ <node id='-45025' lat='49.5799' lon='6.38342' />
+ <node id='-45027' lat='49.66021' lon='6.43768' />
+ <node id='-45029' lat='49.67799' lon='6.44654' />
+ <node id='-45031' lat='49.72645' lon='6.49535' />
+ <node id='-45033' lat='49.73291' lon='6.50193' />
+ <node id='-45035' lat='49.72058' lon='6.51397' />
+ <node id='-45037' lat='49.72425' lon='6.51805' />
+ <node id='-45039' lat='49.72718' lon='6.50261' />
+ <node id='-45041' lat='49.71353' lon='6.50647' />
+ <node id='-45043' lat='49.72205' lon='6.49694' />
+ <node id='-45045' lat='49.71808' lon='6.5042' />
+ <node id='-45047' lat='49.69767' lon='6.48014' />
+ <node id='-45049' lat='49.71118' lon='6.49785' />
+ <node id='-45051' lat='49.78952' lon='6.50534' />
+ <node id='-45053' lat='49.79787' lon='6.52169' />
+ <node id='-45055' lat='49.80666' lon='6.53122' />
+ <node id='-45057' lat='49.78336' lon='6.51669' />
+ <node id='-45059' lat='49.77515' lon='6.51056' />
+ <node id='-45061' lat='49.76855' lon='6.51828' />
+ <node id='-45063' lat='49.75961' lon='6.51646' />
+ <node id='-45065' lat='49.80124' lon='6.51215' />
+ <node id='-45067' lat='49.81267' lon='6.48718' />
+ <node id='-45069' lat='49.80916' lon='6.50647' />
+ <node id='-45071' lat='49.81091' lon='6.42905' />
+ <node id='-45073' lat='49.81443' lon='6.44131' />
+ <node id='-45075' lat='49.82029' lon='6.40022' />
+ <node id='-45077' lat='49.87592' lon='6.28874' />
+ <node id='-45079' lat='49.86685' lon='6.29692' />
+ <node id='-45081' lat='49.87021' lon='6.30963' />
+ <node id='-45083' lat='49.85133' lon='6.32303' />
+ <node id='-45085' lat='49.83728' lon='6.32098' />
+ <node id='-45087' lat='49.929' lon='6.22608' />
+ <node id='-45089' lat='49.92403' lon='6.21882' />
+ <node id='-45091' lat='49.92096' lon='6.22926' />
+ <node id='-45093' lat='49.96611' lon='6.18045' />
+ <node id='-45095' lat='49.96991' lon='6.19089' />
+ <node id='-45097' lat='50.04141' lon='6.13458' />
+ <node id='-45099' lat='35.04378' lon='-2.21445' />
+ <node id='-45101' lat='34.93218' lon='-2.04734' />
+ <node id='-45103' lat='34.886' lon='-1.97469' />
+ <node id='-45105' lat='34.93218' lon='-1.97833' />
+ <node id='-45107' lat='33.71721' lon='-1.73494' />
+ <node id='-45109' lat='33.59929' lon='-1.59508' />
+ <node id='-45111' lat='33.0499' lon='-1.46249' />
+ <node id='-45113' lat='32.32993' lon='-1.24998' />
+ <node id='-45115' lat='32.12096' lon='-1.15735' />
+ <node id='-45117' lat='32.1917' lon='-1.24453' />
+ <node id='-45119' lat='31.39202' lon='-3.66386' />
+ <node id='-45121' lat='31.31912' lon='-3.77647' />
+ <node id='-45123' lat='31.14984' lon='-3.77103' />
+ <node id='-45125' lat='31.0503' lon='-3.54944' />
+ <node id='-45127' lat='30.53229' lon='-4.31774' />
+ <node id='-45129' lat='29.36252' lon='-7.61585' />
+ <node id='-45131' lat='51.00326' lon='2.57551' />
+ <node id='-45133' lat='50.81457' lon='2.63331' />
+ <node id='-45135' lat='50.91751' lon='2.59093' />
+ <node id='-45137' lat='50.94746' lon='2.63074' />
+ <node id='-45139' lat='50.81295' lon='2.71165' />
+ <node id='-45141' lat='50.71953' lon='2.80284' />
+ <node id='-45143' lat='50.69432' lon='2.90559' />
+ <node id='-45145' lat='50.75204' lon='2.95054' />
+ <node id='-45147' lat='50.79347' lon='3.1342' />
+ <node id='-45149' lat='50.71302' lon='3.21382' />
+ <node id='-45151' lat='50.71058' lon='3.24465' />
+ <node id='-45153' lat='50.67804' lon='3.26134' />
+ <node id='-45155' lat='50.52724' lon='3.28575' />
+ <node id='-45157' lat='50.60718' lon='3.2729' />
+ <node id='-45159' lat='50.6585' lon='3.23951' />
+ <node id='-45161' lat='50.49538' lon='3.37693' />
+ <node id='-45163' lat='50.51009' lon='3.44629' />
+ <node id='-45165' lat='50.53703' lon='3.47197' />
+ <node id='-45167' lat='50.5256' lon='3.51564' />
+ <node id='-45169' lat='50.48885' lon='3.49509' />
+ <node id='-45171' lat='50.50192' lon='3.5683' />
+ <node id='-45173' lat='50.48231' lon='3.63251' />
+ <node id='-45175' lat='50.44307' lon='3.66334' />
+ <node id='-45177' lat='50.34563' lon='3.66976' />
+ <node id='-45179' lat='50.30464' lon='3.70701' />
+ <node id='-45181' lat='50.34809' lon='3.73911' />
+ <node id='-45183' lat='50.35219' lon='3.84314' />
+ <node id='-45185' lat='50.32924' lon='3.89709' />
+ <node id='-45187' lat='50.35793' lon='4.0268' />
+ <node id='-45189' lat='50.30054' lon='4.12056' />
+ <node id='-45191' lat='50.26114' lon='4.13854' />
+ <node id='-45193' lat='50.25786' lon='4.16808' />
+ <node id='-45195' lat='50.2833' lon='4.15524' />
+ <node id='-45197' lat='50.29151' lon='4.1745' />
+ <node id='-45199' lat='50.27756' lon='4.17964' />
+ <node id='-45201' lat='50.27674' lon='4.21046' />
+ <node id='-45203' lat='50.25539' lon='4.21945' />
+ <node id='-45205' lat='50.21103' lon='4.15524' />
+ <node id='-45207' lat='50.13453' lon='4.13725' />
+ <node id='-45209' lat='50.13535' lon='4.20147' />
+ <node id='-45211' lat='50.06945' lon='4.23101' />
+ <node id='-45213' lat='50.04719' lon='4.16294' />
+ <node id='-45215' lat='49.98034' lon='4.14239' />
+ <node id='-45217' lat='49.95803' lon='4.20532' />
+ <node id='-45219' lat='49.97043' lon='4.31963' />
+ <node id='-45221' lat='49.93737' lon='4.44678' />
+ <node id='-45223' lat='49.99685' lon='4.68695' />
+ <node id='-45225' lat='50.09665' lon='4.70107' />
+ <node id='-45227' lat='50.16169' lon='4.81795' />
+ <node id='-45229' lat='50.15182' lon='4.88602' />
+ <node id='-45231' lat='49.70287' lon='5.14545' />
+ <node id='-45233' lat='49.69456' lon='5.26232' />
+ <node id='-45235' lat='49.5006' lon='5.47039' />
+ <node id='-45237' lat='49.61225' lon='5.3137' />
+ <node id='-45239' lat='49.63055' lon='5.30214' />
+ <node id='-45241' lat='49.61641' lon='5.41131' />
+ <node id='-45243' lat='49.62889' lon='5.34837' />
+ <node id='-45245' lat='49.6555' lon='5.33039' />
+ <node id='-45247' lat='49.52729' lon='5.55001' />
+ <node id='-45249' lat='49.51228' lon='5.60909' />
+ <node id='-45251' lat='49.55146' lon='5.64505' />
+ <node id='-45253' lat='49.86457' lon='4.85134' />
+ <node id='-45255' lat='49.82316' lon='4.87189' />
+ <node id='-45257' lat='49.47683' lon='6.42432' />
+ <node id='-45259' lat='49.42464' lon='6.55404' />
+ <node id='-45261' lat='49.40626' lon='6.53798' />
+ <node id='-45263' lat='49.36864' lon='6.60091' />
+ <node id='-45265' lat='49.35358' lon='6.58807' />
+ <node id='-45267' lat='49.35944' lon='6.55982' />
+ <node id='-45269' lat='49.31425' lon='6.59963' />
+ <node id='-45271' lat='49.21661' lon='6.69274' />
+ <node id='-45273' lat='49.2208' lon='6.71843' />
+ <node id='-45275' lat='49.20486' lon='6.73256' />
+ <node id='-45277' lat='49.18808' lon='6.71137' />
+ <node id='-45279' lat='49.16331' lon='6.73577' />
+ <node id='-45281' lat='49.16793' lon='6.78265' />
+ <node id='-45283' lat='49.15365' lon='6.83145' />
+ <node id='-45285' lat='49.15869' lon='6.84686' />
+ <node id='-45287' lat='49.21283' lon='6.83916' />
+ <node id='-45289' lat='49.22248' lon='6.86163' />
+ <node id='-45291' lat='49.21032' lon='6.88603' />
+ <node id='-45293' lat='49.22542' lon='6.93034' />
+ <node id='-45295' lat='49.18472' lon='6.8565' />
+ <node id='-45297' lat='49.2057' lon='6.95603' />
+ <node id='-45299' lat='49.2099' lon='6.97273' />
+ <node id='-45301' lat='49.19018' lon='7.01318' />
+ <node id='-45303' lat='49.19018' lon='7.03116' />
+ <node id='-45305' lat='49.11668' lon='7.04401' />
+ <node id='-45307' lat='49.11163' lon='7.05557' />
+ <node id='-45309' lat='49.11584' lon='7.06969' />
+ <node id='-45311' lat='49.15155' lon='7.08254' />
+ <node id='-45313' lat='49.1255' lon='7.07162' />
+ <node id='-45315' lat='49.13055' lon='7.08767' />
+ <node id='-45317' lat='49.15575' lon='7.1063' />
+ <node id='-45319' lat='49.14063' lon='7.10565' />
+ <node id='-45321' lat='49.14399' lon='7.12556' />
+ <node id='-45323' lat='49.12046' lon='7.1551' />
+ <node id='-45325' lat='49.14399' lon='7.35995' />
+ <node id='-45327' lat='49.12971' lon='7.23473' />
+ <node id='-45329' lat='49.11584' lon='7.29188' />
+ <node id='-45331' lat='49.14231' lon='7.3195' />
+ <node id='-45333' lat='49.18388' lon='7.43701' />
+ <node id='-45335' lat='49.16709' lon='7.44215' />
+ <node id='-45337' lat='49.09818' lon='7.53012' />
+ <node id='-45339' lat='49.08136' lon='7.56416' />
+ <node id='-45341' lat='49.07654' lon='7.62575' />
+ <node id='-45343' lat='49.04917' lon='7.76197' />
+ <node id='-45345' lat='49.06583' lon='7.79557' />
+ <node id='-45347' lat='48.97352' lon='8.22604' />
+ <node id='-45349' lat='48.64217' lon='7.84098' />
+ <node id='-45351' lat='48.75606' lon='7.96994' />
+ <node id='-45353' lat='48.79017' lon='8.0326' />
+ <node id='-45355' lat='48.76085' lon='8.01534' />
+ <node id='-45357' lat='48.72491' lon='7.96812' />
+ <node id='-45359' lat='48.66317' lon='7.89002' />
+ <node id='-45361' lat='48.78957' lon='8.06802' />
+ <node id='-45363' lat='48.81829' lon='8.10253' />
+ <node id='-45365' lat='48.30018' lon='7.69022' />
+ <node id='-45367' lat='48.39192' lon='7.73109' />
+ <node id='-45369' lat='48.32736' lon='7.74562' />
+ <node id='-45371' lat='48.48832' lon='7.77014' />
+ <node id='-45373' lat='48.51239' lon='7.80647' />
+ <node id='-45375' lat='48.11559' lon='7.5767' />
+ <node id='-45377' lat='48.03185' lon='7.57035' />
+ <node id='-45379' lat='48.22219' lon='7.6648' />
+ <node id='-45381' lat='47.87371' lon='7.55673' />
+ <node id='-45383' lat='47.97898' lon='7.62302' />
+ <node id='-45385' lat='46.72716' lon='49.01136' />
+ <node id='-45387' lat='46.38542' lon='49.16518' />
+ <node id='-45389' lat='46.56267' lon='48.54988' />
+ <node id='-45391' lat='46.69268' lon='48.51142' />
+ <node id='-45393' lat='47.4102' lon='48.52326' />
+ <node id='-45395' lat='47.74545' lon='48.15348' />
+ <node id='-45397' lat='47.83687' lon='47.41689' />
+ <node id='-45399' lat='47.68176' lon='47.38731' />
+ <node id='-45401' lat='48.27188' lon='47.11516' />
+ <node id='-45403' lat='47.83687' lon='47.12107' />
+ <node id='-45405' lat='49.23531' lon='46.98795' />
+ <node id='-45407' lat='48.99715' lon='46.91104' />
+ <node id='-45409' lat='49.07085' lon='47.01458' />
+ <node id='-45411' lat='49.17152' lon='47.04416' />
+ <node id='-45413' lat='49.93721' lon='47.18319' />
+ <node id='-45415' lat='50.09308' lon='47.34589' />
+ <node id='-45417' lat='50.30894' lon='47.30448' />
+ <node id='-45419' lat='50.47867' lon='47.58551' />
+ <node id='-45421' lat='49.86099' lon='48.24519' />
+ <node id='-45423' lat='49.82283' lon='48.42564' />
+ <node id='-45425' lat='50.02281' lon='48.90782' />
+ <node id='-45427' lat='50.63278' lon='48.57946' />
+ <node id='-45429' lat='50.85927' lon='49.41959' />
+ <node id='-45431' lat='51.09396' lon='49.39001' />
+ <node id='-45433' lat='51.11067' lon='49.76866' />
+ <node id='-45435' lat='50.78639' lon='49.12673' />
+ <node id='-45437' lat='50.61589' lon='48.86936' />
+ <node id='-45439' lat='51.2405' lon='49.97277' />
+ <node id='-45441' lat='51.28677' lon='50.26859' />
+ <node id='-45443' lat='51.61859' lon='50.59695' />
+ <node id='-45445' lat='51.68466' lon='51.26254' />
+ <node id='-45447' lat='51.48799' lon='51.301' />
+ <node id='-45449' lat='51.49536' lon='51.77431' />
+ <node id='-45451' lat='51.67916' lon='51.8246' />
+ <node id='-45453' lat='51.76712' lon='52.31862' />
+ <node id='-45455' lat='51.4622' lon='52.57007' />
+ <node id='-45457' lat='50.85554' lon='54.46331' />
+ <node id='-45459' lat='50.61214' lon='54.41894' />
+ <node id='-45461' lat='50.52006' lon='54.55797' />
+ <node id='-45463' lat='50.61214' lon='54.71476' />
+ <node id='-45465' lat='51.01958' lon='54.56685' />
+ <node id='-45467' lat='51.03261' lon='54.72067' />
+ <node id='-45469' lat='50.7471' lon='56.11398' />
+ <node id='-45471' lat='50.93204' lon='56.17906' />
+ <node id='-45473' lat='51.11253' lon='57.17302' />
+ <node id='-45475' lat='50.88354' lon='57.44221' />
+ <node id='-45477' lat='50.93017' lon='57.74986' />
+ <node id='-45479' lat='51.13852' lon='57.75578' />
+ <node id='-45481' lat='51.15151' lon='58.3208' />
+ <node id='-45483' lat='50.64216' lon='59.48928' />
+ <node id='-45485' lat='50.49937' lon='59.51886' />
+ <node id='-45487' lat='50.54451' lon='59.81172' />
+ <node id='-45489' lat='50.8163' lon='60.01288' />
+ <node id='-45491' lat='50.83312' lon='60.17262' />
+ <node id='-45493' lat='51.23679' lon='61.56889' />
+ <node id='-45495' lat='51.61124' lon='60.92401' />
+ <node id='-45497' lat='51.48615' lon='60.95655' />
+ <node id='-45499' lat='51.40687' lon='61.50677' />
+ <node id='-45501' lat='51.25716' lon='61.6813' />
+ <node id='-45503' lat='51.32746' lon='61.55114' />
+ <node id='-45505' lat='51.61675' lon='60.5424' />
+ <node id='-45507' lat='51.98263' lon='59.99809' />
+ <node id='-45509' lat='51.99173' lon='60.19925' />
+ <node id='-45511' lat='52.15175' lon='60.48915' />
+ <node id='-45513' lat='51.87135' lon='60.09867' />
+ <node id='-45515' lat='51.7964' lon='60.50986' />
+ <node id='-45517' lat='51.66815' lon='60.36787' />
+ <node id='-45519' lat='52.15538' lon='60.72581' />
+ <node id='-45521' lat='52.22067' lon='60.78201' />
+ <node id='-45523' lat='52.35096' lon='61.05417' />
+ <node id='-45525' lat='52.50068' lon='60.98021' />
+ <node id='-45527' lat='52.52228' lon='60.84709' />
+ <node id='-45529' lat='52.63912' lon='60.84118' />
+ <node id='-45531' lat='52.66245' lon='60.71693' />
+ <node id='-45533' lat='52.75923' lon='60.71989' />
+ <node id='-45535' lat='53.03227' lon='61.23462' />
+ <node id='-45537' lat='52.96105' lon='62.0422' />
+ <node id='-45539' lat='52.99133' lon='62.12799' />
+ <node id='-45541' lat='53.09626' lon='62.14574' />
+ <node id='-45543' lat='53.30536' lon='61.19024' />
+ <node id='-45545' lat='53.41481' lon='61.14291' />
+ <node id='-45547' lat='53.50112' lon='61.57185' />
+ <node id='-45549' lat='53.57144' lon='61.55706' />
+ <node id='-45551' lat='53.62937' lon='60.90626' />
+ <node id='-45553' lat='53.45887' lon='61.37957' />
+ <node id='-45555' lat='53.50992' lon='61.29082' />
+ <node id='-45557' lat='53.80268' lon='61.22574' />
+ <node id='-45559' lat='53.93699' lon='60.99796' />
+ <node id='-45561' lat='53.95788' lon='61.24941' />
+ <node id='-45563' lat='54.09169' lon='61.28786' />
+ <node id='-45565' lat='54.04134' lon='62.00966' />
+ <node id='-45567' lat='54.03961' lon='62.38535' />
+ <node id='-45569' lat='53.90737' lon='62.45931' />
+ <node id='-45571' lat='53.94047' lon='62.56876' />
+ <node id='-45573' lat='54.05871' lon='62.58651' />
+ <node id='-45575' lat='54.22679' lon='64.02715' />
+ <node id='-45577' lat='54.29763' lon='63.97686' />
+ <node id='-45579' lat='55.18823' lon='68.19206' />
+ <node id='-45581' lat='55.1476' lon='70.19179' />
+ <node id='-45583' lat='55.3027' lon='70.76493' />
+ <node id='-45585' lat='54.13326' lon='71.10379' />
+ <node id='-45587' lat='54.71253' lon='71.08288' />
+ <node id='-45589' lat='54.64965' lon='71.24185' />
+ <node id='-45591' lat='54.33376' lon='71.08706' />
+ <node id='-45593' lat='54.17736' lon='71.96141' />
+ <node id='-45595' lat='54.36303' lon='72.17477' />
+ <node id='-45597' lat='53.92685' lon='72.43415' />
+ <node id='-45599' lat='54.1161' lon='72.71026' />
+ <node id='-45601' lat='53.96132' lon='73.37963' />
+ <node id='-45603' lat='54.07194' lon='73.74778' />
+ <node id='-45605' lat='53.86522' lon='73.68921' />
+ <node id='-45607' lat='53.61532' lon='73.25412' />
+ <node id='-45609' lat='53.44623' lon='73.39218' />
+ <node id='-45611' lat='54.07439' lon='75.3668' />
+ <node id='-45613' lat='54.4677' lon='76.91052' />
+ <node id='-45615' lat='54.1798' lon='76.82266' />
+ <node id='-45617' lat='50.77658' lon='80.08138' />
+ <node id='-45619' lat='50.95581' lon='80.4127' />
+ <node id='-45621' lat='51.20855' lon='80.44819' />
+ <node id='-45623' lat='51.28262' lon='80.80318' />
+ <node id='-45625' lat='51.15662' lon='81.16999' />
+ <node id='-45627' lat='50.96326' lon='81.07533' />
+ <node id='-45629' lat='50.98562' lon='81.40665' />
+ <node id='-45631' lat='50.77658' lon='81.46581' />
+ <node id='-45633' lat='50.75412' lon='82.55443' />
+ <node id='-45635' lat='51.00796' lon='83.14607' />
+ <node id='-45637' lat='50.87375' lon='83.8442' />
+ <node id='-45639' lat='50.27257' lon='84.29385' />
+ <node id='-45641' lat='50.06793' lon='84.99198' />
+ <node id='-45643' lat='49.60239' lon='85.24047' />
+ <node id='-45645' lat='49.50259' lon='86.18709' />
+ <node id='-45647' lat='49.80136' lon='86.63674' />
+ <node id='-45649' lat='49.74787' lon='86.79056' />
+ <node id='-45651' lat='49.60239' lon='86.61307' />
+ <node id='-45653' lat='49.51796' lon='86.82606' />
+ <node id='-45655' lat='49.13794' lon='87.48983' />
+ <node id='-45657' lat='49.07403' lon='87.478' />
+ <node id='-45659' lat='49.18147' lon='87.98977' />
+ <node id='-45661' lat='49.30314' lon='88.15543' />
+ <node id='-45663' lat='43.48835' lon='65.18666' />
+ <node id='-45665' lat='43.31856' lon='65.53277' />
+ <node id='-45667' lat='42.93426' lon='66.09482' />
+ <node id='-45669' lat='41.14611' lon='67.9644' />
+ <node id='-45671' lat='41.02794' lon='67.98511' />
+ <node id='-45673' lat='41.08148' lon='68.08273' />
+ <node id='-45675' lat='41.0324' lon='68.1271' />
+ <node id='-45677' lat='40.83798' lon='67.96736' />
+ <node id='-45679' lat='40.56437' lon='68.49983' />
+ <node id='-45681' lat='40.59358' lon='68.63' />
+ <node id='-45683' lat='40.99669' lon='68.49983' />
+ <node id='-45685' lat='40.93861' lon='68.65662' />
+ <node id='-45687' lat='40.96989' lon='68.73945' />
+ <node id='-45689' lat='41.05025' lon='68.7217' />
+ <node id='-45691' lat='41.24405' lon='69.03231' />
+ <node id='-45693' lat='41.36183' lon='69.05006' />
+ <node id='-45695' lat='42.30188' lon='70.85973' />
+ <node id='-45697' lat='42.18033' lon='71.28719' />
+ <node id='-45699' lat='41.92554' lon='70.69777' />
+ <node id='-45701' lat='42.1308' lon='52.97575' />
+ <node id='-45703' lat='42.38477' lon='54.20635' />
+ <node id='-45705' lat='41.92424' lon='54.95182' />
+ <node id='-45707' lat='41.25609' lon='55.45471' />
+ <node id='-45709' lat='42.43098' lon='73.44393' />
+ <node id='-45711' lat='43.03071' lon='73.55634' />
+ <node id='-45713' lat='42.83578' lon='71.88792' />
+ <node id='-45715' lat='42.77501' lon='71.30811' />
+ <node id='-45717' lat='43.24657' lon='74.22489' />
+ <node id='-45719' lat='42.79672' lon='75.72174' />
+ <node id='-45721' lat='42.94848' lon='75.82823' />
+ <node id='-45723' lat='42.89649' lon='78.48469' />
+ <node id='-45725' lat='42.75764' lon='79.13549' />
+ <node id='-45727' lat='42.04113' lon='79.92977' />
+ <node id='-45729' lat='43.01557' lon='80.3735' />
+ <node id='-45731' lat='44.11479' lon='80.38384' />
+ <node id='-45733' lat='44.63073' lon='80.38384' />
+ <node id='-45735' lat='44.89957' lon='79.8987' />
+ <node id='-45737' lat='45.03352' lon='80.11169' />
+ <node id='-45739' lat='45.3504' lon='81.73278' />
+ <node id='-45741' lat='45.1755' lon='82.51374' />
+ <node id='-45743' lat='45.40027' lon='82.58474' />
+ <node id='-45745' lat='45.56619' lon='82.21792' />
+ <node id='-45747' lat='47.19053' lon='83.04622' />
+ <node id='-45749' lat='46.98912' lon='83.92184' />
+ <node id='-45751' lat='47.06171' lon='85.54294' />
+ <node id='-45753' lat='47.32705' lon='85.66126' />
+ <node id='-45755' lat='47.01394' lon='84.73077' />
+ <node id='-45757' lat='47.04816' lon='85.22443' />
+ <node id='-45759' lat='46.87399' lon='84.93995' />
+ <node id='-45761' lat='48.05493' lon='85.5169' />
+ <node id='-45763' lat='48.3939' lon='85.73581' />
+ <node id='-45765' lat='48.46064' lon='86.38069' />
+ <node id='-45767' lat='48.70331' lon='86.75343' />
+ <node id='-45769' lat='48.99918' lon='86.73568' />
+ <node id='-45771' lat='47.53584' lon='10.56912' />
+ <node id='-45773' lat='47.54057' lon='10.48849' />
+ <node id='-45775' lat='47.58552' lon='10.47329' />
+ <node id='-45777' lat='47.58394' lon='10.43473' />
+ <node id='-45779' lat='47.5524' lon='10.44992' />
+ <node id='-45781' lat='47.50111' lon='10.4324' />
+ <node id='-45783' lat='47.5934' lon='9.76748' />
+ <node id='-45785' lat='47.59419' lon='9.80254' />
+ <node id='-45787' lat='47.58158' lon='9.82591' />
+ <node id='-45789' lat='47.54688' lon='9.8189' />
+ <node id='-45791' lat='47.52953' lon='9.87499' />
+ <node id='-45793' lat='47.54688' lon='9.87733' />
+ <node id='-45795' lat='47.53899' lon='9.96029' />
+ <node id='-45797' lat='47.53111' lon='9.92407' />
+ <node id='-45799' lat='47.48216' lon='10.00003' />
+ <node id='-45801' lat='47.48927' lon='10.03859' />
+ <node id='-45803' lat='47.45531' lon='10.07131' />
+ <node id='-45805' lat='47.46005' lon='10.09001' />
+ <node id='-45807' lat='47.4316' lon='10.1052' />
+ <node id='-45809' lat='47.40709' lon='10.06897' />
+ <node id='-45811' lat='47.35724' lon='10.09819' />
+ <node id='-45813' lat='47.37228' lon='10.11805' />
+ <node id='-45815' lat='47.36674' lon='10.16362' />
+ <node id='-45817' lat='47.38889' lon='10.17648' />
+ <node id='-45819' lat='47.38019' lon='10.2127' />
+ <node id='-45821' lat='47.48453' lon='10.44291' />
+ <node id='-45823' lat='47.43318' lon='10.47446' />
+ <node id='-45825' lat='47.47901' lon='10.46278' />
+ <node id='-45827' lat='47.30813' lon='10.33424' />
+ <node id='-45829' lat='47.37623' lon='10.39851' />
+ <node id='-45831' lat='47.38494' lon='10.4324' />
+ <node id='-45833' lat='47.41183' lon='10.4359' />
+ <node id='-45835' lat='47.27088' lon='10.23257' />
+ <node id='-45837' lat='47.27167' lon='10.17531' />
+ <node id='-45839' lat='47.29149' lon='10.17648' />
+ <node id='-45841' lat='47.31014' lon='10.2147' />
+ <node id='-45843' lat='47.32832' lon='10.19998' />
+ <node id='-45845' lat='47.38904' lon='10.22774' />
+ <node id='-45847' lat='47.37609' lon='10.23757' />
+ <node id='-45849' lat='47.57881' lon='11.60681' />
+ <node id='-45851' lat='47.55515' lon='11.58811' />
+ <node id='-45853' lat='47.52281' lon='11.58578' />
+ <node id='-45855' lat='47.51413' lon='11.4362' />
+ <node id='-45857' lat='47.50939' lon='11.52618' />
+ <node id='-45859' lat='47.47465' lon='11.38128' />
+ <node id='-45861' lat='47.53701' lon='10.88814' />
+ <node id='-45863' lat='47.51729' lon='10.77596' />
+ <node id='-45865' lat='47.5591' lon='10.63456' />
+ <node id='-45867' lat='47.55752' lon='10.68832' />
+ <node id='-45869' lat='47.54253' lon='10.6965' />
+ <node id='-45871' lat='47.53228' lon='10.7596' />
+ <node id='-45873' lat='47.51334' lon='10.91268' />
+ <node id='-45875' lat='47.5015' lon='10.86945' />
+ <node id='-45877' lat='47.4786' lon='10.87061' />
+ <node id='-45879' lat='47.48571' lon='10.90918' />
+ <node id='-45881' lat='47.48018' lon='10.93839' />
+ <node id='-45883' lat='47.46991' lon='10.92437' />
+ <node id='-45885' lat='47.42882' lon='10.98513' />
+ <node id='-45887' lat='47.39719' lon='11.11835' />
+ <node id='-45889' lat='47.39561' lon='10.97111' />
+ <node id='-45891' lat='47.41617' lon='10.97111' />
+ <node id='-45893' lat='47.41222' lon='11.12536' />
+ <node id='-45895' lat='47.43198' lon='11.20482' />
+ <node id='-45897' lat='47.43277' lon='11.25157' />
+ <node id='-45899' lat='47.3964' lon='11.22002' />
+ <node id='-45901' lat='47.39956' lon='11.27844' />
+ <node id='-45903' lat='47.42566' lon='11.29597' />
+ <node id='-45905' lat='47.44937' lon='11.33804' />
+ <node id='-45907' lat='47.44621' lon='11.4175' />
+ <node id='-45909' lat='47.6741' lon='12.6071' />
+ <node id='-45911' lat='47.58354' lon='11.84052' />
+ <node id='-45913' lat='47.60667' lon='12.20398' />
+ <node id='-45915' lat='47.6977' lon='12.43883' />
+ <node id='-45917' lat='47.63238' lon='12.57438' />
+ <node id='-45919' lat='47.62293' lon='12.50076' />
+ <node id='-45921' lat='47.63553' lon='12.53816' />
+ <node id='-45923' lat='47.6741' lon='12.44117' />
+ <node id='-45925' lat='47.62451' lon='12.0088' />
+ <node id='-45927' lat='47.60166' lon='11.85572' />
+ <node id='-45929' lat='47.61033' lon='12.02282' />
+ <node id='-45931' lat='47.61506' lon='12.17824' />
+ <node id='-45933' lat='47.60639' lon='12.13734' />
+ <node id='-45935' lat='47.61742' lon='12.05788' />
+ <node id='-45937' lat='47.70105' lon='12.16217' />
+ <node id='-45939' lat='47.7433' lon='12.2542' />
+ <node id='-45941' lat='47.71776' lon='12.22571' />
+ <node id='-45943' lat='47.67725' lon='12.26004' />
+ <node id='-45945' lat='47.73544' lon='12.26238' />
+ <node id='-45947' lat='47.69534' lon='12.24017' />
+ <node id='-45949' lat='47.68827' lon='12.27991' />
+ <node id='-45951' lat='47.69534' lon='12.336' />
+ <node id='-45953' lat='47.68433' lon='12.37222' />
+ <node id='-45955' lat='47.60121' lon='12.17737' />
+ <node id='-45957' lat='47.61019' lon='12.18145' />
+ <node id='-45959' lat='47.6049' lon='12.18568' />
+ <node id='-45961' lat='47.64085' lon='12.19895' />
+ <node id='-45963' lat='47.61082' lon='12.20801' />
+ <node id='-45965' lat='47.66663' lon='12.18347' />
+ <node id='-45967' lat='47.65984' lon='12.18507' />
+ <node id='-45969' lat='47.68167' lon='12.16769' />
+ <node id='-45971' lat='47.70065' lon='12.18303' />
+ <node id='-45973' lat='47.6787' lon='12.7357' />
+ <node id='-45975' lat='47.61493' lon='12.82101' />
+ <node id='-45977' lat='47.66689' lon='12.77777' />
+ <node id='-45979' lat='47.64485' lon='12.76492' />
+ <node id='-45981' lat='47.58025' lon='12.77427' />
+ <node id='-45983' lat='47.54477' lon='12.80699' />
+ <node id='-45985' lat='47.54556' lon='12.84672' />
+ <node id='-45987' lat='47.46267' lon='12.9998' />
+ <node id='-45989' lat='47.52741' lon='12.85256' />
+ <node id='-45991' lat='47.49426' lon='13.04537' />
+ <node id='-45993' lat='47.48716' lon='12.98344' />
+ <node id='-45995' lat='47.47452' lon='12.9624' />
+ <node id='-45997' lat='47.72116' lon='13.01382' />
+ <node id='-45999' lat='47.68814' lon='13.07692' />
+ <node id='-46001' lat='47.63304' lon='13.09562' />
+ <node id='-46003' lat='47.58183' lon='13.04537' />
+ <node id='-46005' lat='47.53373' lon='13.03252' />
+ <node id='-46007' lat='47.56291' lon='13.05355' />
+ <node id='-46009' lat='47.58577' lon='13.06641' />
+ <node id='-46011' lat='47.60075' lon='13.06407' />
+ <node id='-46013' lat='47.77302' lon='12.93202' />
+ <node id='-46015' lat='47.72352' lon='12.90515' />
+ <node id='-46017' lat='47.76281' lon='12.94371' />
+ <node id='-46019' lat='47.71094' lon='12.92969' />
+ <node id='-46021' lat='47.7078' lon='12.98578' />
+ <node id='-46023' lat='47.95647' lon='12.91683' />
+ <node id='-46025' lat='47.96195' lon='12.87476' />
+ <node id='-46027' lat='48.01122' lon='12.8549' />
+ <node id='-46029' lat='48.07373' lon='12.76141' />
+ <node id='-46031' lat='48.10885' lon='12.74973' />
+ <node id='-46033' lat='48.29422' lon='13.26039' />
+ <node id='-46035' lat='48.29577' lon='13.18093' />
+ <node id='-46037' lat='48.20629' lon='12.95306' />
+ <node id='-46039' lat='48.20318' lon='12.87126' />
+ <node id='-46041' lat='48.25689' lon='13.02083' />
+ <node id='-46043' lat='48.27867' lon='13.126' />
+ <node id='-46045' lat='48.27711' lon='13.0851' />
+ <node id='-46047' lat='48.15876' lon='12.8362' />
+ <node id='-46049' lat='48.14785' lon='12.80582' />
+ <node id='-46051' lat='48.12445' lon='12.78595' />
+ <node id='-46053' lat='48.12796' lon='12.7617' />
+ <node id='-46055' lat='48.37292' lon='13.40709' />
+ <node id='-46057' lat='48.71375' lon='13.79337' />
+ <node id='-46059' lat='48.51675' lon='13.73026' />
+ <node id='-46061' lat='48.62345' lon='13.82609' />
+ <node id='-46063' lat='48.69832' lon='13.81791' />
+ <node id='-46065' lat='48.5624' lon='13.7513' />
+ <node id='-46067' lat='48.59487' lon='13.80038' />
+ <node id='-46069' lat='48.55234' lon='13.76999' />
+ <node id='-46071' lat='48.58095' lon='13.80271' />
+ <node id='-46073' lat='48.59023' lon='13.51291' />
+ <node id='-46075' lat='48.56162' lon='13.57484' />
+ <node id='-46077' lat='48.57013' lon='13.59705' />
+ <node id='-46079' lat='48.43386' lon='13.43929' />
+ <node id='-46081' lat='48.45711' lon='13.42527' />
+ <node id='-46083' lat='48.51365' lon='13.45916' />
+ <node id='-46085' lat='48.55776' lon='13.43695' />
+ <node id='-46087' lat='48.56472' lon='13.45214' />
+ <node id='-46089' lat='48.55157' lon='13.46967' />
+ <node id='-46091' lat='50.25032' lon='12.09287' />
+ <node id='-46093' lat='49.30417' lon='13.03618' />
+ <node id='-46095' lat='48.88538' lon='13.73854' />
+ <node id='-46097' lat='48.83537' lon='13.76994' />
+ <node id='-46099' lat='48.83319' lon='13.78977' />
+ <node id='-46101' lat='48.77877' lon='13.8096' />
+ <node id='-46103' lat='49.1228' lon='13.28242' />
+ <node id='-46105' lat='49.04812' lon='13.39479' />
+ <node id='-46107' lat='48.98851' lon='13.40802' />
+ <node id='-46109' lat='48.93752' lon='13.50221' />
+ <node id='-46111' lat='48.97441' lon='13.50552' />
+ <node id='-46113' lat='48.96899' lon='13.58319' />
+ <node id='-46115' lat='48.87886' lon='13.67739' />
+ <node id='-46117' lat='48.9462' lon='13.61624' />
+ <node id='-46119' lat='49.11199' lon='13.23449' />
+ <node id='-46121' lat='49.13902' lon='13.175' />
+ <node id='-46123' lat='49.16713' lon='13.17665' />
+ <node id='-46125' lat='49.27399' lon='13.02957' />
+ <node id='-46127' lat='49.76321' lon='12.40489' />
+ <node id='-46129' lat='49.52565' lon='12.64782' />
+ <node id='-46131' lat='49.52887' lon='12.60155' />
+ <node id='-46133' lat='49.6146' lon='12.56188' />
+ <node id='-46135' lat='49.61888' lon='12.53544' />
+ <node id='-46137' lat='49.68415' lon='12.52553' />
+ <node id='-46139' lat='49.70233' lon='12.4462' />
+ <node id='-46141' lat='49.43438' lon='12.65939' />
+ <node id='-46143' lat='49.3989' lon='12.75854' />
+ <node id='-46145' lat='49.34618' lon='12.78168' />
+ <node id='-46147' lat='49.35479' lon='12.88249' />
+ <node id='-46149' lat='49.33541' lon='12.88414' />
+ <node id='-46151' lat='49.34079' lon='12.94859' />
+ <node id='-46153' lat='49.47628' lon='12.64121' />
+ <node id='-46155' lat='49.42363' lon='12.71227' />
+ <node id='-46157' lat='49.94222' lon='12.47264' />
+ <node id='-46159' lat='49.92094' lon='12.55197' />
+ <node id='-46161' lat='49.78882' lon='12.46603' />
+ <node id='-46163' lat='49.83575' lon='12.48256' />
+ <node id='-46165' lat='49.97305' lon='12.49908' />
+ <node id='-46167' lat='50.06331' lon='12.26111' />
+ <node id='-46169' lat='50.19997' lon='12.19335' />
+ <node id='-46171' lat='50.16399' lon='12.21484' />
+ <node id='-46173' lat='50.13434' lon='12.1917' />
+ <node id='-46175' lat='50.09831' lon='12.20988' />
+ <node id='-46177' lat='50.0771' lon='12.27433' />
+ <node id='-46179' lat='50.41002' lon='12.94363' />
+ <node id='-46181' lat='50.45738' lon='12.82465' />
+ <node id='-46183' lat='50.39694' lon='12.51356' />
+ <node id='-46185' lat='50.39948' lon='12.70731' />
+ <node id='-46187' lat='50.43423' lon='12.73871' />
+ <node id='-46189' lat='50.41949' lon='12.67261' />
+ <node id='-46191' lat='50.17146' lon='12.32596' />
+ <node id='-46193' lat='50.27396' lon='12.13716' />
+ <node id='-46195' lat='50.32041' lon='12.10907' />
+ <node id='-46197' lat='50.32146' lon='12.18013' />
+ <node id='-46199' lat='50.2729' lon='12.20823' />
+ <node id='-46201' lat='50.27079' lon='12.25119' />
+ <node id='-46203' lat='50.24594' lon='12.23943' />
+ <node id='-46205' lat='50.22429' lon='12.28755' />
+ <node id='-46207' lat='50.32302' lon='12.39924' />
+ <node id='-46209' lat='50.34784' lon='12.48256' />
+ <node id='-46211' lat='50.37278' lon='12.48747' />
+ <node id='-46213' lat='50.35228' lon='12.49214' />
+ <node id='-46215' lat='50.35527' lon='12.46643' />
+ <node id='-46217' lat='50.33774' lon='12.43722' />
+ <node id='-46219' lat='50.32506' lon='12.43371' />
+ <node id='-46221' lat='50.29521' lon='12.40158' />
+ <node id='-46223' lat='50.28289' lon='12.36594' />
+ <node id='-46225' lat='50.23993' lon='12.35425' />
+ <node id='-46227' lat='50.24367' lon='12.33263' />
+ <node id='-46229' lat='50.17524' lon='12.29232' />
+ <node id='-46231' lat='50.19544' lon='12.28063' />
+ <node id='-46233' lat='50.25189' lon='12.26953' />
+ <node id='-46235' lat='50.25525' lon='12.24791' />
+ <node id='-46237' lat='50.20442' lon='12.32445' />
+ <node id='-46239' lat='50.19432' lon='12.33847' />
+ <node id='-46241' lat='50.74142' lon='13.89444' />
+ <node id='-46243' lat='50.60527' lon='13.46311' />
+ <node id='-46245' lat='50.50237' lon='13.19043' />
+ <node id='-46247' lat='50.50868' lon='13.03343' />
+ <node id='-46249' lat='50.59268' lon='13.25158' />
+ <node id='-46251' lat='50.65035' lon='13.37717' />
+ <node id='-46253' lat='50.67654' lon='13.53748' />
+ <node id='-46255' lat='50.73096' lon='13.65977' />
+ <node id='-46257' lat='50.44873' lon='13.02021' />
+ <node id='-46259' lat='50.57904' lon='13.29454' />
+ <node id='-46261' lat='50.58009' lon='13.32594' />
+ <node id='-46263' lat='50.60317' lon='13.32264' />
+ <node id='-46265' lat='50.62624' lon='13.37222' />
+ <node id='-46267' lat='50.50132' lon='13.08301' />
+ <node id='-46269' lat='50.51709' lon='13.13424' />
+ <node id='-46271' lat='50.64721' lon='13.5226' />
+ <node id='-46273' lat='50.70481' lon='13.52921' />
+ <node id='-46275' lat='50.78533' lon='13.89113' />
+ <node id='-46277' lat='50.86049' lon='14.22331' />
+ <node id='-46279' lat='50.8177' lon='13.98864' />
+ <node id='-46281' lat='50.80413' lon='14.03326' />
+ <node id='-46283' lat='51.05515' lon='14.30098' />
+ <node id='-46285' lat='50.98935' lon='14.25665' />
+ <node id='-46287' lat='50.97718' lon='14.28776' />
+ <node id='-46289' lat='50.98556' lon='14.32353' />
+ <node id='-46291' lat='50.95243' lon='14.31422' />
+ <node id='-46293' lat='50.93866' lon='14.39848' />
+ <node id='-46295' lat='50.88761' lon='14.24314' />
+ <node id='-46297' lat='50.89386' lon='14.27123' />
+ <node id='-46299' lat='50.88448' lon='14.30098' />
+ <node id='-46301' lat='50.89907' lon='14.38691' />
+ <node id='-46303' lat='51.02086' lon='14.41335' />
+ <node id='-46305' lat='51.03712' lon='14.45827' />
+ <node id='-46307' lat='50.96365' lon='14.59514' />
+ <node id='-46309' lat='50.922' lon='14.56374' />
+ <node id='-46311' lat='50.93241' lon='14.64802' />
+ <node id='-46313' lat='50.86049' lon='14.61993' />
+ <node id='-46315' lat='50.90741' lon='14.64968' />
+ <node id='-46317' lat='50.81666' lon='14.79345' />
+ <node id='-46319' lat='50.91314' lon='14.58316' />
+ <node id='-46321' lat='50.9855' lon='14.59969' />
+ <node id='-46323' lat='51.00879' lon='14.56415' />
+ <node id='-46325' lat='51.02242' lon='14.49873' />
+ <node id='-46327' lat='51.04382' lon='14.49154' />
+ <node id='-46329' lat='51.02286' lon='14.49202' />
+ <node id='-46331' lat='51.04692' lon='14.49991' />
+ <node id='-46333' lat='51.0427' lon='14.50809' />
+ <node id='-46335' lat='51.01679' lon='14.53321' />
+ <node id='-46337' lat='51.00374' lon='14.53438' />
+ <node id='-46339' lat='50.96606' lon='14.30251' />
+ <node id='-46341' lat='50.97379' lon='14.32793' />
+ <node id='-46343' lat='52.27608' lon='14.58098' />
+ <node id='-46345' lat='52.83472' lon='14.12651' />
+ <node id='-46347' lat='52.59847' lon='14.61073' />
+ <node id='-46349' lat='52.81175' lon='14.22071' />
+ <node id='-46351' lat='52.42548' lon='14.54132' />
+ <node id='-46353' lat='52.57136' lon='14.6289' />
+ <node id='-46355' lat='52.53116' lon='14.60081' />
+ <node id='-46357' lat='52.48993' lon='14.63056' />
+ <node id='-46359' lat='51.56466' lon='14.70988' />
+ <node id='-46361' lat='51.80033' lon='14.60742' />
+ <node id='-46363' lat='51.83302' lon='14.59089' />
+ <node id='-46365' lat='51.93503' lon='14.71153' />
+ <node id='-46367' lat='51.97373' lon='14.70162' />
+ <node id='-46369' lat='52.06424' lon='14.75615' />
+ <node id='-46371' lat='52.09167' lon='14.72971' />
+ <node id='-46373' lat='52.10283' lon='14.6917' />
+ <node id='-46375' lat='52.13936' lon='14.67683' />
+ <node id='-46377' lat='52.25585' lon='14.69831' />
+ <node id='-46379' lat='52.22144' lon='14.71319' />
+ <node id='-46381' lat='52.19612' lon='14.68344' />
+ <node id='-46383' lat='52.16927' lon='14.70616' />
+ <node id='-46385' lat='51.6637' lon='14.76028' />
+ <node id='-46387' lat='51.72619' lon='14.67435' />
+ <node id='-46389' lat='51.79472' lon='14.64625' />
+ <node id='-46391' lat='51.60421' lon='14.75863' />
+ <node id='-46393' lat='51.28387' lon='15.04288' />
+ <node id='-46395' lat='51.33449' lon='14.98008' />
+ <node id='-46397' lat='51.44793' lon='14.9652' />
+ <node id='-46399' lat='51.52922' lon='14.73219' />
+ <node id='-46401' lat='51.47573' lon='14.9305' />
+ <node id='-46403' lat='51.04552' lon='14.95529' />
+ <node id='-46405' lat='52.95786' lon='14.14056' />
+ <node id='-46407' lat='52.87715' lon='14.15873' />
+ <node id='-46409' lat='53.00264' lon='14.25954' />
+ <node id='-46411' lat='53.13669' lon='14.38679' />
+ <node id='-46413' lat='53.05829' lon='14.35044' />
+ <node id='-46415' lat='53.16444' lon='14.36696' />
+ <node id='-46417' lat='53.20405' lon='14.37853' />
+ <node id='-46419' lat='53.21098' lon='14.40662' />
+ <node id='-46421' lat='53.26241' lon='14.45125' />
+ <node id='-46423' lat='53.27427' lon='14.44133' />
+ <node id='-46425' lat='53.27724' lon='14.4215' />
+ <node id='-46427' lat='53.49506' lon='14.35209' />
+ <node id='-46429' lat='53.63392' lon='14.2853' />
+ <node id='-46431' lat='53.61581' lon='14.31904' />
+ <node id='-46433' lat='53.55499' lon='14.30416' />
+ <node id='-46435' lat='53.50587' lon='14.3273' />
+ <node id='-46437' lat='53.9291' lon='14.22634' />
+ <node id='-46439' lat='53.91258' lon='14.18544' />
+ <node id='-46441' lat='53.91671' lon='14.20647' />
+ <node id='-46443' lat='53.90776' lon='14.20823' />
+ <node id='-46445' lat='53.69866' lon='14.26782' />
+ <node id='-46447' lat='53.67721' lon='14.2836' />
+ <node id='-46449' lat='53.65955' lon='14.28477' />
+ <node id='-46451' lat='53.66613' lon='14.27133' />
+ <node id='-46453' lat='54.44648' lon='22.72462' />
+ <node id='-46455' lat='54.532' lon='22.67788' />
+ <node id='-46457' lat='54.56454' lon='22.71293' />
+ <node id='-46459' lat='54.58486' lon='22.68021' />
+ <node id='-46461' lat='54.64711' lon='22.76669' />
+ <node id='-46463' lat='54.66604' lon='22.73397' />
+ <node id='-46465' lat='54.72952' lon='22.73631' />
+ <node id='-46467' lat='54.79829' lon='22.88588' />
+ <node id='-46469' lat='54.88711' lon='22.85083' />
+ <node id='-46471' lat='54.9811' lon='22.68723' />
+ <node id='-46473' lat='54.97037' lon='22.65451' />
+ <node id='-46475' lat='55.07085' lon='22.58907' />
+ <node id='-46477' lat='55.01863' lon='22.60075' />
+ <node id='-46479' lat='55.04408' lon='22.47688' />
+ <node id='-46481' lat='55.0655' lon='22.31562' />
+ <node id='-46483' lat='55.05345' lon='22.14267' />
+ <node id='-46485' lat='55.02131' lon='22.11697' />
+ <node id='-46487' lat='55.02935' lon='22.06087' />
+ <node id='-46489' lat='55.05078' lon='22.02582' />
+ <node id='-46491' lat='55.07888' lon='22.03984' />
+ <node id='-46493' lat='55.08691' lon='21.99543' />
+ <node id='-46495' lat='55.07353' lon='21.96505' />
+ <node id='-46497' lat='55.09493' lon='21.85521' />
+ <node id='-46499' lat='55.20311' lon='21.55605' />
+ <node id='-46501' lat='55.1791' lon='21.64954' />
+ <node id='-46503' lat='54.11091' lon='24.77131' />
+ <node id='-46505' lat='53.92691' lon='23.61677' />
+ <node id='-46507' lat='53.90076' lon='24.44411' />
+ <node id='-46509' lat='53.96405' lon='24.19638' />
+ <node id='-46511' lat='53.90076' lon='24.34128' />
+ <node id='-46513' lat='53.92554' lon='23.98837' />
+ <node id='-46515' lat='53.9613' lon='23.95098' />
+ <node id='-46517' lat='53.90489' lon='23.79205' />
+ <node id='-46519' lat='53.93379' lon='23.71726' />
+ <node id='-46521' lat='53.94205' lon='23.81309' />
+ <node id='-46523' lat='54.00803' lon='24.61005' />
+ <node id='-46525' lat='54.01901' lon='24.69652' />
+ <node id='-46527' lat='53.96543' lon='24.69185' />
+ <node id='-46529' lat='54.02862' lon='24.85311' />
+ <node id='-46531' lat='54.93557' lon='25.87677' />
+ <node id='-46533' lat='54.18072' lon='24.96997' />
+ <node id='-46535' lat='54.14241' lon='24.991' />
+ <node id='-46537' lat='54.13419' lon='25.0728' />
+ <node id='-46539' lat='54.219' lon='25.19199' />
+ <node id='-46541' lat='54.26271' lon='25.22705' />
+ <node id='-46543' lat='54.30909' lon='25.50283' />
+ <node id='-46545' lat='54.26544' lon='25.35559' />
+ <node id='-46547' lat='54.22584' lon='25.59398' />
+ <node id='-46549' lat='54.17799' lon='25.51452' />
+ <node id='-46551' lat='54.14925' lon='25.54724' />
+ <node id='-46553' lat='54.13556' lon='25.64773' />
+ <node id='-46555' lat='54.16704' lon='25.71084' />
+ <node id='-46557' lat='54.15747' lon='25.78563' />
+ <node id='-46559' lat='54.23267' lon='25.76459' />
+ <node id='-46561' lat='54.31727' lon='25.68513' />
+ <node id='-46563' lat='54.31591' lon='25.55425' />
+ <node id='-46565' lat='54.33499' lon='25.53555' />
+ <node id='-46567' lat='54.42075' lon='25.63371' />
+ <node id='-46569' lat='54.4656' lon='25.62203' />
+ <node id='-46571' lat='54.57412' lon='25.75291' />
+ <node id='-46573' lat='54.5321' lon='25.68045' />
+ <node id='-46575' lat='54.80108' lon='25.74122' />
+ <node id='-46577' lat='54.95705' lon='25.99129' />
+ <node id='-46579' lat='54.94631' lon='26.05907' />
+ <node id='-46581' lat='54.98924' lon='26.13386' />
+ <node id='-46583' lat='54.99729' lon='26.20397' />
+ <node id='-46585' lat='55.08032' lon='26.26941' />
+ <node id='-46587' lat='55.10439' lon='26.23202' />
+ <node id='-46589' lat='55.1525' lon='26.35121' />
+ <node id='-46591' lat='55.13246' lon='26.45872' />
+ <node id='-46593' lat='55.16051' lon='26.51481' />
+ <node id='-46595' lat='55.57887' lon='26.63167' />
+ <node id='-46597' lat='55.51805' lon='26.53584' />
+ <node id='-46599' lat='55.40277' lon='26.5522' />
+ <node id='-46601' lat='55.34832' lon='26.44937' />
+ <node id='-46603' lat='55.32572' lon='26.5709' />
+ <node id='-46605' lat='55.33902' lon='26.6714' />
+ <node id='-46607' lat='55.31642' lon='26.80929' />
+ <node id='-46609' lat='55.30444' lon='26.83266' />
+ <node id='-46611' lat='55.28182' lon='26.835' />
+ <node id='-46613' lat='55.24853' lon='26.72983' />
+ <node id='-46615' lat='55.21788' lon='26.72983' />
+ <node id='-46617' lat='55.14181' lon='26.54753' />
+ <node id='-46619' lat='55.19787' lon='26.68075' />
+ <node id='-46621' lat='55.16718' lon='26.69243' />
+ <node id='-46623' lat='54.40827' lon='22.83756' />
+ <node id='-46625' lat='54.38514' lon='23.00584' />
+ <node id='-46627' lat='54.35927' lon='22.99649' />
+ <node id='-46629' lat='54.34565' lon='23.05726' />
+ <node id='-46631' lat='54.31567' lon='23.04323' />
+ <node id='-46633' lat='54.29794' lon='23.104' />
+ <node id='-46635' lat='54.31567' lon='23.13905' />
+ <node id='-46637' lat='54.25701' lon='23.24656' />
+ <node id='-46639' lat='54.25155' lon='23.3494' />
+ <node id='-46641' lat='54.17911' lon='23.42418' />
+ <node id='-46643' lat='54.17775' lon='23.45223' />
+ <node id='-46645' lat='54.14764' lon='23.49196' />
+ <node id='-46647' lat='54.04622' lon='23.52702' />
+ <node id='-46649' lat='53.98855' lon='23.48261' />
+ <node id='-46651' lat='42.8885' lon='20.53484' />
+ <node id='-46653' lat='42.84853' lon='20.40594' />
+ <node id='-46655' lat='42.83157' lon='20.43734' />
+ <node id='-46657' lat='42.93208' lon='20.48692' />
+ <node id='-46659' lat='43.01067' lon='20.59929' />
+ <node id='-46661' lat='43.00826' lon='20.64557' />
+ <node id='-46663' lat='43.09641' lon='20.69515' />
+ <node id='-46665' lat='43.20492' lon='20.59929' />
+ <node id='-46667' lat='43.21335' lon='20.68688' />
+ <node id='-46669' lat='43.25068' lon='20.73811' />
+ <node id='-46671' lat='43.26994' lon='20.82901' />
+ <node id='-46673' lat='43.21697' lon='20.88685' />
+ <node id='-46675' lat='43.17842' lon='20.83727' />
+ <node id='-46677' lat='43.12416' lon='20.96287' />
+ <node id='-46679' lat='43.13622' lon='21.09673' />
+ <node id='-46681' lat='43.00222' lon='21.17936' />
+ <node id='-46683' lat='43.0288' lon='21.21406' />
+ <node id='-46685' lat='42.8994' lon='21.2719' />
+ <node id='-46687' lat='42.87276' lon='21.44047' />
+ <node id='-46689' lat='43.11089' lon='21.14465' />
+ <node id='-46691' lat='43.10607' lon='21.06202' />
+ <node id='-46693' lat='43.13984' lon='21.00749' />
+ <node id='-46695' lat='42.90424' lon='21.32974' />
+ <node id='-46697' lat='42.87397' lon='21.36941' />
+ <node id='-46699' lat='42.68596' lon='21.66192' />
+ <node id='-46701' lat='42.72118' lon='21.77429' />
+ <node id='-46703' lat='42.70418' lon='21.58755' />
+ <node id='-46705' lat='42.73211' lon='21.59086' />
+ <node id='-46707' lat='42.65923' lon='21.79413' />
+ <node id='-46709' lat='42.45106' lon='21.62556' />
+ <node id='-46711' lat='42.55219' lon='21.73133' />
+ <node id='-46713' lat='42.41081' lon='21.64209' />
+ <node id='-46715' lat='42.37664' lon='21.62887' />
+ <node id='-46717' lat='42.36809' lon='21.53467' />
+ <node id='-46719' lat='42.33634' lon='21.5264' />
+ <node id='-46721' lat='42.30946' lon='21.56772' />
+ <node id='-46723' lat='41.85318' lon='20.68523' />
+ <node id='-46725' lat='41.91839' lon='20.76786' />
+ <node id='-46727' lat='42.05229' lon='20.75464' />
+ <node id='-46729' lat='42.20794' lon='21.11491' />
+ <node id='-46731' lat='42.19815' lon='21.16614' />
+ <node id='-46733' lat='42.08909' lon='21.22728' />
+ <node id='-46735' lat='42.10993' lon='21.31983' />
+ <node id='-46737' lat='42.1418' lon='21.30496' />
+ <node id='-46739' lat='42.24465' lon='21.38428' />
+ <node id='-46741' lat='42.23609' lon='21.43882' />
+ <node id='-46743' lat='42.2789' lon='21.43882' />
+ <node id='-46745' lat='42.24465' lon='21.52145' />
+ <node id='-46747' lat='42.27156' lon='21.50823' />
+ <node id='-46749' lat='41.91593' lon='20.57946' />
+ <node id='-46751' lat='42.32168' lon='20.24399' />
+ <node id='-46753' lat='42.50469' lon='20.17127' />
+ <node id='-46755' lat='42.32656' lon='20.34479' />
+ <node id='-46757' lat='42.25444' lon='20.48857' />
+ <node id='-46759' lat='42.12097' lon='20.56955' />
+ <node id='-46761' lat='42.08173' lon='20.55633' />
+ <node id='-46763' lat='42.03879' lon='20.59434' />
+ <node id='-46765' lat='41.94913' lon='20.63069' />
+ <node id='-46767' lat='42.65559' lon='20.0969' />
+ <node id='-46769' lat='42.71147' lon='20.02915' />
+ <node id='-46771' lat='42.74789' lon='20.02088' />
+ <node id='-46773' lat='42.77701' lon='20.04898' />
+ <node id='-46775' lat='42.76245' lon='20.2539' />
+ <node id='-46777' lat='42.81945' lon='20.27869' />
+ <node id='-46779' lat='42.34913' lon='22.29275' />
+ <node id='-46781' lat='42.37477' lon='22.29605' />
+ <node id='-46783' lat='42.30026' lon='22.0399' />
+ <node id='-46785' lat='42.32103' lon='22.16384' />
+ <node id='-46787' lat='42.34669' lon='21.94405' />
+ <node id='-46789' lat='42.23789' lon='21.70111' />
+ <node id='-46791' lat='42.30392' lon='21.91595' />
+ <node id='-46793' lat='42.3247' lon='21.84654' />
+ <node id='-46795' lat='42.02275' lon='22.86749' />
+ <node id='-46797' lat='42.20393' lon='22.47251' />
+ <node id='-46799' lat='42.30339' lon='22.38136' />
+ <node id='-46801' lat='42.19527' lon='22.50289' />
+ <node id='-46803' lat='42.15457' lon='22.51224' />
+ <node id='-46805' lat='42.06614' lon='22.67701' />
+ <node id='-46807' lat='41.87587' lon='22.90254' />
+ <node id='-46809' lat='41.77137' lon='22.96682' />
+ <node id='-46811' lat='41.76527' lon='23.01239' />
+ <node id='-46813' lat='41.71034' lon='23.03342' />
+ <node id='-46815' lat='41.63265' lon='22.95513' />
+ <node id='-46817' lat='41.35782' lon='22.96331' />
+ <node id='-46819' lat='40.85546' lon='21.15262' />
+ <node id='-46821' lat='40.8855' lon='21.21105' />
+ <node id='-46823' lat='40.9173' lon='21.41555' />
+ <node id='-46825' lat='40.86165' lon='21.25779' />
+ <node id='-46827' lat='40.87578' lon='21.35595' />
+ <node id='-46829' lat='41.12449' lon='22.1424' />
+ <node id='-46831' lat='41.15617' lon='22.06527' />
+ <node id='-46833' lat='41.09191' lon='21.90869' />
+ <node id='-46835' lat='41.04786' lon='21.91102' />
+ <node id='-46837' lat='40.90759' lon='21.53007' />
+ <node id='-46839' lat='40.86076' lon='21.57448' />
+ <node id='-46841' lat='40.9429' lon='21.69601' />
+ <node id='-46843' lat='40.92525' lon='21.7556' />
+ <node id='-46845' lat='41.15969' lon='22.17629' />
+ <node id='-46847' lat='41.13065' lon='22.5549' />
+ <node id='-46849' lat='41.16409' lon='22.26744' />
+ <node id='-46851' lat='41.11921' lon='22.42285' />
+ <node id='-46853' lat='41.18168' lon='22.65306' />
+ <node id='-46855' lat='41.11568' lon='22.58295' />
+ <node id='-46857' lat='41.14385' lon='22.62852' />
+ <node id='-46859' lat='41.13945' lon='22.71266' />
+ <node id='-46861' lat='41.16321' lon='22.74538' />
+ <node id='-46863' lat='41.32225' lon='22.76408' />
+ <node id='-46865' lat='41.3398' lon='22.81199' />
+ <node id='-46867' lat='41.5549' lon='20.45809' />
+ <node id='-46869' lat='41.58113' lon='20.55508' />
+ <node id='-46871' lat='41.65975' lon='20.51769' />
+ <node id='-46873' lat='41.7897' lon='20.57144' />
+ <node id='-46875' lat='41.87068' lon='20.55976' />
+ <node id='-46877' lat='41.78099' lon='20.53405' />
+ <node id='-46879' lat='41.72433' lon='20.51301' />
+ <node id='-46881' lat='41.69292' lon='20.52937' />
+ <node id='-46883' lat='41.2323' lon='20.51068' />
+ <node id='-46885' lat='41.33679' lon='20.49432' />
+ <node id='-46887' lat='41.34381' lon='20.52119' />
+ <node id='-46889' lat='41.4087' lon='20.55976' />
+ <node id='-46891' lat='41.442' lon='20.51301' />
+ <node id='-46893' lat='41.0889' lon='20.63454' />
+ <node id='-46895' lat='41.11179' lon='20.58546' />
+ <node id='-46897' lat='41.09066' lon='20.59832' />
+ <node id='-46899' lat='41.13644' lon='20.59715' />
+ <node id='-46901' lat='40.9081' lon='20.73504' />
+ <node id='-46903' lat='41.08009' lon='20.65558' />
+ <node id='-46905' lat='40.91781' lon='20.71634' />
+ <node id='-46907' lat='40.89662' lon='20.81567' />
+ <node id='-46909' lat='40.92752' lon='20.83671' />
+ <node id='-46911' lat='40.90103' lon='20.97693' />
+ <node id='-46913' lat='40.92399' lon='20.94305' />
+ <node id='-46915' lat='42.10024' lon='19.40687' />
+ <node id='-46917' lat='42.06835' lon='19.37548' />
+ <node id='-46919' lat='42.17745' lon='19.28623' />
+ <node id='-46921' lat='42.62774' lon='19.65972' />
+ <node id='-46923' lat='42.66299' lon='19.73244' />
+ <node id='-46925' lat='42.58517' lon='19.77375' />
+ <node id='-46927' lat='42.57422' lon='19.74731' />
+ <node id='-46929' lat='42.50237' lon='19.76549' />
+ <node id='-46931' lat='42.46581' lon='19.82333' />
+ <node id='-46933' lat='42.51699' lon='19.9324' />
+ <node id='-46935' lat='42.5109' lon='20.00842' />
+ <node id='-46937' lat='42.54622' lon='20.01834' />
+ <node id='-46939' lat='39.99438' lon='20.31135' />
+ <node id='-46941' lat='39.99058' lon='20.37911' />
+ <node id='-46943' lat='39.82832' lon='20.41546' />
+ <node id='-46945' lat='39.78516' lon='20.38572' />
+ <node id='-46947' lat='39.81563' lon='20.30804' />
+ <node id='-46949' lat='39.80421' lon='20.29152' />
+ <node id='-46951' lat='39.72799' lon='20.31961' />
+ <node id='-46953' lat='39.64532' lon='20.22376' />
+ <node id='-46955' lat='39.69112' lon='20.05189' />
+ <node id='-46957' lat='39.65805' lon='20.12956' />
+ <node id='-46959' lat='39.67459' lon='20.22707' />
+ <node id='-46961' lat='40.06777' lon='20.42373' />
+ <node id='-46963' lat='40.09433' lon='20.67162' />
+ <node id='-46965' lat='40.47882' lon='20.83688' />
+ <node id='-46967' lat='40.27739' lon='20.71789' />
+ <node id='-46969' lat='40.06524' lon='20.55593' />
+ <node id='-46971' lat='40.08168' lon='20.51297' />
+ <node id='-46973' lat='40.06271' lon='20.48487' />
+ <node id='-46975' lat='40.35803' lon='20.78234' />
+ <node id='-46977' lat='40.42726' lon='20.7906' />
+ <node id='-46979' lat='40.46625' lon='20.94925' />
+ <node id='-46981' lat='40.51526' lon='20.96908' />
+ <node id='-46983' lat='40.56299' lon='21.03932' />
+ <node id='-46985' lat='40.66586' lon='21.05833' />
+ <node id='-46987' lat='40.76982' lon='20.95752' />
+ <node id='-46989' lat='40.79109' lon='20.98396' />
+ <node id='-46991' lat='43.47926' lon='19.22229' />
+ <node id='-46993' lat='43.38846' lon='19.44315' />
+ <node id='-46995' lat='43.32644' lon='19.48171' />
+ <node id='-46997' lat='43.31623' lon='19.52962' />
+ <node id='-46999' lat='43.25158' lon='19.54598' />
+ <node id='-47001' lat='42.90676' lon='20.34528' />
+ <node id='-47003' lat='42.99058' lon='20.14896' />
+ <node id='-47005' lat='43.11098' lon='19.96549' />
+ <node id='-47007' lat='43.0538' lon='19.98887' />
+ <node id='-47009' lat='43.02732' lon='20.04729' />
+ <node id='-47011' lat='42.99571' lon='20.05431' />
+ <node id='-47013' lat='42.96237' lon='20.12325' />
+ <node id='-47015' lat='42.97177' lon='20.16415' />
+ <node id='-47017' lat='43.2286' lon='19.62661' />
+ <node id='-47019' lat='43.19027' lon='19.64063' />
+ <node id='-47021' lat='43.16044' lon='19.76918' />
+ <node id='-47023' lat='43.11951' lon='19.79255' />
+ <node id='-47025' lat='43.08539' lon='19.92576' />
+ <node id='-47027' lat='42.72074' lon='18.56789' />
+ <node id='-47029' lat='42.58409' lon='18.49778' />
+ <node id='-47031' lat='42.57376' lon='18.53751' />
+ <node id='-47033' lat='42.62279' lon='18.52232' />
+ <node id='-47035' lat='42.64429' lon='18.57373' />
+ <node id='-47037' lat='42.68209' lon='18.54919' />
+ <node id='-47039' lat='42.58409' lon='18.55504' />
+ <node id='-47041' lat='43.03928' lon='18.66254' />
+ <node id='-47043' lat='43.01451' lon='18.52232' />
+ <node id='-47045' lat='42.74992' lon='18.47324' />
+ <node id='-47047' lat='42.81682' lon='18.45921' />
+ <node id='-47049' lat='42.89306' lon='18.49661' />
+ <node id='-47051' lat='42.95553' lon='18.49076' />
+ <node id='-47053' lat='43.14766' lon='18.64735' />
+ <node id='-47055' lat='43.2056' lon='18.66605' />
+ <node id='-47057' lat='43.2286' lon='18.71747' />
+ <node id='-47059' lat='43.25243' lon='18.6976' />
+ <node id='-47061' lat='43.29838' lon='18.76538' />
+ <node id='-47063' lat='43.32389' lon='18.85068' />
+ <node id='-47065' lat='43.35108' lon='18.84367' />
+ <node id='-47067' lat='43.36383' lon='18.90911' />
+ <node id='-47069' lat='43.32899' lon='18.95819' />
+ <node id='-47071' lat='43.29327' lon='18.95001' />
+ <node id='-47073' lat='43.24988' lon='19.00844' />
+ <node id='-47075' lat='43.30008' lon='19.04233' />
+ <node id='-47077' lat='43.29668' lon='19.08206' />
+ <node id='-47079' lat='43.31453' lon='19.08673' />
+ <node id='-47081' lat='43.43854' lon='19.01078' />
+ <node id='-47083' lat='43.53943' lon='19.15685' />
+ <node id='-47085' lat='43.50384' lon='19.04934' />
+ <node id='-47087' lat='43.55806' lon='19.01078' />
+ <node id='-47089' lat='43.50299' lon='18.91379' />
+ <node id='-47091' lat='43.45042' lon='18.96053' />
+ <node id='-47093' lat='43.49367' lon='18.95469' />
+ <node id='-47095' lat='40.73913' lon='26.12427' />
+ <node id='-47097' lat='40.78795' lon='26.12923' />
+ <node id='-47099' lat='40.83298' lon='26.21351' />
+ <node id='-47101' lat='40.86048' lon='26.20856' />
+ <node id='-47103' lat='40.94042' lon='26.32259' />
+ <node id='-47105' lat='41.24929' lon='26.32259' />
+ <node id='-47107' lat='40.94292' lon='26.35894' />
+ <node id='-47109' lat='41.07386' lon='26.31928' />
+ <node id='-47111' lat='41.33993' lon='26.5209' />
+ <node id='-47113' lat='41.25053' lon='26.39861' />
+ <node id='-47115' lat='41.32131' lon='26.5837' />
+ <node id='-47117' lat='41.34613' lon='26.62997' />
+ <node id='-47119' lat='41.60491' lon='26.59196' />
+ <node id='-47121' lat='41.67037' lon='26.47958' />
+ <node id='-47123' lat='41.62592' lon='26.5209' />
+ <node id='-47125' lat='41.02027' lon='26.3606' />
+ <node id='-47127' lat='40.98388' lon='26.33297' />
+ <node id='-47129' lat='40.9168' lon='26.26169' />
+ <node id='-47131' lat='40.89119' lon='26.29441' />
+ <node id='-47133' lat='40.93005' lon='26.28623' />
+ <node id='-47135' lat='41.56808' lon='24.52599' />
+ <node id='-47137' lat='41.42278' lon='24.61129' />
+ <node id='-47139' lat='41.51297' lon='24.30513' />
+ <node id='-47141' lat='41.57682' lon='24.27124' />
+ <node id='-47143' lat='41.53222' lon='24.06323' />
+ <node id='-47145' lat='41.46132' lon='24.06908' />
+ <node id='-47147' lat='41.39999' lon='23.40416' />
+ <node id='-47149' lat='41.40175' lon='23.76525' />
+ <node id='-47151' lat='41.43943' lon='23.80148' />
+ <node id='-47153' lat='41.31755' lon='23.1833' />
+ <node id='-47155' lat='41.36317' lon='23.33639' />
+ <node id='-47157' lat='41.37106' lon='23.22771' />
+ <node id='-47159' lat='41.40525' lon='23.31301' />
+ <node id='-47161' lat='41.33773' lon='23.21953' />
+ <node id='-47163' lat='41.37632' lon='23.63203' />
+ <node id='-47165' lat='41.41139' lon='23.67644' />
+ <node id='-47167' lat='41.40262' lon='23.52453' />
+ <node id='-47169' lat='41.45257' lon='23.89613' />
+ <node id='-47171' lat='41.47971' lon='23.91483' />
+ <node id='-47173' lat='41.44118' lon='23.96975' />
+ <node id='-47175' lat='41.51735' lon='24.18126' />
+ <node id='-47177' lat='41.54796' lon='24.10063' />
+ <node id='-47179' lat='41.23411' lon='25.28322' />
+ <node id='-47181' lat='41.34913' lon='24.8041' />
+ <node id='-47183' lat='41.41928' lon='24.71529' />
+ <node id='-47185' lat='41.4035' lon='24.82514' />
+ <node id='-47187' lat='41.34212' lon='25.11611' />
+ <node id='-47189' lat='41.38685' lon='24.942' />
+ <node id='-47191' lat='41.39298' lon='24.86136' />
+ <node id='-47193' lat='41.40876' lon='24.90928' />
+ <node id='-47195' lat='41.34563' lon='25.8266' />
+ <node id='-47197' lat='41.28506' lon='25.48187' />
+ <node id='-47199' lat='41.29209' lon='25.70507' />
+ <node id='-47201' lat='41.2798' lon='25.52394' />
+ <node id='-47203' lat='41.31667' lon='25.55082' />
+ <node id='-47205' lat='41.30614' lon='25.61042' />
+ <node id='-47207' lat='41.31316' lon='25.66183' />
+ <node id='-47209' lat='41.30526' lon='25.87919' />
+ <node id='-47211' lat='41.35878' lon='26.12926' />
+ <node id='-47213' lat='41.42278' lon='26.16548' />
+ <node id='-47215' lat='41.43943' lon='26.20288' />
+ <node id='-47217' lat='41.47533' lon='26.14796' />
+ <node id='-47219' lat='41.71544' lon='26.2654' />
+ <node id='-47221' lat='41.74139' lon='26.22888' />
+ <node id='-47223' lat='41.74858' lon='26.16841' />
+ <node id='-47225' lat='41.70345' lon='26.06148' />
+ <node id='-47227' lat='41.64584' lon='26.07083' />
+ <node id='-47229' lat='41.60828' lon='26.15146' />
+ <node id='-47231' lat='41.55496' lon='26.14328' />
+ <node id='-47233' lat='41.55409' lon='26.17951' />
+ <node id='-47235' lat='41.50072' lon='26.176' />
+ <node id='-47237' lat='41.73223' lon='26.21325' />
+ <node id='-47239' lat='41.73637' lon='26.32952' />
+ <node id='-47241' lat='34.80049' lon='41.2345' />
+ <node id='-47243' lat='37.17814' lon='42.32313' />
+ <node id='-47245' lat='37.22548' lon='42.34735' />
+ <node id='-47247' lat='37.27017' lon='42.26039' />
+ <node id='-47249' lat='37.2798' lon='42.2824' />
+ <node id='-47251' lat='36.6704' lon='37.10894' />
+ <node id='-47253' lat='36.66069' lon='37.16177' />
+ <node id='-47255' lat='36.66422' lon='37.02088' />
+ <node id='-47257' lat='36.69512' lon='37.01647' />
+ <node id='-47259' lat='36.71101' lon='37.04619' />
+ <node id='-47261' lat='36.73483' lon='37.04399' />
+ <node id='-47263' lat='36.74012' lon='36.99886' />
+ <node id='-47265' lat='36.49539' lon='36.54206' />
+ <node id='-47267' lat='36.58295' lon='36.58829' />
+ <node id='-47269' lat='36.65186' lon='36.57398' />
+ <node id='-47271' lat='36.71189' lon='36.62681' />
+ <node id='-47273' lat='36.74629' lon='36.61581' />
+ <node id='-47275' lat='36.33772' lon='36.6081' />
+ <node id='-47277' lat='36.33861' lon='36.65653' />
+ <node id='-47279' lat='36.20461' lon='36.4617' />
+ <node id='-47281' lat='36.2419' lon='36.50463' />
+ <node id='-47283' lat='36.22592' lon='36.6125' />
+ <node id='-47285' lat='36.01163' lon='36.37474' />
+ <node id='-47287' lat='35.88242' lon='35.99829' />
+ <node id='-47289' lat='35.85923' lon='36.11827' />
+ <node id='-47291' lat='35.83692' lon='36.13919' />
+ <node id='-47293' lat='35.81015' lon='36.14029' />
+ <node id='-47295' lat='35.80925' lon='36.1623' />
+ <node id='-47297' lat='35.92076' lon='36.17441' />
+ <node id='-47299' lat='35.95195' lon='36.19973' />
+ <node id='-47301' lat='35.96264' lon='36.25366' />
+ <node id='-47303' lat='35.94839' lon='36.27678' />
+ <node id='-47305' lat='35.96086' lon='36.29769' />
+ <node id='-47307' lat='36.00273' lon='36.28338' />
+ <node id='-47309' lat='36.00985' lon='36.30099' />
+ <node id='-47311' lat='35.98687' lon='36.33956' />
+ <node id='-47313' lat='37.37436' lon='43.11403' />
+ <node id='-47315' lat='37.30629' lon='43.30083' />
+ <node id='-47317' lat='37.33105' lon='43.33508' />
+ <node id='-47319' lat='37.24436' lon='43.50787' />
+ <node id='-47321' lat='37.25675' lon='43.56702' />
+ <node id='-47323' lat='37.21957' lon='43.63085' />
+ <node id='-47325' lat='37.23692' lon='43.7009' />
+ <node id='-47327' lat='37.22825' lon='43.8052' />
+ <node id='-47329' lat='37.19477' lon='43.82699' />
+ <node id='-47331' lat='37.22205' lon='43.84878' />
+ <node id='-47333' lat='37.22453' lon='43.90949' />
+ <node id='-47335' lat='37.33229' lon='44.02002' />
+ <node id='-47337' lat='37.32486' lon='44.13521' />
+ <node id='-47339' lat='37.25055' lon='44.2613' />
+ <node id='-47341' lat='36.97373' lon='44.30645' />
+ <node id='-47343' lat='37.09551' lon='44.18503' />
+ <node id='-47345' lat='37.15756' lon='44.22239' />
+ <node id='-47347' lat='37.16501' lon='44.27998' />
+ <node id='-47349' lat='36.98119' lon='44.25975' />
+ <node id='-47351' lat='37.19229' lon='44.63179' />
+ <node id='-47353' lat='37.05825' lon='44.42631' />
+ <node id='-47355' lat='37.05825' lon='44.38117' />
+ <node id='-47357' lat='37.04955' lon='44.35315' />
+ <node id='-47359' lat='37.02843' lon='44.35937' />
+ <node id='-47361' lat='37.16644' lon='44.7868' />
+ <node id='-47363' lat='37.16162' lon='44.76698' />
+ <node id='-47365' lat='31.00004' lon='47.68219' />
+ <node id='-47367' lat='30.9967' lon='48.03221' />
+ <node id='-47369' lat='30.4789' lon='48.02443' />
+ <node id='-47371' lat='30.44133' lon='48.14585' />
+ <node id='-47373' lat='30.39703' lon='48.18321' />
+ <node id='-47375' lat='30.33122' lon='48.19099' />
+ <node id='-47377' lat='30.31644' lon='48.21279' />
+ <node id='-47379' lat='30.34599' lon='48.25793' />
+ <node id='-47381' lat='30.20618' lon='48.41049' />
+ <node id='-47383' lat='30.17254' lon='48.41671' />
+ <node id='-47385' lat='30.13485' lon='48.38714' />
+ <node id='-47387' lat='30.11062' lon='48.38869' />
+ <node id='-47389' lat='30.08233' lon='48.43384' />
+ <node id='-47391' lat='30.00148' lon='48.44785' />
+ <node id='-47393' lat='29.96238' lon='48.51011' />
+ <node id='-47395' lat='29.93675' lon='48.61441' />
+ <node id='-47397' lat='31.78422' lon='47.86337' />
+ <node id='-47399' lat='31.39086' lon='47.6804' />
+ <node id='-47401' lat='32.45393' lon='47.17218' />
+ <node id='-47403' lat='32.47808' lon='47.37529' />
+ <node id='-47405' lat='32.20583' lon='47.57144' />
+ <node id='-47407' lat='32.15972' lon='47.52474' />
+ <node id='-47409' lat='32.07666' lon='47.64771' />
+ <node id='-47411' lat='32.91992' lon='46.46788' />
+ <node id='-47413' lat='34.7222' lon='45.65672' />
+ <node id='-47415' lat='33.97421' lon='45.41077' />
+ <node id='-47417' lat='33.63661' lon='45.89801' />
+ <node id='-47419' lat='33.55751' lon='45.96183' />
+ <node id='-47421' lat='33.49263' lon='45.86687' />
+ <node id='-47423' lat='33.5082' lon='45.99919' />
+ <node id='-47425' lat='33.20395' lon='46.20623' />
+ <node id='-47427' lat='33.11924' lon='46.11905' />
+ <node id='-47429' lat='33.13097' lon='46.05367' />
+ <node id='-47431' lat='33.09577' lon='46.03966' />
+ <node id='-47433' lat='33.07229' lon='46.15175' />
+ <node id='-47435' lat='32.98354' lon='46.09103' />
+ <node id='-47437' lat='32.95612' lon='46.17198' />
+ <node id='-47439' lat='32.9731' lon='46.32298' />
+ <node id='-47441' lat='33.60938' lon='45.77814' />
+ <node id='-47443' lat='33.94968' lon='45.50261' />
+ <node id='-47445' lat='33.9458' lon='45.42789' />
+ <node id='-47447' lat='34.15088' lon='45.56176' />
+ <node id='-47449' lat='34.30147' lon='45.58667' />
+ <node id='-47451' lat='34.35418' lon='45.54153' />
+ <node id='-47453' lat='34.3439' lon='45.49171' />
+ <node id='-47455' lat='34.45949' lon='45.43879' />
+ <node id='-47457' lat='34.60441' lon='45.53219' />
+ <node id='-47459' lat='34.48131' lon='45.51351' />
+ <node id='-47461' lat='34.55057' lon='45.60224' />
+ <node id='-47463' lat='34.54416' lon='45.73923' />
+ <node id='-47465' lat='34.69277' lon='45.70031' />
+ <node id='-47467' lat='35.2883' lon='46.15474' />
+ <node id='-47469' lat='35.23113' lon='46.11127' />
+ <node id='-47471' lat='35.22477' lon='46.17977' />
+ <node id='-47473' lat='35.18789' lon='46.19533' />
+ <node id='-47475' lat='35.16753' lon='46.16109' />
+ <node id='-47477' lat='35.1268' lon='46.15642' />
+ <node id='-47479' lat='35.11406' lon='46.18911' />
+ <node id='-47481' lat='35.04655' lon='46.06457' />
+ <node id='-47483' lat='35.09496' lon='45.9198' />
+ <node id='-47485' lat='34.91135' lon='45.78904' />
+ <node id='-47487' lat='34.89858' lon='45.86532' />
+ <node id='-47489' lat='34.82322' lon='45.70031' />
+ <node id='-47491' lat='34.84877' lon='45.73144' />
+ <node id='-47493' lat='34.85133' lon='45.79682' />
+ <node id='-47495' lat='35.48493' lon='45.98762' />
+ <node id='-47497' lat='35.79898' lon='45.76145' />
+ <node id='-47499' lat='35.8581' lon='46.08325' />
+ <node id='-47501' lat='35.8013' lon='46.17198' />
+ <node id='-47503' lat='35.82655' lon='46.32921' />
+ <node id='-47505' lat='35.78363' lon='46.34166' />
+ <node id='-47507' lat='35.71414' lon='46.23736' />
+ <node id='-47509' lat='35.69139' lon='46.01631' />
+ <node id='-47511' lat='35.63574' lon='45.99452' />
+ <node id='-47513' lat='35.57752' lon='46.02565' />
+ <node id='-47515' lat='35.58132' lon='45.97584' />
+ <node id='-47517' lat='35.52432' lon='46.00386' />
+ <node id='-47519' lat='36.43257' lon='45.23953' />
+ <node id='-47521' lat='36.06222' lon='45.37652' />
+ <node id='-47523' lat='35.92872' lon='45.6645' />
+ <node id='-47525' lat='36.00305' lon='45.53374' />
+ <node id='-47527' lat='35.97156' lon='45.38275' />
+ <node id='-47529' lat='35.99424' lon='45.33916' />
+ <node id='-47531' lat='36.77622' lon='44.84725' />
+ <node id='-47533' lat='36.75128' lon='45.01537' />
+ <node id='-47535' lat='36.6814' lon='45.06985' />
+ <node id='-47537' lat='36.62645' lon='45.06985' />
+ <node id='-47539' lat='36.40751' lon='45.11811' />
+ <node id='-47541' lat='36.5402' lon='45.00759' />
+ <node id='-47543' lat='36.81362' lon='44.83479' />
+ <node id='-47545' lat='36.86096' lon='44.90173' />
+ <node id='-47547' lat='37.01897' lon='44.89862' />
+ <node id='-47549' lat='37.04383' lon='44.81611' />
+ <node id='-47551' lat='37.11958' lon='44.75229' />
+ <node id='-47553' lat='41.09176' lon='44.97169' />
+ <node id='-47555' lat='41.0228' lon='45.26162' />
+ <node id='-47557' lat='40.67382' lon='45.51825' />
+ <node id='-47559' lat='41.1117' lon='43.74717' />
+ <node id='-47561' lat='41.24644' lon='44.18148' />
+ <node id='-47563' lat='41.29675' lon='44.81661' />
+ <node id='-47565' lat='41.18204' lon='44.46791' />
+ <node id='-47567' lat='41.24995' lon='44.80259' />
+ <node id='-47569' lat='41.21366' lon='44.89911' />
+ <node id='-47571' lat='41.20195' lon='44.87887' />
+ <node id='-47573' lat='41.23825' lon='44.62046' />
+ <node id='-47575' lat='41.20312' lon='44.34337' />
+ <node id='-47577' lat='41.2324' lon='44.35894' />
+ <node id='-47579' lat='41.19141' lon='44.16591' />
+ <node id='-47581' lat='41.16329' lon='43.84835' />
+ <node id='-47583' lat='41.13398' lon='43.67712' />
+ <node id='-47585' lat='40.87436' lon='45.60584' />
+ <node id='-47587' lat='40.99784' lon='45.35677' />
+ <node id='-47589' lat='41.02603' lon='45.39725' />
+ <node id='-47591' lat='41.01663' lon='45.44083' />
+ <node id='-47593' lat='40.97904' lon='45.40814' />
+ <node id='-47595' lat='40.65979' lon='45.35366' />
+ <node id='-47597' lat='40.78366' lon='45.55914' />
+ <node id='-47599' lat='40.7424' lon='45.4206' />
+ <node id='-47601' lat='40.53804' lon='45.42994' />
+ <node id='-47603' lat='40.57707' lon='45.45484' />
+ <node id='-47605' lat='40.37696' lon='45.65098' />
+ <node id='-47607' lat='40.27846' lon='45.95609' />
+ <node id='-47609' lat='40.0131' lon='45.59806' />
+ <node id='-47611' lat='40.03218' lon='45.78642' />
+ <node id='-47613' lat='39.98925' lon='45.83779' />
+ <node id='-47615' lat='40.181' lon='45.97944' />
+ <node id='-47617' lat='39.97733' lon='45.60895' />
+ <node id='-47619' lat='39.9475' lon='45.7833' />
+ <node id='-47621' lat='39.82925' lon='45.82533' />
+ <node id='-47623' lat='39.78859' lon='45.96543' />
+ <node id='-47625' lat='39.60533' lon='46.18493' />
+ <node id='-47627' lat='39.63651' lon='46.40286' />
+ <node id='-47629' lat='39.57534' lon='46.42465' />
+ <node id='-47631' lat='39.58734' lon='46.52117' />
+ <node id='-47633' lat='39.56694' lon='46.57098' />
+ <node id='-47635' lat='39.42039' lon='46.37795' />
+ <node id='-47637' lat='39.52373' lon='46.51027' />
+ <node id='-47639' lat='39.47809' lon='46.53051' />
+ <node id='-47641' lat='39.45405' lon='46.4013' />
+ <node id='-47643' lat='39.54414' lon='46.57721' />
+ <node id='-47645' lat='39.19636' lon='46.44022' />
+ <node id='-47647' lat='39.07078' lon='46.54296' />
+ <node id='-47649' lat='38.94982' lon='46.51805' />
+ <node id='-47651' lat='39.23013' lon='46.63481' />
+ <node id='-47653' lat='39.35181' lon='46.43244' />
+ <node id='-47655' lat='39.33736' lon='46.50093' />
+ <node id='-47657' lat='39.24942' lon='46.56476' />
+ <node id='-47659' lat='39.18912' lon='46.52584' />
+ <node id='-47661' lat='39.15895' lon='46.54141' />
+ <node id='-47663' lat='39.21204' lon='46.58032' />
+ <node id='-47665' lat='38.85169' lon='46.20516' />
+ <node id='-47667' lat='38.92076' lon='46.34059' />
+ <node id='-47669' lat='39.0744' lon='46.06973' />
+ <node id='-47671' lat='39.09978' lon='46.02303' />
+ <node id='-47673' lat='39.46487' lon='45.83' />
+ <node id='-47675' lat='39.60174' lon='45.70547' />
+ <node id='-47677' lat='39.67846' lon='45.18554' />
+ <node id='-47679' lat='39.58614' lon='45.17464' />
+ <node id='-47681' lat='39.57654' lon='45.29606' />
+ <node id='-47683' lat='39.61373' lon='45.30385' />
+ <node id='-47685' lat='39.61373' lon='45.23535' />
+ <node id='-47687' lat='39.58074' lon='45.21784' />
+ <node id='-47689' lat='39.74432' lon='44.88354' />
+ <node id='-47691' lat='39.72157' lon='44.92869' />
+ <node id='-47693' lat='39.97733' lon='44.46635' />
+ <node id='-47695' lat='40.01787' lon='43.92307' />
+ <node id='-47697' lat='40.11199' lon='43.65688' />
+ <node id='-47699' lat='40.47413' lon='43.54791' />
+ <node id='-47701' lat='40.43267' lon='43.60862' />
+ <node id='-47703' lat='40.34019' lon='43.59928' />
+ <node id='-47705' lat='40.16673' lon='43.71136' />
+ <node id='-47707' lat='40.14889' lon='43.65221' />
+ <node id='-47709' lat='40.66805' lon='43.7425' />
+ <node id='-47711' lat='40.93084' lon='43.67712' />
+ <node id='-47713' lat='41.02251' lon='43.47319' />
+ <node id='-47715' lat='41.0988' lon='43.44984' />
+ <node id='-47717' lat='40.54159' lon='43.63664' />
+ <node id='-47719' lat='40.98961' lon='43.58683' />
+ <node id='-47721' lat='40.84846' lon='43.67712' />
+ <node id='-47723' lat='40.7365' lon='43.74872' />
+ <node id='-47725' lat='39.65768' lon='44.80977' />
+ <node id='-47727' lat='39.59653' lon='44.88916' />
+ <node id='-47729' lat='39.34243' lon='45.09163' />
+ <node id='-47731' lat='39.21952' lon='45.16168' />
+ <node id='-47733' lat='39.18333' lon='45.30489' />
+ <node id='-47735' lat='39.08674' lon='45.41075' />
+ <node id='-47737' lat='38.87861' lon='46.06766' />
+ <node id='-47739' lat='38.99243' lon='45.44966' />
+ <node id='-47741' lat='38.90768' lon='45.83883' />
+ <node id='-47743' lat='38.87739' lon='45.90266' />
+ <node id='-47745' lat='38.89072' lon='45.94624' />
+ <node id='-47747' lat='38.87376' lon='46.00228' />
+ <node id='-47749' lat='39.07224' lon='45.40452' />
+ <node id='-47751' lat='39.04927' lon='45.44811' />
+ <node id='-47753' lat='39.13143' lon='46.83822' />
+ <node id='-47755' lat='39.16644' lon='46.92539' />
+ <node id='-47757' lat='39.13505' lon='46.95341' />
+ <node id='-47759' lat='39.20143' lon='47.05771' />
+ <node id='-47761' lat='39.24846' lon='47.05927' />
+ <node id='-47763' lat='39.37492' lon='47.31301' />
+ <node id='-47765' lat='39.30028' lon='48.15984' />
+ <node id='-47767' lat='39.25208' lon='48.12404' />
+ <node id='-47769' lat='39.19419' lon='48.15361' />
+ <node id='-47771' lat='39.09278' lon='48.31239' />
+ <node id='-47773' lat='38.97186' lon='48.28437' />
+ <node id='-47775' lat='38.91616' lon='48.07734' />
+ <node id='-47777' lat='38.45076' lon='48.58793' />
+ <node id='-47779' lat='38.40198' lon='48.62217' />
+ <node id='-47781' lat='38.40564' lon='48.70001' />
+ <node id='-47783' lat='38.45564' lon='48.79185' />
+ <node id='-47785' lat='41.65444' lon='48.42301' />
+ <node id='-47787' lat='41.49957' lon='48.07587' />
+ <node id='-47789' lat='41.51472' lon='48.22064' />
+ <node id='-47791' lat='41.60441' lon='48.40277' />
+ <node id='-47793' lat='41.21798' lon='47.87973' />
+ <node id='-47795' lat='41.20275' lon='47.54504' />
+ <node id='-47797' lat='41.22969' lon='47.62288' />
+ <node id='-47799' lat='41.19455' lon='47.75831' />
+ <node id='-47801' lat='41.80547' lon='46.58924' />
+ <node id='-47803' lat='41.8623' lon='46.75269' />
+ <node id='-47805' lat='41.27884' lon='47.34579' />
+ <node id='-47807' lat='41.59044' lon='47.10762' />
+ <node id='-47809' lat='41.76252' lon='46.8134' />
+ <node id='-47811' lat='41.63583' lon='47.00955' />
+ <node id='-47813' lat='41.59743' lon='46.99554' />
+ <node id='-47815' lat='41.55434' lon='47.03757' />
+ <node id='-47817' lat='41.87389' lon='46.5332' />
+ <node id='-47819' lat='41.45898' lon='45.45973' />
+ <node id='-47821' lat='41.3539' lon='45.68389' />
+ <node id='-47823' lat='41.36208' lon='45.71035' />
+ <node id='-47825' lat='41.35157' lon='45.75705' />
+ <node id='-47827' lat='41.29545' lon='45.69946' />
+ <node id='-47829' lat='41.2229' lon='45.80842' />
+ <node id='-47831' lat='41.19011' lon='46.27698' />
+ <node id='-47833' lat='41.19479' lon='46.13221' />
+ <node id='-47835' lat='41.17956' lon='45.95786' />
+ <node id='-47837' lat='41.84399' lon='46.3984' />
+ <node id='-47839' lat='41.75811' lon='46.23962' />
+ <node id='-47841' lat='41.77205' lon='46.20538' />
+ <node id='-47843' lat='41.62327' lon='46.19759' />
+ <node id='-47845' lat='41.72094' lon='46.17891' />
+ <node id='-47847' lat='41.59883' lon='46.24429' />
+ <node id='-47849' lat='41.10805' lon='46.37661' />
+ <node id='-47851' lat='41.09984' lon='46.456' />
+ <node id='-47853' lat='41.0576' lon='46.48558' />
+ <node id='-47855' lat='41.1104' lon='46.55096' />
+ <node id='-47857' lat='41.09515' lon='46.63969' />
+ <node id='-47859' lat='41.28609' lon='46.72375' />
+ <node id='-47861' lat='41.20533' lon='46.66148' />
+ <node id='-47863' lat='41.37727' lon='46.63658' />
+ <node id='-47865' lat='41.43331' lon='46.4669' />
+ <node id='-47867' lat='41.48464' lon='46.40307' />
+ <node id='-47869' lat='41.4963' lon='46.33925' />
+ <node id='-47871' lat='41.5724' lon='46.29794' />
+ <node id='-47873' lat='41.63339' lon='46.26531' />
+ <node id='-47875' lat='41.57454' lon='46.34126' />
+ <node id='-47877' lat='41.60089' lon='46.28182' />
+ <node id='-47879' lat='41.60912' lon='46.3253' />
+ <node id='-47881' lat='9.60062' lon='-4.31392' />
+ <node id='-47883' lat='9.76012' lon='-4.25999' />
+ <node id='-47885' lat='9.94279' lon='-3.69703' />
+ <node id='-47887' lat='9.91125' lon='-3.31779' />
+ <node id='-47889' lat='9.74019' lon='-3.00765' />
+ <node id='-47891' lat='9.40778' lon='-2.76494' />
+ <node id='-47893' lat='9.57403' lon='-2.93012' />
+ <node id='-47895' lat='9.93781' lon='-3.19306' />
+ <node id='-47897' lat='9.85147' lon='-3.16609' />
+ <node id='-47899' lat='9.84981' lon='-3.27228' />
+ <node id='-47901' lat='9.89132' lon='-4.96621' />
+ <node id='-47903' lat='9.70696' lon='-4.6426' />
+ <node id='-47905' lat='10.29788' lon='-5.12465' />
+ <node id='-47907' lat='9.99923' lon='-4.96453' />
+ <node id='-47909' lat='10.2929' lon='-5.39602' />
+ <node id='-47911' lat='8.7789' lon='-2.58243' />
+ <node id='-47913' lat='9.04949' lon='-2.77799' />
+ <node id='-47915' lat='9.01771' lon='-2.66357' />
+ <node id='-47917' lat='9.22717' lon='-2.69814' />
+ <node id='-47919' lat='6.81744' lon='-3.23327' />
+ <node id='-47921' lat='7.23737' lon='-2.95438' />
+ <node id='-47923' lat='7.27165' lon='-2.97822' />
+ <node id='-47925' lat='7.60847' lon='-2.92339' />
+ <node id='-47927' lat='8.02055' lon='-2.67787' />
+ <node id='-47929' lat='7.86002' lon='-2.79467' />
+ <node id='-47931' lat='7.94974' lon='-2.78395' />
+ <node id='-47933' lat='7.92613' lon='-2.74819' />
+ <node id='-47935' lat='8.02645' lon='-2.61232' />
+ <node id='-47937' lat='8.11495' lon='-2.62901' />
+ <node id='-47939' lat='5.71697' lon='-3.01896' />
+ <node id='-47941' lat='6.62521' lon='-3.25999' />
+ <node id='-47943' lat='5.60963' lon='-2.76614' />
+ <node id='-47945' lat='5.34789' lon='-2.72737' />
+ <node id='-47947' lat='5.34621' lon='-2.77625' />
+ <node id='-47949' lat='5.1364' lon='-2.73074' />
+ <node id='-47951' lat='5.71865' lon='-2.95323' />
+ <node id='-47953' lat='5.65156' lon='-2.85378' />
+ <node id='-47955' lat='5.6415' lon='-2.96671' />
+ <node id='-47957' lat='5.62137' lon='-2.93132' />
+ <node id='-47959' lat='6.74407' lon='-3.21954' />
+ <node id='-47961' lat='10.64281' lon='-2.94232' />
+ <node id='-47963' lat='10.40252' lon='-2.83108' />
+ <node id='-47965' lat='9.56589' lon='-2.76534' />
+ <node id='-47967' lat='9.83172' lon='-2.74174' />
+ <node id='-47969' lat='10.99811' lon='-0.67143' />
+ <node id='-47971' lat='11.17157' lon='-0.27374' />
+ <node id='-47973' lat='10.91305' lon='-0.61937' />
+ <node id='-47975' lat='11.12713' lon='-0.28566' />
+ <node id='-47977' lat='11.11661' lon='-0.42391' />
+ <node id='-47979' lat='11.12596' lon='-0.38219' />
+ <node id='-47981' lat='11.07801' lon='-0.35955' />
+ <node id='-47983' lat='11.04292' lon='-0.44298' />
+ <node id='-47985' lat='11.08317' lon='0.00342' />
+ <node id='-47987' lat='10.63458' lon='-0.05945' />
+ <node id='-47989' lat='8.29529' lon='0.73432' />
+ <node id='-47991' lat='7.41099' lon='0.62943' />
+ <node id='-47993' lat='6.94391' lon='0.52098' />
+ <node id='-47995' lat='7.01252' lon='0.59606' />
+ <node id='-47997' lat='7.31643' lon='0.65327' />
+ <node id='-47999' lat='6.9723' lon='0.52217' />
+ <node id='-48001' lat='6.33779' lon='0.89283' />
+ <node id='-48003' lat='6.33779' lon='0.99652' />
+ <node id='-48005' lat='6.17074' lon='1.09187' />
+ <node id='-48007' lat='6.24064' lon='1.03108' />
+ <node id='-48009' lat='6.22998' lon='1.05969' />
+ <node id='-48011' lat='6.56517' lon='0.74862' />
+ <node id='-48013' lat='6.53083' lon='0.71048' />
+ <node id='-48015' lat='6.73682' lon='0.6497' />
+ <node id='-48017' lat='6.63857' lon='0.63659' />
+ <node id='-48019' lat='6.76049' lon='0.58176' />
+ <node id='-48021' lat='6.92971' lon='0.56508' />
+ <node id='-48023' lat='6.83978' lon='0.54124' />
+ <node id='-48025' lat='7.39326' lon='0.57223' />
+ <node id='-48027' lat='7.58706' lon='0.51979' />
+ <node id='-48029' lat='7.45354' lon='0.52455' />
+ <node id='-48031' lat='7.62368' lon='0.58295' />
+ <node id='-48033' lat='7.85751' lon='0.62943' />
+ <node id='-48035' lat='8.12779' lon='0.58891' />
+ <node id='-48037' lat='8.25873' lon='0.63897' />
+ <node id='-48039' lat='8.13959' lon='0.6056' />
+ <node id='-48041' lat='8.18324' lon='0.61156' />
+ <node id='-48043' lat='8.19622' lon='0.5913' />
+ <node id='-48045' lat='9.40697' lon='0.56388' />
+ <node id='-48047' lat='8.75262' lon='0.37319' />
+ <node id='-48049' lat='8.48866' lon='0.64731' />
+ <node id='-48051' lat='8.59945' lon='0.47211' />
+ <node id='-48053' lat='8.87746' lon='0.52455' />
+ <node id='-48055' lat='9.04581' lon='0.45424' />
+ <node id='-48057' lat='10.31112' lon='0.39584' />
+ <node id='-48059' lat='9.47869' lon='0.2254' />
+ <node id='-48061' lat='9.48339' lon='0.49118' />
+ <node id='-48063' lat='9.49749' lon='0.36485' />
+ <node id='-48065' lat='9.42696' lon='0.25758' />
+ <node id='-48067' lat='9.44812' lon='0.33148' />
+ <node id='-48069' lat='9.72781' lon='0.32075' />
+ <node id='-48071' lat='10.03309' lon='0.36366' />
+ <node id='-48073' lat='10.02018' lon='0.41252' />
+ <node id='-48075' lat='10.06361' lon='0.41371' />
+ <node id='-48077' lat='10.09412' lon='0.35293' />
+ <node id='-48079' lat='9.71607' lon='0.34816' />
+ <node id='-48081' lat='9.66907' lon='0.34816' />
+ <node id='-48083' lat='9.6491' lon='0.32313' />
+ <node id='-48085' lat='9.69022' lon='0.28261' />
+ <node id='-48087' lat='9.66437' lon='0.26712' />
+ <node id='-48089' lat='9.59387' lon='0.29334' />
+ <node id='-48091' lat='9.6256' lon='0.36008' />
+ <node id='-48093' lat='9.58682' lon='0.38153' />
+ <node id='-48095' lat='9.57389' lon='0.23851' />
+ <node id='-48097' lat='9.50337' lon='0.31241' />
+ <node id='-48099' lat='9.521' lon='0.30406' />
+ <node id='-48101' lat='9.52335' lon='0.2409' />
+ <node id='-48103' lat='10.53149' lon='0.12886' />
+ <node id='-48105' lat='10.41546' lon='0.29453' />
+ <node id='-48107' lat='10.30408' lon='0.33028' />
+ <node id='-48109' lat='10.4096' lon='0.18846' />
+ <node id='-48111' lat='10.98561' lon='0.48852' />
+ <node id='-48113' lat='10.98035' lon='0.50521' />
+ <node id='-48115' lat='9.0527' lon='1.61838' />
+ <node id='-48117' lat='9.99525' lon='1.35507' />
+ <node id='-48119' lat='10.37665' lon='0.77666' />
+ <node id='-48121' lat='10.71459' lon='0.80358' />
+ <node id='-48123' lat='10.803' lon='0.8804' />
+ <node id='-48125' lat='9.5951' lon='1.36624' />
+ <node id='-48127' lat='9.54765' lon='1.33675' />
+ <node id='-48129' lat='9.3226' lon='1.41746' />
+ <node id='-48131' lat='9.16941' lon='1.5649' />
+ <node id='-48133' lat='6.99562' lon='1.64249' />
+ <node id='-48135' lat='6.99737' lon='1.55877' />
+ <node id='-48137' lat='6.68619' lon='1.58105' />
+ <node id='-48139' lat='6.74843' lon='1.61812' />
+ <node id='-48141' lat='6.43189' lon='1.76906' />
+ <node id='-48143' lat='9.06924' lon='2.77907' />
+ <node id='-48145' lat='10.40538' lon='3.78292' />
+ <node id='-48147' lat='10.46351' lon='3.6844' />
+ <node id='-48149' lat='10.27185' lon='3.57275' />
+ <node id='-48151' lat='10.18136' lon='3.66908' />
+ <node id='-48153' lat='9.10006' lon='3.08017' />
+ <node id='-48155' lat='9.47167' lon='3.13928' />
+ <node id='-48157' lat='9.87739' lon='3.54429' />
+ <node id='-48159' lat='9.83641' lon='3.35383' />
+ <node id='-48161' lat='9.78032' lon='3.32099' />
+ <node id='-48163' lat='9.70696' lon='3.34726' />
+ <node id='-48165' lat='9.61632' lon='3.25093' />
+ <node id='-48167' lat='9.28375' lon='3.14147' />
+ <node id='-48169' lat='11.29765' lon='3.49175' />
+ <node id='-48171' lat='11.13015' lon='3.71505' />
+ <node id='-48173' lat='10.59316' lon='3.84243' />
+ <node id='-48175' lat='7.87825' lon='2.67523' />
+ <node id='-48177' lat='7.7755' lon='2.73095' />
+ <node id='-48179' lat='7.5423' lon='2.73405' />
+ <node id='-48181' lat='7.5116' lon='2.78668' />
+ <node id='-48183' lat='7.43486' lon='2.79442' />
+ <node id='-48185' lat='7.42565' lon='2.74489' />
+ <node id='-48187' lat='6.95722' lon='2.71702' />
+ <node id='-48189' lat='7.13543' lon='2.76965' />
+ <node id='-48191' lat='6.92802' lon='2.74024' />
+ <node id='-48193' lat='6.78508' lon='2.73405' />
+ <node id='-48195' lat='6.76356' lon='2.78823' />
+ <node id='-48197' lat='6.70514' lon='2.78204' />
+ <node id='-48199' lat='6.64057' lon='2.7325' />
+ <node id='-48201' lat='6.57291' lon='2.74334' />
+ <node id='-48203' lat='6.50831' lon='2.70464' />
+ <node id='-48205' lat='-22.22907' lon='29.0151' />
+ <node id='-48207' lat='-22.44299' lon='28.91889' />
+ <node id='-48209' lat='-22.5694' lon='28.34874' />
+ <node id='-48211' lat='-23.37952' lon='27.52393' />
+ <node id='-48213' lat='-23.65486' lon='26.99749' />
+ <node id='-48215' lat='-23.40917' lon='27.33768' />
+ <node id='-48217' lat='-24.24885' lon='26.84165' />
+ <node id='-48219' lat='-24.60358' lon='26.46346' />
+ <node id='-48221' lat='-24.47219' lon='26.51667' />
+ <node id='-48223' lat='-24.75727' lon='25.8515' />
+ <node id='-48225' lat='-26.9039' lon='20.68596' />
+ <node id='-48227' lat='-26.14892' lon='20.86081' />
+ <node id='-48229' lat='-26.4692' lon='20.61754' />
+ <node id='-48231' lat='-26.78181' lon='20.63275' />
+ <node id='-48233' lat='-24.94869' lon='20.29826' />
+ <node id='-48235' lat='-25.47827' lon='20.64795' />
+ <node id='-48237' lat='-25.29971' lon='23.03497' />
+ <node id='-48239' lat='-26.86152' lon='21.69322' />
+ <node id='-48241' lat='-26.80047' lon='20.87031' />
+ <node id='-48243' lat='-26.19668' lon='22.56365' />
+ <node id='-48245' lat='-25.50572' lon='22.86012' />
+ <node id='-48247' lat='-25.99186' lon='22.70808' />
+ <node id='-48249' lat='-26.23078' lon='22.41921' />
+ <node id='-48251' lat='-26.61882' lon='22.06192' />
+ <node id='-48253' lat='-26.3773' lon='22.21206' />
+ <node id='-48255' lat='-26.69015' lon='21.77114' />
+ <node id='-48257' lat='-25.64286' lon='23.9244' />
+ <node id='-48259' lat='-25.29971' lon='23.47588' />
+ <node id='-48261' lat='-25.62916' lon='24.18287' />
+ <node id='-48263' lat='-25.773' lon='24.36531' />
+ <node id='-48265' lat='-25.73021' lon='24.44703' />
+ <node id='-48267' lat='-25.81749' lon='24.67319' />
+ <node id='-48269' lat='-25.72507' lon='25.01718' />
+ <node id='-48271' lat='-25.76616' lon='25.33076' />
+ <node id='-48273' lat='-25.6343' lon='25.58543' />
+ <node id='-48275' lat='-24.87802' lon='25.88571' />
+ <node id='-48277' lat='-26.86661' lon='21.13353' />
+ <node id='-48279' lat='-26.82083' lon='21.37869' />
+ <node id='-48281' lat='-26.79199' lon='21.7854' />
+ <node id='-48283' lat='-26.66808' lon='21.90703' />
+ <node id='-48285' lat='-26.65959' lon='21.83291' />
+ <node id='-48287' lat='-25.80723' lon='24.8946' />
+ <node id='-48289' lat='-25.75931' lon='25.12266' />
+ <node id='-48291' lat='-25.29284' lon='25.69661' />
+ <node id='-48293' lat='-25.4491' lon='25.6643' />
+ <node id='-48295' lat='-25.25503' lon='25.72702' />
+ <node id='-48297' lat='-24.78661' lon='25.84295' />
+ <node id='-48299' lat='-24.63468' lon='26.39409' />
+ <node id='-48301' lat='-23.21894' lon='27.6066' />
+ <node id='-48303' lat='-23.2137' lon='27.74154' />
+ <node id='-48305' lat='-23.04941' lon='27.93539' />
+ <node id='-48307' lat='-22.96194' lon='27.93729' />
+ <node id='-48309' lat='-22.90243' lon='28.04752' />
+ <node id='-48311' lat='-22.8394' lon='28.04562' />
+ <node id='-48313' lat='-22.55887' lon='28.63287' />
+ <node id='-48315' lat='-22.36919' lon='31.38336' />
+ <node id='-48317' lat='-22.12917' lon='29.64609' />
+ <node id='-48319' lat='-22.35587' lon='30.28351' />
+ <node id='-48321' lat='-22.28907' lon='30.86696' />
+ <node id='-48323' lat='-22.34884' lon='31.08932' />
+ <node id='-48325' lat='-22.32599' lon='31.16344' />
+ <node id='-48327' lat='-22.14128' lon='29.76848' />
+ <node id='-48329' lat='-22.30841' lon='30.13147' />
+ <node id='-48331' lat='-22.2961' lon='30.2265' />
+ <node id='-48333' lat='-22.31368' lon='30.48686' />
+ <node id='-48335' lat='-22.34533' lon='30.38614' />
+ <node id='-48337' lat='-22.32599' lon='30.6294' />
+ <node id='-48339' lat='-22.19408' lon='29.92242' />
+ <node id='-48341' lat='-23.176' lon='31.55779' />
+ <node id='-48343' lat='-23.95293' lon='31.87707' />
+ <node id='-48345' lat='-23.47268' lon='31.56539' />
+ <node id='-48347' lat='-23.90082' lon='31.77445' />
+ <node id='-48349' lat='-23.60858' lon='31.67942' />
+ <node id='-48351' lat='-23.72695' lon='31.70223' />
+ <node id='-48353' lat='-24.18892' lon='31.90368' />
+ <node id='-48355' lat='-24.29983' lon='31.9835' />
+ <node id='-48357' lat='-25.84216' lon='31.92649' />
+ <node id='-48359' lat='-25.65044' lon='32.00631' />
+ <node id='-48361' lat='-25.46356' lon='31.97875' />
+ <node id='-48363' lat='-25.38117' lon='32.01676' />
+ <node id='-48365' lat='-25.10785' lon='32.03196' />
+ <node id='-48367' lat='-20.49873' lon='27.28865' />
+ <node id='-48369' lat='-19.53709' lon='26.17227' />
+ <node id='-48371' lat='-18.6355' lon='25.79217' />
+ <node id='-48373' lat='-18.82808' lon='25.82353' />
+ <node id='-48375' lat='-18.90362' lon='25.94326' />
+ <node id='-48377' lat='-19.02943' lon='25.99837' />
+ <node id='-48379' lat='-19.08152' lon='25.96226' />
+ <node id='-48381' lat='-20.08244' lon='27.21278' />
+ <node id='-48383' lat='-19.92707' lon='26.72246' />
+ <node id='-48385' lat='-20.28935' lon='27.29831' />
+ <node id='-48387' lat='-18.39041' lon='25.53465' />
+ <node id='-48389' lat='-18.12691' lon='25.39972' />
+ <node id='-48391' lat='-18.07091' lon='25.31799' />
+ <node id='-48393' lat='-18.56165' lon='25.68859' />
+ <node id='-48395' lat='-20.48531' lon='27.69361' />
+ <node id='-48397' lat='-20.51735' lon='27.72972' />
+ <node id='-48399' lat='-21.08409' lon='27.69171' />
+ <node id='-48401' lat='-21.57624' lon='28.01669' />
+ <node id='-48403' lat='-21.31621' lon='27.91407' />
+ <node id='-48405' lat='-21.81877' lon='29.07763' />
+ <node id='-48407' lat='-21.63455' lon='28.58114' />
+ <node id='-48409' lat='-21.59037' lon='28.29416' />
+ <node id='-48411' lat='-21.66634' lon='28.49942' />
+ <node id='-48413' lat='-22.05967' lon='29.24648' />
+ <node id='-48415' lat='-22.00563' lon='29.04108' />
+ <node id='-48417' lat='-21.90647' lon='29.02191' />
+ <node id='-48419' lat='-22.07275' lon='29.14501' />
+ <node id='-48421' lat='-22.07472' lon='29.1974' />
+ <node id='-48423' lat='-22.04867' lon='29.08495' />
+ <node id='-48425' lat='-21.95665' lon='29.02191' />
+ <node id='-48427' lat='-21.85864' lon='29.04023' />
+ <node id='-48429' lat='-22.18363' lon='29.3533' />
+ <node id='-48431' lat='-22.17771' lon='29.21955' />
+ <node id='-48433' lat='-22.21399' lon='29.15268' />
+ <node id='-48435' lat='-22.18599' lon='29.18974' />
+ <node id='-48437' lat='-22.21202' lon='29.10881' />
+ <node id='-48439' lat='15.23478' lon='36.54276' />
+ <node id='-48441' lat='15.75323' lon='36.69761' />
+ <node id='-48443' lat='15.80831' lon='36.76371' />
+ <node id='-48445' lat='17.07172' lon='36.99777' />
+ <node id='-48447' lat='17.04041' lon='37.42694' />
+ <node id='-48449' lat='16.23451' lon='36.92193' />
+ <node id='-48451' lat='17.32199' lon='37.50967' />
+ <node id='-48453' lat='17.53906' lon='38.13362' />
+ <node id='-48455' lat='14.89447' lon='37.91287' />
+ <node id='-48457' lat='14.18413' lon='37.528' />
+ <node id='-48459' lat='14.27155' lon='37.09486' />
+ <node id='-48461' lat='14.40746' lon='37.13206' />
+ <node id='-48463' lat='14.44657' lon='37.3106' />
+ <node id='-48465' lat='14.2149' lon='37.47319' />
+ <node id='-48467' lat='14.2561' lon='37.01622' />
+ <node id='-48469' lat='14.32201' lon='36.85787' />
+ <node id='-48471' lat='14.31172' lon='36.63364' />
+ <node id='-48473' lat='14.28237' lon='36.55659' />
+ <node id='-48475' lat='14.26177' lon='36.56536' />
+ <node id='-48477' lat='14.53969' lon='40.14649' />
+ <node id='-48479' lat='14.41445' lon='38.45748' />
+ <node id='-48481' lat='14.67287' lon='38.25562' />
+ <node id='-48483' lat='14.72745' lon='38.0364' />
+ <node id='-48485' lat='14.51323' lon='38.3533' />
+ <node id='-48487' lat='14.4754' lon='38.78306' />
+ <node id='-48489' lat='14.54895' lon='38.98058' />
+ <node id='-48491' lat='14.63717' lon='39.02834' />
+ <node id='-48493' lat='14.65187' lon='39.16074' />
+ <node id='-48495' lat='14.61827' lon='39.14772' />
+ <node id='-48497' lat='14.56996' lon='39.19547' />
+ <node id='-48499' lat='14.41024' lon='39.9443' />
+ <node id='-48501' lat='14.54264' lon='40.07236' />
+ <node id='-48503' lat='14.49011' lon='39.52756' />
+ <node id='-48505' lat='14.55735' lon='39.50585' />
+ <node id='-48507' lat='14.60987' lon='39.58182' />
+ <node id='-48509' lat='14.54264' lon='39.76632' />
+ <node id='-48511' lat='14.54054' lon='39.37128' />
+ <node id='-48513' lat='14.40393' lon='39.2519' />
+ <node id='-48515' lat='14.44598' lon='39.2302' />
+ <node id='-48517' lat='14.48801' lon='39.26927' />
+ <node id='-48519' lat='14.56365' lon='39.23888' />
+ <node id='-48521' lat='13.60787' lon='41.25097' />
+ <node id='-48523' lat='14.39342' lon='40.21128' />
+ <node id='-48525' lat='14.41445' lon='40.25686' />
+ <node id='-48527' lat='14.11152' lon='40.9167' />
+ <node id='-48529' lat='13.38626' lon='41.62864' />
+ <node id='-48531' lat='12.80912' lon='42.05841' />
+ <node id='-48533' lat='12.75832' lon='42.21469' />
+ <node id='-48535' lat='12.6355' lon='42.2798' />
+ <node id='-48537' lat='-21.133' lon='32.37115' />
+ <node id='-48539' lat='-20.91929' lon='32.51644' />
+ <node id='-48541' lat='-20.63319' lon='32.48122' />
+ <node id='-48543' lat='-20.56312' lon='32.55167' />
+ <node id='-48545' lat='-20.56106' lon='32.66174' />
+ <node id='-48547' lat='-19.77787' lon='33.06461' />
+ <node id='-48549' lat='-20.02007' lon='33.01178' />
+ <node id='-48551' lat='-20.03868' lon='32.93032' />
+ <node id='-48553' lat='-20.27841' lon='32.85987' />
+ <node id='-48555' lat='-20.16686' lon='32.85987' />
+ <node id='-48557' lat='-19.68462' lon='32.84666' />
+ <node id='-48559' lat='-19.67219' lon='32.95013' />
+ <node id='-48561' lat='-19.48343' lon='32.84446' />
+ <node id='-48563' lat='-19.47513' lon='32.78282' />
+ <node id='-48565' lat='-19.29238' lon='32.85107' />
+ <node id='-48567' lat='-19.0262' lon='32.84006' />
+ <node id='-48569' lat='-19.09279' lon='32.87088' />
+ <node id='-48571' lat='-19.02204' lon='32.72118' />
+ <node id='-48573' lat='-18.94293' lon='32.69917' />
+ <node id='-48575' lat='-18.92628' lon='32.73439' />
+ <node id='-48577' lat='-18.84712' lon='32.70137' />
+ <node id='-48579' lat='-18.77419' lon='32.82465' />
+ <node id='-48581' lat='-18.7992' lon='32.9017' />
+ <node id='-48583' lat='-18.69079' lon='32.95013' />
+ <node id='-48585' lat='-18.58023' lon='32.88629' />
+ <node id='-48587' lat='-18.51344' lon='32.88629' />
+ <node id='-48589' lat='-18.4696' lon='33.02278' />
+ <node id='-48591' lat='-17.60298' lon='33.0492' />
+ <node id='-48593' lat='-17.99705' lon='32.94133' />
+ <node id='-48595' lat='-18.35054' lon='33.03159' />
+ <node id='-48597' lat='-17.11971' lon='32.96554' />
+ <node id='-48599' lat='-17.48964' lon='32.96554' />
+ <node id='-48601' lat='-17.55891' lon='32.98536' />
+ <node id='-48603' lat='-17.3468' lon='33.0426' />
+ <node id='-48605' lat='-17.30477' lon='33.00517' />
+ <node id='-48607' lat='-16.41569' lon='31.91324' />
+ <node id='-48609' lat='-16.43892' lon='32.28529' />
+ <node id='-48611' lat='-16.59932' lon='32.71017' />
+ <node id='-48613' lat='-16.66893' lon='32.69917' />
+ <node id='-48615' lat='-16.70689' lon='32.97655' />
+ <node id='-48617' lat='-16.89446' lon='32.91051' />
+ <node id='-48619' lat='-16.70267' lon='32.78943' />
+ <node id='-48621' lat='-16.4727' lon='32.42838' />
+ <node id='-48623' lat='-16.43892' lon='32.02772' />
+ <node id='-48625' lat='-15.99924' lon='30.91597' />
+ <node id='-48627' lat='-16.05848' lon='30.97761' />
+ <node id='-48629' lat='-15.98019' lon='31.13171' />
+ <node id='-48631' lat='-16.01193' lon='31.30563' />
+ <node id='-48633' lat='-16.15154' lon='31.42451' />
+ <node id='-48635' lat='-16.19595' lon='31.67988' />
+ <node id='-48637' lat='-16.34388' lon='31.90223' />
+ <node id='-48639' lat='-13.93992' lon='33.16749' />
+ <node id='-48641' lat='-14.05022' lon='33.02977' />
+ <node id='-48643' lat='-13.82956' lon='32.88985' />
+ <node id='-48645' lat='-13.60019' lon='32.66468' />
+ <node id='-48647' lat='-13.77224' lon='32.76962' />
+ <node id='-48649' lat='-13.71278' lon='32.83739' />
+ <node id='-48651' lat='-13.65543' lon='32.78711' />
+ <node id='-48653' lat='-13.64268' lon='32.68654' />
+ <node id='-48655' lat='-13.55769' lon='32.68436' />
+ <node id='-48657' lat='-13.57682' lon='32.73683' />
+ <node id='-48659' lat='-13.52794' lon='32.84176' />
+ <node id='-48661' lat='-13.98447' lon='33.07568' />
+ <node id='-48663' lat='-13.95689' lon='32.99042' />
+ <node id='-48665' lat='-15.76589' lon='29.21955' />
+ <node id='-48667' lat='-15.68702' lon='29.4437' />
+ <node id='-48669' lat='-15.6126' lon='29.8317' />
+ <node id='-48671' lat='-15.6513' lon='30.35574' />
+ <node id='-48673' lat='-16.5528' lon='28.73725' />
+ <node id='-48675' lat='-16.51575' lon='28.76199' />
+ <node id='-48677' lat='-16.48611' lon='28.81454' />
+ <node id='-48679' lat='-16.04537' lon='28.8501' />
+ <node id='-48681' lat='-15.93987' lon='28.9243' />
+ <node id='-48683' lat='-17.81398' lon='27.14196' />
+ <node id='-48685' lat='-17.60487' lon='27.30736' />
+ <node id='-48687' lat='-18.0199' lon='26.74314' />
+ <node id='-48689' lat='-17.98756' lon='26.89926' />
+ <node id='-48691' lat='-17.81987' lon='25.6827' />
+ <node id='-48693' lat='-17.91403' lon='25.85738' />
+ <node id='-48695' lat='-17.97726' lon='25.85892' />
+ <node id='-48697' lat='-17.88608' lon='26.21601' />
+ <node id='-48699' lat='-17.99638' lon='26.55918' />
+ <node id='-48701' lat='-17.93021' lon='26.0908' />
+ <node id='-48703' lat='-17.98168' lon='26.08925' />
+ <node id='-48705' lat='-14.61306' lon='33.66677' />
+ <node id='-48707' lat='-14.39174' lon='34.36943' />
+ <node id='-48709' lat='-14.99583' lon='34.61522' />
+ <node id='-48711' lat='-14.60426' lon='34.53174' />
+ <node id='-48713' lat='-15.60864' lon='34.44981' />
+ <node id='-48715' lat='-15.44778' lon='34.43126' />
+ <node id='-48717' lat='-15.30619' lon='34.57503' />
+ <node id='-48719' lat='-17.1244' lon='35.3062' />
+ <node id='-48721' lat='-16.20923' lon='34.40344' />
+ <node id='-48723' lat='-16.83167' lon='35.04805' />
+ <node id='-48725' lat='-17.00027' lon='35.04805' />
+ <node id='-48727' lat='-16.93521' lon='35.17017' />
+ <node id='-48729' lat='-16.81687' lon='35.13771' />
+ <node id='-48731' lat='-16.93817' lon='35.27065' />
+ <node id='-48733' lat='-16.82871' lon='35.30929' />
+ <node id='-48735' lat='-16.56812' lon='35.14235' />
+ <node id='-48737' lat='-16.69402' lon='35.27219' />
+ <node id='-48739' lat='-16.04737' lon='34.43126' />
+ <node id='-48741' lat='-15.90321' lon='34.25195' />
+ <node id='-48743' lat='-16.2211' lon='35.30157' />
+ <node id='-48745' lat='-16.4792' lon='35.25828' />
+ <node id='-48747' lat='-11.3123' lon='37.8388' />
+ <node id='-48749' lat='-11.41081' lon='35.82767' />
+ <node id='-48751' lat='-11.55927' lon='35.63599' />
+ <node id='-48753' lat='-11.57593' lon='36.19094' />
+ <node id='-48755' lat='-11.70008' lon='36.19094' />
+ <node id='-48757' lat='-11.72884' lon='36.62068' />
+ <node id='-48759' lat='-11.56836' lon='36.80309' />
+ <node id='-48761' lat='-11.68949' lon='37.3936' />
+ <node id='-48763' lat='-11.53352' lon='37.76614' />
+ <node id='-48765' lat='-11.4199' lon='38.47258' />
+ <node id='-48767' lat='-11.27289' lon='38.21598' />
+ <node id='-48769' lat='-11.26228' lon='37.93618' />
+ <node id='-48771' lat='-11.17433' lon='39.24395' />
+ <node id='-48773' lat='-11.16978' lon='38.88996' />
+ <node id='-48775' lat='-10.80255' lon='40.00295' />
+ <node id='-48777' lat='-10.96043' lon='39.58249' />
+ <node id='-48779' lat='11.41645' lon='22.93124' />
+ <node id='-48781' lat='11.21955' lon='22.97249' />
+ <node id='-48783' lat='13.3731' lon='22.29689' />
+ <node id='-48785' lat='12.74682' lon='22.22684' />
+ <node id='-48787' lat='12.07485' lon='22.64092' />
+ <node id='-48789' lat='12.45514' lon='22.38873' />
+ <node id='-48791' lat='12.61925' lon='22.46345' />
+ <node id='-48793' lat='12.02766' lon='22.48369' />
+ <node id='-48795' lat='12.16769' lon='22.50548' />
+ <node id='-48797' lat='11.64372' lon='22.54907' />
+ <node id='-48799' lat='11.40424' lon='22.7997' />
+ <node id='-48801' lat='12.81362' lon='21.81432' />
+ <node id='-48803' lat='12.68001' lon='21.89371' />
+ <node id='-48805' lat='12.66634' lon='22.15679' />
+ <node id='-48807' lat='12.63292' lon='21.98711' />
+ <node id='-48809' lat='13.05637' lon='21.94819' />
+ <node id='-48811' lat='13.19281' lon='22.1599' />
+ <node id='-48813' lat='13.13976' lon='22.02914' />
+ <node id='-48815' lat='14.11704' lon='22.5553' />
+ <node id='-48817' lat='13.77863' lon='22.08674' />
+ <node id='-48819' lat='13.96754' lon='22.22995' />
+ <node id='-48821' lat='14.69149' lon='22.70474' />
+ <node id='-48823' lat='14.58907' lon='22.38562' />
+ <node id='-48825' lat='14.24986' lon='22.44944' />
+ <node id='-48827' lat='14.23024' lon='22.55997' />
+ <node id='-48829' lat='14.86308' lon='22.66115' />
+ <node id='-48831' lat='15.71297' lon='23.10792' />
+ <node id='-48833' lat='15.22989' lon='22.99584' />
+ <node id='-48835' lat='15.40105' lon='22.99584' />
+ <node id='-48837' lat='15.47007' lon='22.92579' />
+ <node id='-48839' lat='15.55107' lon='22.93201' />
+ <node id='-48841' lat='15.69649' lon='23.38812' />
+ <node id='-48843' lat='15.7804' lon='23.62785' />
+ <node id='-48845' lat='9.86923' lon='23.67164' />
+ <node id='-48847' lat='10.45214' lon='23.3128' />
+ <node id='-48849' lat='10.69235' lon='23.02221' />
+ <node id='-48851' lat='9.81455' lon='24.8225' />
+ <node id='-48853' lat='10.33718' lon='25.0918' />
+ <node id='-48855' lat='10.42599' lon='25.78141' />
+ <node id='-48857' lat='10.17941' lon='25.93241' />
+ <node id='-48859' lat='9.66572' lon='24.09319' />
+ <node id='-48861' lat='9.73784' lon='24.12744' />
+ <node id='-48863' lat='9.83142' lon='24.48703' />
+ <node id='-48865' lat='9.9081' lon='24.97739' />
+ <node id='-48867' lat='10.38159' lon='25.93163' />
+ <node id='-48869' lat='10.07949' lon='29.54' />
+ <node id='-48871' lat='9.61323' lon='27.90704' />
+ <node id='-48873' lat='9.48735' lon='26.70685' />
+ <node id='-48875' lat='9.62858' lon='27.14427' />
+ <node id='-48877' lat='9.57946' lon='26.35815' />
+ <node id='-48879' lat='9.91545' lon='26.21338' />
+ <node id='-48881' lat='9.75133' lon='29.53844' />
+ <node id='-48883' lat='9.67155' lon='28.99983' />
+ <node id='-48885' lat='9.74826' lon='29.06988' />
+ <node id='-48887' lat='9.75287' lon='31.28504' />
+ <node id='-48889' lat='10.29245' lon='29.94629' />
+ <node id='-48891' lat='9.71451' lon='30.82893' />
+ <node id='-48893' lat='10.28633' lon='30.00389' />
+ <node id='-48895' lat='9.95992' lon='30.53005' />
+ <node id='-48897' lat='9.7498' lon='30.84605' />
+ <node id='-48899' lat='10.65065' lon='31.99177' />
+ <node id='-48901' lat='10.28939' lon='31.77539' />
+ <node id='-48903' lat='10.77913' lon='33.24645' />
+ <node id='-48905' lat='11.04662' lon='32.46967' />
+ <node id='-48907' lat='11.70208' lon='32.39578' />
+ <node id='-48909' lat='11.18207' lon='32.39358' />
+ <node id='-48911' lat='11.43248' lon='33.13988' />
+ <node id='-48913' lat='11.95203' lon='32.10079' />
+ <node id='-48915' lat='11.95203' lon='32.73921' />
+ <node id='-48917' lat='12.22757' lon='32.73921' />
+ <node id='-48919' lat='12.22111' lon='33.25876' />
+ <node id='-48921' lat='10.83632' lon='33.26977' />
+ <node id='-48923' lat='10.64382' lon='33.52294' />
+ <node id='-48925' lat='9.49937' lon='33.87958' />
+ <node id='-48927' lat='9.762' lon='33.9082' />
+ <node id='-48929' lat='10.44254' lon='33.66604' />
+ <node id='-48931' lat='10.32994' lon='33.80913' />
+ <node id='-48933' lat='10.17179' lon='33.90159' />
+ <node id='-48935' lat='10.15446' lon='33.96984' />
+ <node id='-48937' lat='9.80972' lon='33.96323' />
+ <node id='-48939' lat='9.99623' lon='33.99185' />
+ <node id='-48941' lat='7.66675' lon='25.29214' />
+ <node id='-48943' lat='8.69288' lon='24.25691' />
+ <node id='-48945' lat='8.71749' lon='23.51905' />
+ <node id='-48947' lat='8.99743' lon='23.59065' />
+ <node id='-48949' lat='8.99128' lon='23.44744' />
+ <node id='-48951' lat='9.16959' lon='23.4848' />
+ <node id='-48953' lat='9.28637' lon='23.64358' />
+ <node id='-48955' lat='9.19418' lon='23.56263' />
+ <node id='-48957' lat='9.53823' lon='23.62179' />
+ <node id='-48959' lat='9.44303' lon='23.64981' />
+ <node id='-48961' lat='8.36959' lon='24.13238' />
+ <node id='-48963' lat='8.16933' lon='24.85156' />
+ <node id='-48965' lat='8.26177' lon='24.35965' />
+ <node id='-48967' lat='7.96588' lon='24.98855' />
+ <node id='-48969' lat='7.8487' lon='25.25319' />
+ <node id='-48971' lat='6.63493' lon='26.38022' />
+ <node id='-48973' lat='7.09549' lon='25.90076' />
+ <node id='-48975' lat='7.33024' lon='25.37461' />
+ <node id='-48977' lat='7.61115' lon='25.20649' />
+ <node id='-48979' lat='7.50312' lon='25.20337' />
+ <node id='-48981' lat='7.42595' lon='25.35281' />
+ <node id='-48983' lat='6.36272' lon='26.32729' />
+ <node id='-48985' lat='6.1987' lon='26.58259' />
+ <node id='-48987' lat='6.09655' lon='26.51721' />
+ <node id='-48989' lat='5.71254' lon='27.22705' />
+ <node id='-48991' lat='5.37167' lon='27.23017' />
+ <node id='-48993' lat='5.62889' lon='27.22705' />
+ <node id='-48995' lat='5.56382' lon='27.28621' />
+ <node id='-48997' lat='5.32828' lon='27.27064' />
+ <node id='-48999' lat='5.27557' lon='27.27375' />
+ <node id='-49001' lat='4.34297' lon='29.22207' />
+ <node id='-49003' lat='4.96613' lon='27.50932' />
+ <node id='-49005' lat='4.92665' lon='27.50932' />
+ <node id='-49007' lat='4.89375' lon='27.65462' />
+ <node id='-49009' lat='4.89375' lon='27.56656' />
+ <node id='-49011' lat='4.80162' lon='27.71406' />
+ <node id='-49013' lat='4.79284' lon='27.76469' />
+ <node id='-49015' lat='4.59976' lon='27.79551' />
+ <node id='-49017' lat='4.54271' lon='27.89238' />
+ <node id='-49019' lat='4.56904' lon='27.95182' />
+ <node id='-49021' lat='4.55148' lon='28.03988' />
+ <node id='-49023' lat='4.47687' lon='28.03768' />
+ <node id='-49025' lat='4.42419' lon='28.08171' />
+ <node id='-49027' lat='4.44394' lon='28.10152' />
+ <node id='-49029' lat='4.43297' lon='28.14995' />
+ <node id='-49031' lat='4.40224' lon='28.13674' />
+ <node id='-49033' lat='4.35614' lon='28.20719' />
+ <node id='-49035' lat='4.36053' lon='28.35909' />
+ <node id='-49037' lat='4.2859' lon='28.37891' />
+ <node id='-49039' lat='4.28809' lon='28.45816' />
+ <node id='-49041' lat='4.38688' lon='28.522' />
+ <node id='-49043' lat='4.38688' lon='28.58805' />
+ <node id='-49045' lat='4.42199' lon='28.60786' />
+ <node id='-49047' lat='4.42638' lon='28.6651' />
+ <node id='-49049' lat='4.54709' lon='28.72234' />
+ <node id='-49051' lat='4.56026' lon='28.80599' />
+ <node id='-49053' lat='4.48784' lon='28.8126' />
+ <node id='-49055' lat='4.48784' lon='29.03054' />
+ <node id='-49057' lat='4.7007' lon='29.49726' />
+ <node id='-49059' lat='4.50101' lon='29.43341' />
+ <node id='-49061' lat='4.56246' lon='29.82087' />
+ <node id='-49063' lat='4.37809' lon='29.79666' />
+ <node id='-49065' lat='4.34297' lon='29.83848' />
+ <node id='-49067' lat='4.34736' lon='29.90453' />
+ <node id='-49069' lat='4.29468' lon='29.96837' />
+ <node id='-49071' lat='4.24418' lon='29.94195' />
+ <node id='-49073' lat='3.84451' lon='30.55396' />
+ <node id='-49075' lat='3.62703' lon='30.56277' />
+ <node id='-49077' lat='3.74567' lon='30.57378' />
+ <node id='-49079' lat='3.83353' lon='30.47691' />
+ <node id='-49081' lat='3.93896' lon='30.22374' />
+ <node id='-49083' lat='4.10586' lon='30.1621' />
+ <node id='-49085' lat='4.13221' lon='30.06964' />
+ <node id='-49087' lat='3.95653' lon='30.27658' />
+ <node id='-49089' lat='3.60286' lon='30.62001' />
+ <node id='-49091' lat='3.649' lon='30.68605' />
+ <node id='-49093' lat='3.5743' lon='30.85997' />
+ <node id='-49095' lat='3.63143' lon='30.72788' />
+ <node id='-49097' lat='3.60506' lon='30.80713' />
+ <node id='-49099' lat='3.67097' lon='30.78512' />
+ <node id='-49101' lat='8.87971' lon='18.86388' />
+ <node id='-49103' lat='9.97642' lon='21.26348' />
+ <node id='-49105' lat='11.00246' lon='22.45889' />
+ <node id='-49107' lat='10.64136' lon='21.72139' />
+ <node id='-49109' lat='10.29932' lon='21.71479' />
+ <node id='-49111' lat='9.95907' lon='21.34934' />
+ <node id='-49113' lat='10.2105' lon='21.52766' />
+ <node id='-49115' lat='10.217' lon='21.63553' />
+ <node id='-49117' lat='9.11019' lon='20.36748' />
+ <node id='-49119' lat='9.44696' lon='20.82979' />
+ <node id='-49121' lat='9.00367' lon='19.06421' />
+ <node id='-49123' lat='7.98905' lon='17.67288' />
+ <node id='-49125' lat='7.95853' lon='17.93926' />
+ <node id='-49127' lat='8.01085' lon='18.02731' />
+ <node id='-49129' lat='8.05009' lon='18.6085' />
+ <node id='-49131' lat='8.68172' lon='19.11044' />
+ <node id='-49133' lat='8.25929' lon='18.79783' />
+ <node id='-49135' lat='8.08714' lon='18.64153' />
+ <node id='-49137' lat='8.14163' lon='18.62612' />
+ <node id='-49139' lat='8.22226' lon='18.67455' />
+ <node id='-49141' lat='7.53971' lon='16.8143' />
+ <node id='-49143' lat='7.88657' lon='16.58315' />
+ <node id='-49145' lat='7.67281' lon='16.6668' />
+ <node id='-49147' lat='7.76444' lon='16.59415' />
+ <node id='-49149' lat='7.75353' lon='16.658' />
+ <node id='-49151' lat='7.77971' lon='16.41583' />
+ <node id='-49153' lat='7.68809' lon='16.40703' />
+ <node id='-49155' lat='7.52006' lon='15.73118' />
+ <node id='-49157' lat='7.44149' lon='15.79942' />
+ <node id='-49159' lat='2.17866' lon='14.61145' />
+ <node id='-49161' lat='1.91264' lon='15.34776' />
+ <node id='-49163' lat='2.03243' lon='15.22634' />
+ <node id='-49165' lat='1.98887' lon='15.00996' />
+ <node id='-49167' lat='1.98265' lon='15.48942' />
+ <node id='-49169' lat='1.76483' lon='16.02959' />
+ <node id='-49171' lat='1.65591' lon='16.02647' />
+ <node id='-49173' lat='1.70259' lon='16.14634' />
+ <node id='-49175' lat='1.9811' lon='16.05294' />
+ <node id='-49177' lat='2.19733' lon='16.08563' />
+ <node id='-49179' lat='2.18955' lon='16.15568' />
+ <node id='-49181' lat='3.02306' lon='16.05449' />
+ <node id='-49183' lat='2.45708' lon='16.08252' />
+ <node id='-49185' lat='2.84739' lon='16.50126' />
+ <node id='-49187' lat='3.47999' lon='16.57598' />
+ <node id='-49189' lat='2.92512' lon='16.46701' />
+ <node id='-49191' lat='3.70515' lon='17.46876' />
+ <node id='-49193' lat='3.63045' lon='17.35649' />
+ <node id='-49195' lat='3.54257' lon='16.68283' />
+ <node id='-49197' lat='3.55136' lon='17.01746' />
+ <node id='-49199' lat='3.54476' lon='18.14902' />
+ <node id='-49201' lat='3.63924' lon='18.49245' />
+ <node id='-49203' lat='3.49423' lon='18.58711' />
+ <node id='-49205' lat='3.47665' lon='18.17323' />
+ <node id='-49207' lat='3.50302' lon='18.24148' />
+ <node id='-49209' lat='3.57992' lon='18.2723' />
+ <node id='-49211' lat='3.58212' lon='18.39558' />
+ <node id='-49213' lat='3.61068' lon='17.83421' />
+ <node id='-49215' lat='3.53378' lon='17.85842' />
+ <node id='-49217' lat='3.56893' lon='18.05656' />
+ <node id='-49219' lat='3.63705' lon='17.60966' />
+ <node id='-49221' lat='3.26835' lon='15.77725' />
+ <node id='-49223' lat='3.24348' lon='15.73522' />
+ <node id='-49225' lat='4.05131' lon='15.17482' />
+ <node id='-49227' lat='4.30282' lon='15.08609' />
+ <node id='-49229' lat='4.41458' lon='15.00825' />
+ <node id='-49231' lat='6.39043' lon='14.79966' />
+ <node id='-49233' lat='6.75693' lon='14.96311' />
+ <node id='-49235' lat='6.77085' lon='15.04717' />
+ <node id='-49237' lat='7.25135' lon='15.23397' />
+ <node id='-49239' lat='6.34866' lon='14.80122' />
+ <node id='-49241' lat='6.26356' lon='14.74206' />
+ <node id='-49243' lat='6.08867' lon='14.43073' />
+ <node id='-49245' lat='6.18928' lon='14.56149' />
+ <node id='-49247' lat='6.00508' lon='14.42917' />
+ <node id='-49249' lat='5.91683' lon='14.49455' />
+ <node id='-49251' lat='5.28319' lon='14.52724' />
+ <node id='-49253' lat='5.51411' lon='14.62531' />
+ <node id='-49255' lat='5.59777' lon='14.58951' />
+ <node id='-49257' lat='5.70466' lon='14.62375' />
+ <node id='-49259' lat='5.91838' lon='14.60974' />
+ <node id='-49261' lat='5.23979' lon='14.57083' />
+ <node id='-49263' lat='5.21343' lon='14.65489' />
+ <node id='-49265' lat='4.11347' lon='22.27682' />
+ <node id='-49267' lat='4.42394' lon='20.60184' />
+ <node id='-49269' lat='4.44877' lon='20.90383' />
+ <node id='-49271' lat='4.29285' lon='21.21341' />
+ <node id='-49273' lat='4.33895' lon='21.11214' />
+ <node id='-49275' lat='4.39603' lon='21.08793' />
+ <node id='-49277' lat='4.25553' lon='21.55904' />
+ <node id='-49279' lat='4.317' lon='21.6405' />
+ <node id='-49281' lat='4.20723' lon='22.10721' />
+ <node id='-49283' lat='4.33676' lon='21.25744' />
+ <node id='-49285' lat='5.0915' lon='24.46719' />
+ <node id='-49287' lat='4.60013' lon='23.38847' />
+ <node id='-49289' lat='4.82392' lon='22.94817' />
+ <node id='-49291' lat='4.13039' lon='22.45504' />
+ <node id='-49293' lat='4.48821' lon='22.60915' />
+ <node id='-49295' lat='4.22041' lon='22.5431' />
+ <node id='-49297' lat='4.47285' lon='22.6928' />
+ <node id='-49299' lat='4.71423' lon='22.78526' />
+ <node id='-49301' lat='4.69887' lon='22.84691' />
+ <node id='-49303' lat='4.79321' lon='22.89094' />
+ <node id='-49305' lat='4.90509' lon='24.71816' />
+ <node id='-49307' lat='5.03668' lon='25.31256' />
+ <node id='-49309' lat='5.29101' lon='25.34558' />
+ <node id='-49311' lat='5.37431' lon='25.53271' />
+ <node id='-49313' lat='5.19455' lon='25.86073' />
+ <node id='-49315' lat='5.25594' lon='26.13371' />
+ <node id='-49317' lat='5.04984' lon='26.48595' />
+ <node id='-49319' lat='5.10685' lon='26.74572' />
+ <node id='-49321' lat='5.03887' lon='26.85579' />
+ <node id='-49323' lat='5.13535' lon='26.93064' />
+ <node id='-49325' lat='5.22305' lon='27.09575' />
+ <node id='-49327' lat='5.07349' lon='27.44012' />
+ <node id='-49329' lat='14.55731' lon='105.53864' />
+ <node id='-49331' lat='17.81982' lon='102.66169' />
+ <node id='-49333' lat='16.53983' lon='104.74268' />
+ <node id='-49335' lat='17.39367' lon='104.80061' />
+ <node id='-49337' lat='18.32393' lon='103.98515' />
+ <node id='-49339' lat='17.97389' lon='103.03303' />
+ <node id='-49341' lat='18.42824' lon='103.30188' />
+ <node id='-49343' lat='18.00214' lon='102.93203' />
+ <node id='-49345' lat='17.74769' lon='104.39362' />
+ <node id='-49347' lat='16.00657' lon='105.42001' />
+ <node id='-49349' lat='16.09792' lon='105.06204' />
+ <node id='-49351' lat='16.25627' lon='105.00262' />
+ <node id='-49353' lat='15.35445' lon='105.46606' />
+ <node id='-49355' lat='15.92374' lon='105.34871' />
+ <node id='-49357' lat='15.74082' lon='105.45269' />
+ <node id='-49359' lat='15.68792' lon='105.61756' />
+ <node id='-49361' lat='15.41031' lon='105.58191' />
+ <node id='-49363' lat='15.13232' lon='105.47348' />
+ <node id='-49365' lat='15.32724' lon='105.58043' />
+ <node id='-49367' lat='15.00037' lon='105.61162' />
+ <node id='-49369' lat='14.80802' lon='105.5121' />
+ <node id='-49371' lat='14.43865' lon='105.43783' />
+ <node id='-49373' lat='19.04716' lon='101.35606' />
+ <node id='-49375' lat='18.21532' lon='102.11359' />
+ <node id='-49377' lat='17.97106' lon='102.45523' />
+ <node id='-49379' lat='17.95411' lon='102.60971' />
+ <node id='-49381' lat='17.83537' lon='102.59485' />
+ <node id='-49383' lat='18.02474' lon='101.88485' />
+ <node id='-49385' lat='18.43247' lon='101.06047' />
+ <node id='-49387' lat='18.68875' lon='101.27585' />
+ <node id='-49389' lat='18.73377' lon='101.22832' />
+ <node id='-49391' lat='18.89545' lon='101.25803' />
+ <node id='-49393' lat='18.34367' lon='101.18227' />
+ <node id='-49395' lat='18.25624' lon='101.15108' />
+ <node id='-49397' lat='18.2125' lon='101.19118' />
+ <node id='-49399' lat='18.07559' lon='101.78087' />
+ <node id='-49401' lat='17.47586' lon='101.15108' />
+ <node id='-49403' lat='17.57926' lon='100.96541' />
+ <node id='-49405' lat='18.0544' lon='101.1793' />
+ <node id='-49407' lat='17.87637' lon='101.02185' />
+ <node id='-49409' lat='17.7392' lon='101.44667' />
+ <node id='-49411' lat='17.92867' lon='101.72294' />
+ <node id='-49413' lat='19.48324' lon='100.77231' />
+ <node id='-49415' lat='19.61901' lon='100.90302' />
+ <node id='-49417' lat='19.59242' lon='101.26545' />
+ <node id='-49419' lat='19.12717' lon='101.261' />
+ <node id='-49421' lat='19.33334' lon='101.24911' />
+ <node id='-49423' lat='19.48324' lon='101.26991' />
+ <node id='-49425' lat='19.35296' lon='101.20604' />
+ <node id='-49427' lat='19.46223' lon='101.21347' />
+ <node id='-49429' lat='20.18047' lon='100.5807' />
+ <node id='-49431' lat='19.87904' lon='100.5094' />
+ <node id='-49433' lat='19.75047' lon='100.398' />
+ <node id='-49435' lat='19.53504' lon='100.49604' />
+ <node id='-49437' lat='19.55884' lon='100.64606' />
+ <node id='-49439' lat='19.49164' lon='100.58219' />
+ <node id='-49441' lat='20.25295' lon='100.10093' />
+ <node id='-49443' lat='20.24598' lon='100.16777' />
+ <node id='-49445' lat='20.39502' lon='100.25838' />
+ <node id='-49447' lat='20.39363' lon='100.3371' />
+ <node id='-49449' lat='20.14422' lon='100.52129' />
+ <node id='-49451' lat='20.82783' lon='100.36375' />
+ <node id='-49453' lat='20.68247' lon='100.1957' />
+ <node id='-49455' lat='21.31786' lon='100.72716' />
+ <node id='-49457' lat='20.82194' lon='100.51079' />
+ <node id='-49459' lat='20.8347' lon='100.60112' />
+ <node id='-49461' lat='20.88279' lon='100.64628' />
+ <node id='-49463' lat='20.88574' lon='100.50974' />
+ <node id='-49465' lat='21.02796' lon='100.55281' />
+ <node id='-49467' lat='21.05639' lon='100.63578' />
+ <node id='-49469' lat='21.2934' lon='100.80173' />
+ <node id='-49471' lat='21.39612' lon='101.00234' />
+ <node id='-49473' lat='21.56422' lon='101.2124' />
+ <node id='-49475' lat='21.41959' lon='101.19349' />
+ <node id='-49477' lat='21.52808' lon='101.16198' />
+ <node id='-49479' lat='21.36482' lon='101.26912' />
+ <node id='-49481' lat='21.23271' lon='101.2229' />
+ <node id='-49483' lat='21.83019' lon='101.7791' />
+ <node id='-49485' lat='21.72852' lon='101.74555' />
+ <node id='-49487' lat='21.23329' lon='101.6068' />
+ <node id='-49489' lat='21.18621' lon='101.59491' />
+ <node id='-49491' lat='21.17947' lon='101.60886' />
+ <node id='-49493' lat='21.20004' lon='101.66977' />
+ <node id='-49495' lat='21.14911' lon='101.70548' />
+ <node id='-49497' lat='21.14813' lon='101.7622' />
+ <node id='-49499' lat='21.25291' lon='101.84412' />
+ <node id='-49501' lat='21.19025' lon='101.79266' />
+ <node id='-49503' lat='21.21571' lon='101.76745' />
+ <node id='-49505' lat='21.20983' lon='101.83887' />
+ <node id='-49507' lat='21.30967' lon='101.74014' />
+ <node id='-49509' lat='21.48276' lon='101.74224' />
+ <node id='-49511' lat='21.61562' lon='101.83257' />
+ <node id='-49513' lat='21.51794' lon='101.7727' />
+ <node id='-49515' lat='21.5873' lon='101.7475' />
+ <node id='-49517' lat='21.57461' lon='101.80001' />
+ <node id='-49519' lat='22.24794' lon='101.53638' />
+ <node id='-49521' lat='21.96574' lon='101.62566' />
+ <node id='-49523' lat='22.50337' lon='101.7685' />
+ <node id='-49525' lat='22.27515' lon='101.61306' />
+ <node id='-49527' lat='22.46843' lon='101.68973' />
+ <node id='-49529' lat='22.13026' lon='101.57525' />
+ <node id='-49531' lat='22.13513' lon='101.60675' />
+ <node id='-49533' lat='22.38397' lon='101.86828' />
+ <node id='-49535' lat='22.46164' lon='102.03633' />
+ <node id='-49537' lat='22.42766' lon='101.98487' />
+ <node id='-49539' lat='22.44417' lon='101.91344' />
+ <node id='-49541' lat='22.38688' lon='101.90714' />
+ <node id='-49543' lat='22.28876' lon='101.56789' />
+ <node id='-49545' lat='48.66873' lon='14.06151' />
+ <node id='-49547' lat='48.63788' lon='14.01482' />
+ <node id='-49549' lat='48.5943' lon='14.09104' />
+ <node id='-49551' lat='48.60429' lon='14.56139' />
+ <node id='-49553' lat='48.62881' lon='14.60808' />
+ <node id='-49555' lat='48.59794' lon='14.71794' />
+ <node id='-49557' lat='48.69502' lon='14.72756' />
+ <node id='-49559' lat='48.73489' lon='14.80584' />
+ <node id='-49561' lat='48.7874' lon='14.81545' />
+ <node id='-49563' lat='48.7788' lon='14.9823' />
+ <node id='-49565' lat='48.79101' lon='14.95072' />
+ <node id='-49567' lat='49.01444' lon='14.99878' />
+ <node id='-49569' lat='48.99056' lon='15.15534' />
+ <node id='-49571' lat='48.94278' lon='15.16358' />
+ <node id='-49573' lat='48.95766' lon='15.26177' />
+ <node id='-49575' lat='48.98831' lon='15.28305' />
+ <node id='-49577' lat='48.96983' lon='14.97612' />
+ <node id='-49579' lat='48.90082' lon='14.98917' />
+ <node id='-49581' lat='48.8516' lon='15.75341' />
+ <node id='-49583' lat='48.87644' lon='15.78087' />
+ <node id='-49585' lat='48.86921' lon='15.84404' />
+ <node id='-49587' lat='48.75436' lon='16.06034' />
+ <node id='-49589' lat='48.729' lon='16.37345' />
+ <node id='-49591' lat='48.80865' lon='16.46134' />
+ <node id='-49593' lat='48.74576' lon='16.40915' />
+ <node id='-49595' lat='48.7281' lon='16.68518' />
+ <node id='-49597' lat='48.77699' lon='16.67008' />
+ <node id='-49599' lat='48.71541' lon='16.90354' />
+ <node id='-49601' lat='48.70998' lon='16.79779' />
+ <node id='-49603' lat='48.73806' lon='16.71883' />
+ <node id='-49605' lat='48.35258' lon='16.84243' />
+ <node id='-49607' lat='48.44968' lon='16.85204' />
+ <node id='-49609' lat='48.53614' lon='16.94611' />
+ <node id='-49611' lat='48.14179' lon='17.05735' />
+ <node id='-49613' lat='48.09366' lon='17.09168' />
+ <node id='-49615' lat='48.13996' lon='17.02919' />
+ <node id='-49617' lat='48.17385' lon='16.97701' />
+ <node id='-49619' lat='48.32519' lon='16.90903' />
+ <node id='-49621' lat='48.31332' lon='16.89461' />
+ <node id='-49623' lat='48.0317' lon='17.07039' />
+ <node id='-49625' lat='47.97336' lon='17.09786' />
+ <node id='-49627' lat='47.86245' lon='17.00997' />
+ <node id='-49629' lat='47.87719' lon='17.08275' />
+ <node id='-49631' lat='47.92461' lon='17.11022' />
+ <node id='-49633' lat='47.73469' lon='16.72089' />
+ <node id='-49635' lat='47.67878' lon='16.7511' />
+ <node id='-49637' lat='47.70928' lon='17.08893' />
+ <node id='-49639' lat='47.68432' lon='16.82938' />
+ <node id='-49641' lat='47.68895' lon='16.87538' />
+ <node id='-49643' lat='47.72268' lon='16.86509' />
+ <node id='-49645' lat='47.79377' lon='17.05048' />
+ <node id='-49647' lat='47.81129' lon='17.07039' />
+ <node id='-49649' lat='47.66537' lon='16.4222' />
+ <node id='-49651' lat='47.72268' lon='16.55129' />
+ <node id='-49653' lat='47.74669' lon='16.53206' />
+ <node id='-49655' lat='47.61772' lon='16.58699' />
+ <node id='-49657' lat='47.63114' lon='16.64193' />
+ <node id='-49659' lat='47.52692' lon='16.71059' />
+ <node id='-49661' lat='47.41181' lon='16.45104' />
+ <node id='-49663' lat='47.25079' lon='16.44142' />
+ <node id='-49665' lat='47.25918' lon='16.47782' />
+ <node id='-49667' lat='46.99991' lon='16.51078' />
+ <node id='-49669' lat='47.03548' lon='16.43936' />
+ <node id='-49671' lat='47.05747' lon='16.52176' />
+ <node id='-49673' lat='47.09395' lon='16.46134' />
+ <node id='-49675' lat='47.13974' lon='16.52863' />
+ <node id='-49677' lat='47.14535' lon='16.4531' />
+ <node id='-49679' lat='47.20649' lon='16.41739' />
+ <node id='-49681' lat='47.16309' lon='16.46614' />
+ <node id='-49683' lat='46.94134' lon='16.19904' />
+ <node id='-49685' lat='46.96571' lon='16.27251' />
+ <node id='-49687' lat='42.61423' lon='18.36197' />
+ <node id='-49689' lat='42.6112' lon='18.24318' />
+ <node id='-49691' lat='42.92725' lon='17.68151' />
+ <node id='-49693' lat='42.9182' lon='17.80854' />
+ <node id='-49695' lat='42.89556' lon='17.7948' />
+ <node id='-49697' lat='42.83668' lon='17.88201' />
+ <node id='-49699' lat='43.33065' lon='17.286' />
+ <node id='-49701' lat='43.49376' lon='17.15828' />
+ <node id='-49703' lat='43.40353' lon='17.25579' />
+ <node id='-49705' lat='43.49376' lon='17.24411' />
+ <node id='-49707' lat='43.44542' lon='17.29699' />
+ <node id='-49709' lat='43.58037' lon='17.00585' />
+ <node id='-49711' lat='44.0244' lon='16.50528' />
+ <node id='-49713' lat='43.77157' lon='16.75316' />
+ <node id='-49715' lat='43.95326' lon='16.55472' />
+ <node id='-49717' lat='43.84887' lon='16.70922' />
+ <node id='-49719' lat='44.07523' lon='16.43662' />
+ <node id='-49721' lat='44.08263' lon='16.36864' />
+ <node id='-49723' lat='44.55572' lon='16.03012' />
+ <node id='-49725' lat='44.52586' lon='16.10566' />
+ <node id='-49727' lat='44.35231' lon='16.21346' />
+ <node id='-49729' lat='44.38275' lon='16.12969' />
+ <node id='-49731' lat='44.40679' lon='16.16814' />
+ <node id='-49733' lat='44.71501' lon='15.8255' />
+ <node id='-49735' lat='44.74964' lon='15.89348' />
+ <node id='-49737' lat='44.58605' lon='16.00884' />
+ <node id='-49739' lat='44.61538' lon='16.05828' />
+ <node id='-49741' lat='44.87045' lon='15.76096' />
+ <node id='-49743' lat='45.0638' lon='15.74585' />
+ <node id='-49745' lat='44.96818' lon='15.74723' />
+ <node id='-49747' lat='44.97401' lon='15.78568' />
+ <node id='-49749' lat='45.11519' lon='15.78842' />
+ <node id='-49751' lat='45.16508' lon='15.76371' />
+ <node id='-49753' lat='45.22459' lon='15.83512' />
+ <node id='-49755' lat='45.23088' lon='15.98412' />
+ <node id='-49757' lat='44.99732' lon='16.29036' />
+ <node id='-49759' lat='45.0012' lon='16.3501' />
+ <node id='-49761' lat='45.1147' lon='16.40023' />
+ <node id='-49763' lat='45.18831' lon='16.83899' />
+ <node id='-49765' lat='45.22943' lon='16.52794' />
+ <node id='-49767' lat='45.14522' lon='16.4634' />
+ <node id='-49769' lat='45.21153' lon='16.49155' />
+ <node id='-49771' lat='45.26617' lon='16.90354' />
+ <node id='-49773' lat='45.14764' lon='17.18438' />
+ <node id='-49775' lat='45.13408' lon='17.66571' />
+ <node id='-49777' lat='45.14619' lon='17.24961' />
+ <node id='-49779' lat='45.18444' lon='17.26815' />
+ <node id='-49781' lat='45.10501' lon='17.60117' />
+ <node id='-49783' lat='45.15055' lon='18.0008' />
+ <node id='-49785' lat='45.06429' lon='18.4842' />
+ <node id='-49787' lat='45.11083' lon='18.41896' />
+ <node id='-49789' lat='45.1021' lon='18.32077' />
+ <node id='-49791' lat='45.13699' lon='18.24387' />
+ <node id='-49793' lat='45.07835' lon='18.6641' />
+ <node id='-49795' lat='44.97741' lon='18.78357' />
+ <node id='-49797' lat='44.92055' lon='19.18183' />
+ <node id='-49799' lat='44.90645' lon='18.98957' />
+ <node id='-49801' lat='44.92541' lon='19.02871' />
+ <node id='-49803' lat='44.89915' lon='19.06853' />
+ <node id='-49805' lat='44.95409' lon='19.15573' />
+ <node id='-49807' lat='44.97692' lon='19.05205' />
+ <node id='-49809' lat='45.14668' lon='19.07952' />
+ <node id='-49811' lat='45.12972' lon='19.14063' />
+ <node id='-49813' lat='45.17863' lon='19.19144' />
+ <node id='-49815' lat='45.23475' lon='19.41941' />
+ <node id='-49817' lat='45.23813' lon='19.28208' />
+ <node id='-49819' lat='45.17137' lon='19.43589' />
+ <node id='-49821' lat='45.37528' lon='18.97446' />
+ <node id='-49823' lat='45.49333' lon='18.99918' />
+ <node id='-49825' lat='45.53712' lon='18.94562' />
+ <node id='-49827' lat='45.53086' lon='19.07471' />
+ <node id='-49829' lat='45.48804' lon='19.08364' />
+ <node id='-49831' lat='45.66731' lon='18.96691' />
+ <node id='-49833' lat='45.71863' lon='18.90305' />
+ <node id='-49835' lat='45.87995' lon='18.80211' />
+ <node id='-49837' lat='45.92057' lon='18.6792' />
+ <node id='-49839' lat='45.80772' lon='18.57483' />
+ <node id='-49841' lat='45.73972' lon='18.44368' />
+ <node id='-49843' lat='45.79671' lon='17.99805' />
+ <node id='-49845' lat='45.78522' lon='17.87377' />
+ <node id='-49847' lat='45.78905' lon='18.12439' />
+ <node id='-49849' lat='45.76511' lon='18.08869' />
+ <node id='-49851' lat='45.95209' lon='17.35672' />
+ <node id='-49853' lat='45.93728' lon='17.56821' />
+ <node id='-49855' lat='46.16697' lon='17.14592' />
+ <node id='-49857' lat='46.45203' lon='16.6639' />
+ <node id='-49859' lat='46.39523' lon='16.7154' />
+ <node id='-49861' lat='46.36255' lon='16.8541' />
+ <node id='-49863' lat='44.88164' lon='19.36722' />
+ <node id='-49865' lat='44.50383' lon='19.12484' />
+ <node id='-49867' lat='44.28648' lon='19.16741' />
+ <node id='-49869' lat='44.41463' lon='19.14681' />
+ <node id='-49871' lat='44.39109' lon='19.10286' />
+ <node id='-49873' lat='44.27124' lon='19.31984' />
+ <node id='-49875' lat='44.18563' lon='19.35898' />
+ <node id='-49877' lat='43.95573' lon='19.52515' />
+ <node id='-49879' lat='44.05895' lon='19.56566' />
+ <node id='-49881' lat='44.05254' lon='19.61991' />
+ <node id='-49883' lat='43.99922' lon='19.56498' />
+ <node id='-49885' lat='44.01551' lon='19.62403' />
+ <node id='-49887' lat='43.96611' lon='19.38439' />
+ <node id='-49889' lat='44.01502' lon='19.24363' />
+ <node id='-49891' lat='43.5938' lon='19.2553' />
+ <node id='-49893' lat='43.71403' lon='19.5176' />
+ <node id='-49895' lat='43.58385' lon='19.50455' />
+ <node id='-49897' lat='43.57987' lon='19.42696' />
+ <node id='-49899' lat='43.58833' lon='19.33426' />
+ <node id='-49901' lat='43.60921' lon='19.36653' />
+ <node id='-49903' lat='43.54056' lon='19.41941' />
+ <node id='-49905' lat='43.53061' lon='19.24774' />
+ <node id='-49907' lat='42.33822' lon='22.45919' />
+ <node id='-49909' lat='42.50144' lon='22.55669' />
+ <node id='-49911' lat='42.3991' lon='22.51961' />
+ <node id='-49913' lat='42.3915' lon='22.47498' />
+ <node id='-49915' lat='42.74144' lon='22.4997' />
+ <node id='-49917' lat='42.82057' lon='22.43309' />
+ <node id='-49919' lat='42.98253' lon='22.78397' />
+ <node id='-49921' lat='42.88701' lon='22.74826' />
+ <node id='-49923' lat='43.03625' lon='22.89521' />
+ <node id='-49925' lat='43.11199' lon='22.98104' />
+ <node id='-49927' lat='43.33665' lon='22.82036' />
+ <node id='-49929' lat='43.22417' lon='22.89727' />
+ <node id='-49931' lat='43.69566' lon='22.41043' />
+ <node id='-49933' lat='44.16938' lon='22.61711' />
+ <node id='-49935' lat='43.9844' lon='22.87873' />
+ <node id='-49937' lat='43.88055' lon='22.83753' />
+ <node id='-49939' lat='44.01946' lon='23.01674' />
+ <node id='-49941' lat='43.84936' lon='23.4507' />
+ <node id='-49943' lat='43.79289' lon='23.61687' />
+ <node id='-49945' lat='43.80627' lon='23.73978' />
+ <node id='-49947' lat='43.76314' lon='24.50264' />
+ <node id='-49949' lat='43.70211' lon='24.35364' />
+ <node id='-49951' lat='43.68523' lon='24.73542' />
+ <node id='-49953' lat='43.72693' lon='24.96682' />
+ <node id='-49955' lat='43.74082' lon='24.62281' />
+ <node id='-49957' lat='43.61866' lon='25.39528' />
+ <node id='-49959' lat='43.70261' lon='25.17144' />
+ <node id='-49961' lat='43.90925' lon='26.05584' />
+ <node id='-49963' lat='43.96908' lon='26.10115' />
+ <node id='-49965' lat='44.05698' lon='26.62712' />
+ <node id='-49967' lat='44.12602' lon='27.26845' />
+ <node id='-49969' lat='44.00761' lon='27.92008' />
+ <node id='-49971' lat='43.95326' lon='27.73468' />
+ <node id='-49973' lat='44.01206' lon='27.60834' />
+ <node id='-49975' lat='44.04958' lon='27.64542' />
+ <node id='-49977' lat='44.30712' lon='22.56012' />
+ <node id='-49979' lat='44.28206' lon='22.68166' />
+ <node id='-49981' lat='44.7194' lon='22.45301' />
+ <node id='-49983' lat='44.61489' lon='22.61917' />
+ <node id='-49985' lat='44.54446' lon='22.76749' />
+ <node id='-49987' lat='44.51852' lon='22.70981' />
+ <node id='-49989' lat='44.55719' lon='22.61368' />
+ <node id='-49991' lat='44.47836' lon='22.54021' />
+ <node id='-49993' lat='44.53419' lon='22.56493' />
+ <node id='-49995' lat='44.61587' lon='22.69196' />
+ <node id='-49997' lat='44.63395' lon='21.99364' />
+ <node id='-49999' lat='44.49844' lon='22.08016' />
+ <node id='-50001' lat='44.48179' lon='22.18315' />
+ <node id='-50003' lat='44.47444' lon='22.13234' />
+ <node id='-50005' lat='44.86364' lon='21.35643' />
+ <node id='-50007' lat='44.78133' lon='21.38802' />
+ <node id='-50009' lat='44.77304' lon='21.55007' />
+ <node id='-50011' lat='44.65349' lon='21.71692' />
+ <node id='-50013' lat='44.75208' lon='21.60019' />
+ <node id='-50015' lat='44.67059' lon='21.61942' />
+ <node id='-50017' lat='44.67107' lon='21.67504' />
+ <node id='-50019' lat='44.9327' lon='21.54938' />
+ <node id='-50021' lat='45.19557' lon='21.48278' />
+ <node id='-50023' lat='45.04294' lon='21.4505' />
+ <node id='-50025' lat='45.15345' lon='21.51299' />
+ <node id='-50027' lat='45.30144' lon='21.09894' />
+ <node id='-50029' lat='45.60969' lon='20.76798' />
+ <node id='-50031' lat='45.53567' lon='20.83321' />
+ <node id='-50033' lat='45.78522' lon='20.78446' />
+ <node id='-50035' lat='45.7493' lon='20.70069' />
+ <node id='-50037' lat='45.75601' lon='20.77416' />
+ <node id='-50039' lat='46.1313' lon='19.81491' />
+ <node id='-50041' lat='46.17553' lon='19.93508' />
+ <node id='-50043' lat='46.17696' lon='20.01816' />
+ <node id='-50045' lat='46.14509' lon='20.03533' />
+ <node id='-50047' lat='46.17315' lon='20.09713' />
+ <node id='-50049' lat='45.99694' lon='19.28826' />
+ <node id='-50051' lat='45.9998' lon='19.14543' />
+ <node id='-50053' lat='45.93537' lon='18.99712' />
+ <node id='-50055' lat='29.38903' lon='61.31508' />
+ <node id='-50057' lat='28.77937' lon='61.65978' />
+ <node id='-50059' lat='28.55284' lon='61.93581' />
+ <node id='-50061' lat='28.24842' lon='62.59499' />
+ <node id='-50063' lat='28.28108' lon='62.79412' />
+ <node id='-50065' lat='27.47627' lon='62.84905' />
+ <node id='-50067' lat='27.25674' lon='63.19649' />
+ <node id='-50069' lat='27.08692' lon='63.25005' />
+ <node id='-50071' lat='27.14437' lon='63.32283' />
+ <node id='-50073' lat='26.83844' lon='63.18688' />
+ <node id='-50075' lat='26.84212' lon='63.25005' />
+ <node id='-50077' lat='26.528' lon='62.31484' />
+ <node id='-50079' lat='26.64099' lon='62.77352' />
+ <node id='-50081' lat='26.31647' lon='62.05117' />
+ <node id='-50083' lat='26.07249' lon='61.83831' />
+ <node id='-50085' lat='25.7538' lon='61.83968' />
+ <node id='-50087' lat='25.27541' lon='61.6433' />
+ <node id='-50089' lat='31.31813' lon='61.77101' />
+ <node id='-50091' lat='31.24536' lon='61.76689' />
+ <node id='-50093' lat='31.18194' lon='61.80947' />
+ <node id='-50095' lat='30.95021' lon='61.8026' />
+ <node id='-50097' lat='31.01731' lon='61.85067' />
+ <node id='-50099' lat='33.62346' lon='60.53231' />
+ <node id='-50101' lat='33.56054' lon='60.69573' />
+ <node id='-50103' lat='33.55596' lon='60.91133' />
+ <node id='-50105' lat='34.13992' lon='60.50209' />
+ <node id='-50107' lat='33.80851' lon='60.55291' />
+ <node id='-50109' lat='34.65663' lon='60.97725' />
+ <node id='-50111' lat='34.73228' lon='60.98' />
+ <node id='-50113' lat='34.82139' lon='61.06926' />
+ <node id='-50115' lat='35.09938' lon='61.12831' />
+ <node id='-50117' lat='35.30249' lon='61.18187' />
+ <node id='-50119' lat='35.95992' lon='61.12007' />
+ <node id='-50121' lat='36.12759' lon='61.22719' />
+ <node id='-50123' lat='35.92879' lon='61.22444' />
+ <node id='-50125' lat='35.67038' lon='61.22719' />
+ <node id='-50127' lat='35.80749' lon='61.26152' />
+ <node id='-50129' lat='36.38782' lon='61.1393' />
+ <node id='-50131' lat='36.55348' lon='61.18187' />
+ <node id='-50133' lat='37.47892' lon='59.39797' />
+ <node id='-50135' lat='37.13594' lon='59.55178' />
+ <node id='-50137' lat='37.34257' lon='59.39385' />
+ <node id='-50139' lat='37.12499' lon='59.74678' />
+ <node id='-50141' lat='37.6433' lon='58.47786' />
+ <node id='-50143' lat='37.70526' lon='58.5479' />
+ <node id='-50145' lat='37.51161' lon='59.22905' />
+ <node id='-50147' lat='37.64548' lon='58.6921' />
+ <node id='-50149' lat='37.67374' lon='58.9338' />
+ <node id='-50151' lat='37.63134' lon='58.39959' />
+ <node id='-50153' lat='37.89299' lon='57.79534' />
+ <node id='-50155' lat='38.08132' lon='56.33278' />
+ <node id='-50157' lat='38.18502' lon='56.32454' />
+ <node id='-50159' lat='38.26054' lon='56.43303' />
+ <node id='-50161' lat='38.09321' lon='57.37236' />
+ <node id='-50163' lat='38.18717' lon='57.03453' />
+ <node id='-50165' lat='38.28965' lon='57.21169' />
+ <node id='-50167' lat='38.24005' lon='56.62255' />
+ <node id='-50169' lat='38.27887' lon='56.73928' />
+ <node id='-50171' lat='38.08564' lon='55.44152' />
+ <node id='-50173' lat='38.12238' lon='55.76561' />
+ <node id='-50175' lat='38.08024' lon='55.97847' />
+ <node id='-50177' lat='37.43532' lon='54.67247' />
+ <node id='-50179' lat='37.75739' lon='54.851' />
+ <node id='-50181' lat='37.62264' lon='54.77684' />
+ <node id='-50183' lat='37.61285' lon='54.81804' />
+ <node id='-50185' lat='37.51597' lon='54.77822' />
+ <node id='-50187' lat='37.34912' lon='54.36211' />
+ <node id='-50189' lat='37.3524' lon='54.28521' />
+ <node id='-50191' lat='10.31488' lon='98.7391' />
+ <node id='-50193' lat='10.52761' lon='98.81944' />
+ <node id='-50195' lat='10.62548' lon='98.77275' />
+ <node id='-50197' lat='10.68351' lon='98.78511' />
+ <node id='-50199' lat='10.78336' lon='98.86819' />
+ <node id='-50201' lat='10.85485' lon='99.0069' />
+ <node id='-50203' lat='11.28545' lon='99.32756' />
+ <node id='-50205' lat='10.94857' lon='99.06938' />
+ <node id='-50207' lat='10.97217' lon='99.02337' />
+ <node id='-50209' lat='11.3925' lon='99.39485' />
+ <node id='-50211' lat='11.82699' lon='99.64891' />
+ <node id='-50213' lat='11.62732' lon='99.5672' />
+ <node id='-50215' lat='12.1353' lon='99.47519' />
+ <node id='-50217' lat='12.14805' lon='99.56445' />
+ <node id='-50219' lat='12.02317' lon='99.53424' />
+ <node id='-50221' lat='12.68921' lon='99.29254' />
+ <node id='-50223' lat='12.9898' lon='99.18748' />
+ <node id='-50225' lat='13.05804' lon='99.10646' />
+ <node id='-50227' lat='13.19847' lon='99.12225' />
+ <node id='-50229' lat='15.30667' lon='98.30446' />
+ <node id='-50231' lat='15.21327' lon='98.22' />
+ <node id='-50233' lat='15.25765' lon='98.4102' />
+ <node id='-50235' lat='15.46821' lon='98.58598' />
+ <node id='-50237' lat='16.04578' lon='98.57019' />
+ <node id='-50239' lat='16.27068' lon='98.68074' />
+ <node id='-50241' lat='16.42354' lon='98.84485' />
+ <node id='-50243' lat='16.36425' lon='98.92656' />
+ <node id='-50245' lat='16.13353' lon='98.69585' />
+ <node id='-50247' lat='16.47424' lon='98.63817' />
+ <node id='-50249' lat='16.64931' lon='98.51457' />
+ <node id='-50251' lat='16.55983' lon='98.57912' />
+ <node id='-50253' lat='16.62826' lon='98.5695' />
+ <node id='-50255' lat='16.73613' lon='98.46994' />
+ <node id='-50257' lat='17.04822' lon='98.34566' />
+ <node id='-50259' lat='17.06266' lon='98.39441' />
+ <node id='-50261' lat='16.89979' lon='98.52624' />
+ <node id='-50263' lat='16.8446' lon='98.49603' />
+ <node id='-50265' lat='17.37485' lon='98.11632' />
+ <node id='-50267' lat='17.71595' lon='97.76407' />
+ <node id='-50269' lat='17.88005' lon='97.66794' />
+ <node id='-50271' lat='18.26844' lon='97.50383' />
+ <node id='-50273' lat='18.33885' lon='97.56219' />
+ <node id='-50275' lat='18.29778' lon='97.64116' />
+ <node id='-50277' lat='18.4939' lon='97.5258' />
+ <node id='-50279' lat='18.57138' lon='97.36444' />
+ <node id='-50281' lat='19.04261' lon='97.73797' />
+ <node id='-50283' lat='19.09972' lon='97.83479' />
+ <node id='-50285' lat='19.5041' lon='97.88423' />
+ <node id='-50287' lat='19.55782' lon='97.84715' />
+ <node id='-50289' lat='19.67876' lon='98.24884' />
+ <node id='-50291' lat='19.78541' lon='98.13829' />
+ <node id='-50293' lat='19.71303' lon='98.51182' />
+ <node id='-50295' lat='19.80931' lon='98.83661' />
+ <node id='-50297' lat='20.10298' lon='99.0735' />
+ <node id='-50299' lat='20.12877' lon='99.20328' />
+ <node id='-50301' lat='20.14811' lon='99.52943' />
+ <node id='-50303' lat='20.20676' lon='99.5569' />
+ <node id='-50305' lat='20.36198' lon='99.46077' />
+ <node id='-50307' lat='20.39673' lon='99.46008' />
+ <node id='-50309' lat='20.32077' lon='99.68255' />
+ <node id='-50311' lat='20.33687' lon='99.81096' />
+ <node id='-50313' lat='20.44371' lon='99.86383' />
+ <node id='-50315' lat='20.46301' lon='99.95721' />
+ <node id='-50317' lat='22.15335' lon='89.07114' />
+ <node id='-50319' lat='23.21134' lon='88.99148' />
+ <node id='-50321' lat='23.2492' lon='88.71133' />
+ <node id='-50323' lat='23.08759' lon='88.86377' />
+ <node id='-50325' lat='22.95235' lon='88.87063' />
+ <node id='-50327' lat='23.47361' lon='88.74841' />
+ <node id='-50329' lat='23.87105' lon='88.58087' />
+ <node id='-50331' lat='24.1959' lon='88.74841' />
+ <node id='-50333' lat='23.91751' lon='88.73743' />
+ <node id='-50335' lat='24.14703' lon='88.6976' />
+ <node id='-50337' lat='23.87607' lon='88.66189' />
+ <node id='-50339' lat='24.86803' lon='88.33917' />
+ <node id='-50341' lat='25.07468' lon='88.46277' />
+ <node id='-50343' lat='24.66477' lon='88.00683' />
+ <node id='-50345' lat='24.63232' lon='88.08786' />
+ <node id='-50347' lat='24.85806' lon='88.15515' />
+ <node id='-50349' lat='24.93529' lon='88.14004' />
+ <node id='-50351' lat='24.96642' lon='88.21832' />
+ <node id='-50353' lat='24.88796' lon='88.27325' />
+ <node id='-50355' lat='25.20149' lon='88.44766' />
+ <node id='-50357' lat='25.18534' lon='88.94067' />
+ <node id='-50359' lat='25.29217' lon='89.00659' />
+ <node id='-50361' lat='25.34679' lon='88.85278' />
+ <node id='-50363' lat='25.51546' lon='88.81296' />
+ <node id='-50365' lat='25.46959' lon='88.677' />
+ <node id='-50367' lat='25.59227' lon='88.4559' />
+ <node id='-50369' lat='26.63791' lon='88.41196' />
+ <node id='-50371' lat='26.48929' lon='88.33093' />
+ <node id='-50373' lat='26.45241' lon='88.35153' />
+ <node id='-50375' lat='26.48683' lon='88.36938' />
+ <node id='-50377' lat='26.45855' lon='88.48749' />
+ <node id='-50379' lat='26.36385' lon='88.52319' />
+ <node id='-50381' lat='26.29123' lon='88.35153' />
+ <node id='-50383' lat='26.54827' lon='88.43667' />
+ <node id='-50385' lat='26.38353' lon='88.69485' />
+ <node id='-50387' lat='26.26291' lon='88.67837' />
+ <node id='-50389' lat='26.2469' lon='89.05328' />
+ <node id='-50391' lat='26.37984' lon='88.91321' />
+ <node id='-50393' lat='26.46347' lon='88.9599' />
+ <node id='-50395' lat='26.38845' lon='89.08899' />
+ <node id='-50397' lat='26.31093' lon='88.78961' />
+ <node id='-50399' lat='26.23211' lon='88.85004' />
+ <node id='-50401' lat='26.0077' lon='89.35953' />
+ <node id='-50403' lat='25.9682' lon='89.57101' />
+ <node id='-50405' lat='26.22595' lon='89.63968' />
+ <node id='-50407' lat='26.15818' lon='89.73581' />
+ <node id='-50409' lat='25.82489' lon='89.80585' />
+ <node id='-50411' lat='25.95462' lon='89.84704' />
+ <node id='-50413' lat='25.34306' lon='89.81683' />
+ <node id='-50415' lat='25.17788' lon='90.65042' />
+ <node id='-50417' lat='25.20522' lon='91.26153' />
+ <node id='-50419' lat='25.15799' lon='90.87427' />
+ <node id='-50421' lat='25.18907' lon='92.02783' />
+ <node id='-50423' lat='25.07593' lon='92.33957' />
+ <node id='-50425' lat='24.9191' lon='92.25854' />
+ <node id='-50427' lat='24.86055' lon='92.38626' />
+ <node id='-50429' lat='24.88796' lon='92.49887' />
+ <node id='-50431' lat='24.3799' lon='91.96603' />
+ <node id='-50433' lat='24.10693' lon='91.37414' />
+ <node id='-50435' lat='24.08687' lon='91.55542' />
+ <node id='-50437' lat='24.1132' lon='91.63782' />
+ <node id='-50439' lat='24.22095' lon='91.65292' />
+ <node id='-50441' lat='24.22345' lon='91.82596' />
+ <node id='-50443' lat='24.23848' lon='91.76004' />
+ <node id='-50445' lat='24.14703' lon='91.73257' />
+ <node id='-50447' lat='23.6599' lon='91.15579' />
+ <node id='-50449' lat='23.83463' lon='91.25192' />
+ <node id='-50451' lat='23.89616' lon='91.22308' />
+ <node id='-50453' lat='24.0041' lon='91.29587' />
+ <node id='-50455' lat='23.06612' lon='91.36453' />
+ <node id='-50457' lat='23.07117' lon='91.40848' />
+ <node id='-50459' lat='23.26308' lon='91.38788' />
+ <node id='-50461' lat='23.2328' lon='91.46615' />
+ <node id='-50463' lat='23.01051' lon='91.54993' />
+ <node id='-50465' lat='23.08001' lon='91.81634' />
+ <node id='-50467' lat='23.73284' lon='91.95093' />
+ <node id='-50469' lat='23.47361' lon='91.95642' />
+ <node id='-50471' lat='23.28705' lon='92.38214' />
+ <node id='-50473' lat='23.70392' lon='92.26541' />
+ <node id='-50475' lat='23.64229' lon='92.04706' />
+ <node id='-50477' lat='23.73409' lon='92.15417' />
+ <node id='-50479' lat='22.9435' lon='92.37665' />
+ <node id='-50481' lat='22.71441' lon='92.5181' />
+ <node id='-50483' lat='22.13554' lon='92.56616' />
+ <node id='-50485' lat='20.72172' lon='92.37665' />
+ <node id='-50487' lat='20.63179' lon='92.28464' />
+ <node id='-50489' lat='20.57137' lon='92.31348' />
+ <node id='-50491' lat='20.5688' lon='92.4302' />
+ <node id='-50493' lat='21.17445' lon='92.17752' />
+ <node id='-50495' lat='21.47764' lon='92.37939' />
+ <node id='-50497' lat='21.337' lon='92.20087' />
+ <node id='-50499' lat='21.24615' lon='92.60187' />
+ <node id='-50501' lat='21.28454' lon='92.68152' />
+ <node id='-50503' lat='21.6092' lon='92.59775' />
+ <node id='-50505' lat='21.37025' lon='92.43158' />
+ <node id='-50507' lat='21.3856' lon='92.55105' />
+ <node id='-50509' lat='48.35828' lon='26.6839' />
+ <node id='-50511' lat='48.29071' lon='26.79239' />
+ <node id='-50513' lat='48.31629' lon='26.82809' />
+ <node id='-50515' lat='48.40388' lon='26.71274' />
+ <node id='-50517' lat='48.41756' lon='26.87204' />
+ <node id='-50519' lat='48.36558' lon='26.93384' />
+ <node id='-50521' lat='48.37653' lon='27.03821' />
+ <node id='-50523' lat='48.42485' lon='27.0231' />
+ <node id='-50525' lat='48.43214' lon='27.08078' />
+ <node id='-50527' lat='48.37288' lon='27.13434' />
+ <node id='-50529' lat='48.44398' lon='27.37604' />
+ <node id='-50531' lat='48.41026' lon='27.37741' />
+ <node id='-50533' lat='48.41209' lon='27.44333' />
+ <node id='-50535' lat='48.454' lon='27.46942' />
+ <node id='-50537' lat='48.49224' lon='27.5889' />
+ <node id='-50539' lat='48.46311' lon='27.59027' />
+ <node id='-50541' lat='48.44034' lon='27.6658' />
+ <node id='-50543' lat='48.25049' lon='26.81161' />
+ <node id='-50545' lat='47.71366' lon='27.25519' />
+ <node id='-50547' lat='47.92391' lon='27.1618' />
+ <node id='-50549' lat='47.14511' lon='27.80176' />
+ <node id='-50551' lat='47.32507' lon='27.60263' />
+ <node id='-50553' lat='47.46637' lon='27.55731' />
+ <node id='-50555' lat='47.29248' lon='27.73172' />
+ <node id='-50557' lat='46.64305' lon='28.24808' />
+ <node id='-50559' lat='46.82283' lon='28.12173' />
+ <node id='-50561' lat='46.18099' lon='28.13684' />
+ <node id='-50563' lat='46.22852' lon='28.10937' />
+ <node id='-50565' lat='46.31869' lon='28.19864' />
+ <node id='-50567' lat='46.35283' lon='28.18902' />
+ <node id='-50569' lat='46.43334' lon='28.25769' />
+ <node id='-50571' lat='45.6421' lon='28.16568' />
+ <node id='-50573' lat='45.73803' lon='28.52823' />
+ <node id='-50575' lat='45.49982' lon='28.51449' />
+ <node id='-50577' lat='45.56716' lon='28.49252' />
+ <node id='-50579' lat='45.58062' lon='28.54196' />
+ <node id='-50581' lat='45.51715' lon='28.41836' />
+ <node id='-50583' lat='45.48538' lon='28.43072' />
+ <node id='-50585' lat='45.66994' lon='28.47879' />
+ <node id='-50587' lat='45.6613' lon='28.51587' />
+ <node id='-50589' lat='45.78019' lon='28.70401' />
+ <node id='-50591' lat='45.83475' lon='28.78503' />
+ <node id='-50593' lat='45.81753' lon='28.69852' />
+ <node id='-50595' lat='46.19716' lon='29.06656' />
+ <node id='-50597' lat='45.96664' lon='28.74383' />
+ <node id='-50599' lat='46.00385' lon='28.98004' />
+ <node id='-50601' lat='46.04962' lon='29.00613' />
+ <node id='-50603' lat='46.33671' lon='28.9924' />
+ <node id='-50605' lat='46.45699' lon='28.9306' />
+ <node id='-50607' lat='46.37652' lon='29.23273' />
+ <node id='-50609' lat='46.55435' lon='29.23547' />
+ <node id='-50611' lat='46.49955' lon='29.33984' />
+ <node id='-50613' lat='46.35472' lon='29.5939' />
+ <node id='-50615' lat='46.36041' lon='29.6763' />
+ <node id='-50617' lat='46.43807' lon='29.65845' />
+ <node id='-50619' lat='46.45889' lon='29.49914' />
+ <node id='-50621' lat='46.45605' lon='29.74496' />
+ <node id='-50623' lat='46.54302' lon='29.88916' />
+ <node id='-50625' lat='46.38694' lon='30.09103' />
+ <node id='-50627' lat='46.40967' lon='30.16794' />
+ <node id='-50629' lat='46.45132' lon='30.02511' />
+ <node id='-50631' lat='46.56002' lon='29.94409' />
+ <node id='-50633' lat='46.75325' lon='29.96744' />
+ <node id='-50635' lat='46.88199' lon='29.87405' />
+ <node id='-50637' lat='46.8604' lon='29.75458' />
+ <node id='-50639' lat='46.92234' lon='29.72986' />
+ <node id='-50641' lat='46.94766' lon='29.57056' />
+ <node id='-50643' lat='47.05069' lon='29.62137' />
+ <node id='-50645' lat='47.09932' lon='29.61038' />
+ <node id='-50647' lat='47.24962' lon='29.54996' />
+ <node id='-50649' lat='47.25521' lon='29.59665' />
+ <node id='-50651' lat='47.36508' lon='29.5733' />
+ <node id='-50653' lat='47.43387' lon='29.18603' />
+ <node id='-50655' lat='47.44409' lon='29.311' />
+ <node id='-50657' lat='47.30179' lon='29.39889' />
+ <node id='-50659' lat='47.30366' lon='29.47854' />
+ <node id='-50661' lat='47.36043' lon='29.48678' />
+ <node id='-50663' lat='47.63044' lon='29.22037' />
+ <node id='-50665' lat='47.99013' lon='29.1723' />
+ <node id='-50667' lat='47.89261' lon='29.19839' />
+ <node id='-50669' lat='47.72568' lon='29.20938' />
+ <node id='-50671' lat='47.79953' lon='29.27255' />
+ <node id='-50673' lat='47.81428' lon='29.19977' />
+ <node id='-50675' lat='47.88893' lon='29.27804' />
+ <node id='-50677' lat='47.96255' lon='28.9306' />
+ <node id='-50679' lat='48.12506' lon='28.85232' />
+ <node id='-50681' lat='48.17453' lon='28.53921' />
+ <node id='-50683' lat='48.0737' lon='28.48428' />
+ <node id='-50685' lat='48.20749' lon='28.19314' />
+ <node id='-50687' lat='48.24957' lon='28.35519' />
+ <node id='-50689' lat='48.14339' lon='28.29751' />
+ <node id='-50691' lat='48.21207' lon='28.37305' />
+ <node id='-50693' lat='48.17636' lon='28.40875' />
+ <node id='-50695' lat='48.13147' lon='28.34009' />
+ <node id='-50697' lat='48.0948' lon='28.43896' />
+ <node id='-50699' lat='48.31903' lon='28.08603' />
+ <node id='-50701' lat='48.23494' lon='28.07504' />
+ <node id='-50703' lat='48.25963' lon='28.17666' />
+ <node id='-50705' lat='50.86817' lon='14.99852' />
+ <node id='-50707' lat='50.97984' lon='15.01088' />
+ <node id='-50709' lat='50.99108' lon='14.96419' />
+ <node id='-50711' lat='51.02564' lon='15.02187' />
+ <node id='-50713' lat='50.97724' lon='15.27043' />
+ <node id='-50715' lat='50.77187' lon='15.3803' />
+ <node id='-50717' lat='50.99021' lon='15.11937' />
+ <node id='-50719' lat='51.01959' lon='15.16744' />
+ <node id='-50721' lat='50.9833' lon='15.1743' />
+ <node id='-50723' lat='50.99886' lon='15.2361' />
+ <node id='-50725' lat='51.01095' lon='15.10152' />
+ <node id='-50727' lat='50.8907' lon='15.2773' />
+ <node id='-50729' lat='50.83956' lon='15.36656' />
+ <node id='-50731' lat='50.80833' lon='15.43798' />
+ <node id='-50733' lat='50.60046' lon='16.02437' />
+ <node id='-50735' lat='50.75449' lon='15.81151' />
+ <node id='-50737' lat='50.67188' lon='15.87331' />
+ <node id='-50739' lat='50.69799' lon='15.97219' />
+ <node id='-50741' lat='50.73885' lon='15.73186' />
+ <node id='-50743' lat='50.66405' lon='16.10265' />
+ <node id='-50745' lat='50.61528' lon='15.98317' />
+ <node id='-50747' lat='50.63009' lon='16.0175' />
+ <node id='-50749' lat='50.43543' lon='16.19741' />
+ <node id='-50751' lat='50.58041' lon='16.44597' />
+ <node id='-50753' lat='50.66579' lon='16.33611' />
+ <node id='-50755' lat='50.67101' lon='16.23174' />
+ <node id='-50757' lat='50.63096' lon='16.20839' />
+ <node id='-50759' lat='50.50274' lon='16.31413' />
+ <node id='-50761' lat='50.49575' lon='16.34572' />
+ <node id='-50763' lat='50.09659' lon='16.7014' />
+ <node id='-50765' lat='50.36891' lon='16.28118' />
+ <node id='-50767' lat='50.37679' lon='16.36495' />
+ <node id='-50769' lat='50.21009' lon='16.56407' />
+ <node id='-50771' lat='50.16613' lon='16.55446' />
+ <node id='-50773' lat='50.1142' lon='16.63137' />
+ <node id='-50775' lat='50.32509' lon='16.42674' />
+ <node id='-50777' lat='50.34875' lon='16.3622' />
+ <node id='-50779' lat='50.38555' lon='16.30315' />
+ <node id='-50781' lat='50.3207' lon='16.39379' />
+ <node id='-50783' lat='50.45117' lon='16.89229' />
+ <node id='-50785' lat='50.41093' lon='16.85933' />
+ <node id='-50787' lat='50.38117' lon='17.14498' />
+ <node id='-50789' lat='50.38817' lon='17.19579' />
+ <node id='-50791' lat='50.20834' lon='16.8456' />
+ <node id='-50793' lat='50.31281' lon='16.94448' />
+ <node id='-50795' lat='50.38642' lon='16.90877' />
+ <node id='-50797' lat='50.21449' lon='17.00353' />
+ <node id='-50799' lat='50.23118' lon='17.02825' />
+ <node id='-50801' lat='50.25753' lon='16.99803' />
+ <node id='-50803' lat='50.27772' lon='17.02138' />
+ <node id='-50805' lat='50.30316' lon='16.99803' />
+ <node id='-50807' lat='50.24172' lon='16.98018' />
+ <node id='-50809' lat='50.16437' lon='17.59404' />
+ <node id='-50811' lat='50.10275' lon='17.66683' />
+ <node id='-50813' lat='50.32859' lon='17.69292' />
+ <node id='-50815' lat='50.18812' lon='17.70528' />
+ <node id='-50817' lat='50.23382' lon='17.76296' />
+ <node id='-50819' lat='50.32246' lon='17.27681' />
+ <node id='-50821' lat='50.3654' lon='17.19991' />
+ <node id='-50823' lat='50.32947' lon='17.34273' />
+ <node id='-50825' lat='50.2628' lon='17.34548' />
+ <node id='-50827' lat='50.2707' lon='17.63112' />
+ <node id='-50829' lat='50.28123' lon='17.3702' />
+ <node id='-50831' lat='50.29966' lon='17.74648' />
+ <node id='-50833' lat='50.25665' lon='17.72176' />
+ <node id='-50835' lat='50.12037' lon='17.6888' />
+ <node id='-50837' lat='50.02253' lon='17.77669' />
+ <node id='-50839' lat='50.07896' lon='17.7506' />
+ <node id='-50841' lat='49.71983' lon='18.62676' />
+ <node id='-50843' lat='49.96779' lon='18.27107' />
+ <node id='-50845' lat='49.97839' lon='17.86183' />
+ <node id='-50847' lat='50.06574' lon='18.03212' />
+ <node id='-50849' lat='50.05252' lon='17.99779' />
+ <node id='-50851' lat='50.03311' lon='18.04585' />
+ <node id='-50853' lat='50.01194' lon='18.04585' />
+ <node id='-50855' lat='50.01723' lon='18.00191' />
+ <node id='-50857' lat='50.04017' lon='18.08568' />
+ <node id='-50859' lat='50.00223' lon='18.10628' />
+ <node id='-50861' lat='49.99958' lon='18.20241' />
+ <node id='-50863' lat='49.97309' lon='18.21752' />
+ <node id='-50865' lat='49.91565' lon='18.31914' />
+ <node id='-50867' lat='49.93863' lon='18.27794' />
+ <node id='-50869' lat='49.94747' lon='18.33562' />
+ <node id='-50871' lat='49.90061' lon='18.532' />
+ <node id='-50873' lat='49.92537' lon='18.54299' />
+ <node id='-50875' lat='49.91742' lon='18.57045' />
+ <node id='-50877' lat='49.83334' lon='18.57183' />
+ <node id='-50879' lat='49.86256' lon='18.60341' />
+ <node id='-50881' lat='49.87849' lon='18.57045' />
+ <node id='-50883' lat='49.5446' lon='18.84786' />
+ <node id='-50885' lat='49.70473' lon='18.69817' />
+ <node id='-50887' lat='49.68163' lon='18.72838' />
+ <node id='-50889' lat='49.28909' lon='18.18456' />
+ <node id='-50891' lat='49.3267' lon='18.36446' />
+ <node id='-50893' lat='49.47059' lon='18.54848' />
+ <node id='-50895' lat='49.492' lon='18.74761' />
+ <node id='-50897' lat='49.51162' lon='18.57183' />
+ <node id='-50899' lat='49.50895' lon='18.67757' />
+ <node id='-50901' lat='49.49022' lon='18.53063' />
+ <node id='-50903' lat='49.49824' lon='18.6144' />
+ <node id='-50905' lat='49.39467' lon='18.44686' />
+ <node id='-50907' lat='49.40003' lon='18.4084' />
+ <node id='-50909' lat='49.36517' lon='18.4139' />
+ <node id='-50911' lat='48.80936' lon='17.3853' />
+ <node id='-50913' lat='48.85004' lon='17.45671' />
+ <node id='-50915' lat='48.81117' lon='17.5295' />
+ <node id='-50917' lat='48.86721' lon='17.7094' />
+ <node id='-50919' lat='48.92318' lon='17.77944' />
+ <node id='-50921' lat='48.92679' lon='17.87831' />
+ <node id='-50923' lat='49.01784' lon='17.91814' />
+ <node id='-50925' lat='49.02775' lon='18.04585' />
+ <node id='-50927' lat='49.08624' lon='18.1104' />
+ <node id='-50929' lat='49.24518' lon='18.15022' />
+ <node id='-50931' lat='48.70887' lon='17.00215' />
+ <node id='-50933' lat='48.82925' lon='17.11202' />
+ <node id='-50935' lat='48.85546' lon='17.29054' />
+ <node id='-50937' lat='45.32102' lon='28.34554' />
+ <node id='-50939' lat='45.24759' lon='28.5735' />
+ <node id='-50941' lat='45.22631' lon='28.71358' />
+ <node id='-50943' lat='45.24179' lon='28.78911' />
+ <node id='-50945' lat='45.28045' lon='28.94292' />
+ <node id='-50947' lat='45.3384' lon='28.81383' />
+ <node id='-50949' lat='45.33164' lon='28.96077' />
+ <node id='-50951' lat='45.43388' lon='29.24779' />
+ <node id='-50953' lat='45.44545' lon='29.42632' />
+ <node id='-50955' lat='45.38857' lon='29.59798' />
+ <node id='-50957' lat='45.25629' lon='29.65428' />
+ <node id='-50959' lat='45.26885' lon='29.68175' />
+ <node id='-50961' lat='47.99246' lon='26.17711' />
+ <node id='-50963' lat='47.9897' lon='26.05901' />
+ <node id='-50965' lat='48.18418' lon='26.33504' />
+ <node id='-50967' lat='48.22445' lon='26.55202' />
+ <node id='-50969' lat='47.94924' lon='25.63878' />
+ <node id='-50971' lat='47.89403' lon='25.23778' />
+ <node id='-50973' lat='47.7234' lon='24.88896' />
+ <node id='-50975' lat='47.75203' lon='25.11144' />
+ <node id='-50977' lat='47.82031' lon='24.81893' />
+ <node id='-50979' lat='47.84428' lon='24.70632' />
+ <node id='-50981' lat='48.01818' lon='23.52803' />
+ <node id='-50983' lat='47.93544' lon='23.86724' />
+ <node id='-50985' lat='47.98786' lon='23.66262' />
+ <node id='-50987' lat='47.99705' lon='23.75188' />
+ <node id='-50989' lat='47.9851' lon='23.8178' />
+ <node id='-50991' lat='47.96672' lon='23.96337' />
+ <node id='-50993' lat='47.90231' lon='24.22566' />
+ <node id='-50995' lat='47.97131' lon='24.43578' />
+ <node id='-50997' lat='47.9244' lon='24.34926' />
+ <node id='-50999' lat='48.00716' lon='23.08858' />
+ <node id='-51001' lat='47.96672' lon='22.94301' />
+ <node id='-51003' lat='47.99338' lon='23.0158' />
+ <node id='-51005' lat='48.02002' lon='22.92241' />
+ <node id='-51007' lat='48.12188' lon='23.15999' />
+ <node id='-51009' lat='48.0237' lon='23.33577' />
+ <node id='-51011' lat='48.08245' lon='23.27397' />
+ <node id='-51013' lat='48.08061' lon='23.1133' />
+ <node id='-51015' lat='48.42534' lon='22.2083' />
+ <node id='-51017' lat='48.23726' lon='22.38133' />
+ <node id='-51019' lat='48.10813' lon='22.58733' />
+ <node id='-51021' lat='48.25189' lon='22.49806' />
+ <node id='-51023' lat='48.15121' lon='22.59007' />
+ <node id='-51025' lat='48.11363' lon='22.81804' />
+ <node id='-51027' lat='47.98602' lon='22.84276' />
+ <node id='-51029' lat='48.04665' lon='22.87847' />
+ <node id='-51031' lat='48.09162' lon='22.66835' />
+ <node id='-51033' lat='48.12005' lon='22.73427' />
+ <node id='-51035' lat='47.8369' lon='22.71642' />
+ <node id='-51037' lat='47.81109' lon='22.48021' />
+ <node id='-51039' lat='47.7871' lon='22.67247' />
+ <node id='-51041' lat='47.77234' lon='22.55162' />
+ <node id='-51043' lat='47.50492' lon='22.00917' />
+ <node id='-51045' lat='47.76126' lon='22.31816' />
+ <node id='-51047' lat='47.7391' lon='22.41979' />
+ <node id='-51049' lat='47.80094' lon='22.44039' />
+ <node id='-51051' lat='47.03902' lon='21.648' />
+ <node id='-51053' lat='47.11104' lon='21.78395' />
+ <node id='-51055' lat='47.38046' lon='21.94463' />
+ <node id='-51057' lat='47.37767' lon='22.01055' />
+ <node id='-51059' lat='47.42508' lon='22.03389' />
+ <node id='-51061' lat='46.63035' lon='21.33214' />
+ <node id='-51063' lat='46.65109' lon='21.43926' />
+ <node id='-51065' lat='46.7641' lon='21.48183' />
+ <node id='-51067' lat='46.73116' lon='21.52989' />
+ <node id='-51069' lat='46.69067' lon='21.49144' />
+ <node id='-51071' lat='46.69538' lon='21.42827' />
+ <node id='-51073' lat='46.86935' lon='21.59307' />
+ <node id='-51075' lat='46.84118' lon='21.52028' />
+ <node id='-51077' lat='46.99595' lon='21.68645' />
+ <node id='-51079' lat='46.91628' lon='21.59581' />
+ <node id='-51081' lat='46.27366' lon='20.77458' />
+ <node id='-51083' lat='46.24897' lon='21.06572' />
+ <node id='-51085' lat='46.30118' lon='21.16872' />
+ <node id='-51087' lat='46.41491' lon='21.21678' />
+ <node id='-51089' lat='46.40544' lon='21.28545' />
+ <node id='-51091' lat='46.45466' lon='21.31703' />
+ <node id='-51093' lat='46.28884' lon='20.86797' />
+ <node id='-51095' lat='46.16629' lon='20.35573' />
+ <node id='-51097' lat='46.18721' lon='20.49718' />
+ <node id='-51099' lat='46.12728' lon='20.63863' />
+ <node id='-51101' lat='46.21002' lon='20.76085' />
+ <node id='-51103' lat='46.25467' lon='20.74574' />
+ <node id='-51105' lat='48.02094' lon='17.23699' />
+ <node id='-51107' lat='47.7548' lon='17.71215' />
+ <node id='-51109' lat='47.75665' lon='18.02938' />
+ <node id='-51111' lat='47.73541' lon='18.29305' />
+ <node id='-51113' lat='47.82308' lon='18.8506' />
+ <node id='-51115' lat='47.76588' lon='18.56496' />
+ <node id='-51117' lat='47.76772' lon='18.66521' />
+ <node id='-51119' lat='47.8157' lon='18.74074' />
+ <node id='-51121' lat='47.87469' lon='18.76821' />
+ <node id='-51123' lat='48.04206' lon='18.82176' />
+ <node id='-51125' lat='47.97499' lon='18.76134' />
+ <node id='-51127' lat='48.0595' lon='19.23924' />
+ <node id='-51129' lat='48.08336' lon='19.28182' />
+ <node id='-51131' lat='48.09437' lon='19.47957' />
+ <node id='-51133' lat='48.07052' lon='19.01952' />
+ <node id='-51135' lat='48.19791' lon='19.52489' />
+ <node id='-51137' lat='48.25006' lon='19.63338' />
+ <node id='-51139' lat='48.1283' lon='19.92452' />
+ <node id='-51141' lat='48.2784' lon='20.24312' />
+ <node id='-51143' lat='48.26104' lon='20.29943' />
+ <node id='-51145' lat='48.49546' lon='21.11516' />
+ <node id='-51147' lat='48.58456' lon='21.44063' />
+ <node id='-51149' lat='48.50365' lon='21.6068' />
+ <node id='-51151' lat='48.3989' lon='21.67134' />
+ <node id='-51153' lat='48.33321' lon='21.8279' />
+ <node id='-51155' lat='48.36242' lon='21.83339' />
+ <node id='-51157' lat='48.56548' lon='22.16023' />
+ <node id='-51159' lat='48.68893' lon='22.34151' />
+ <node id='-51161' lat='48.6218' lon='22.21379' />
+ <node id='-51163' lat='49.01424' lon='22.54338' />
+ <node id='-51165' lat='48.99172' lon='22.48296' />
+ <node id='-51167' lat='49.10513' lon='22.86336' />
+ <node id='-51169' lat='49.4447' lon='21.62328' />
+ <node id='-51171' lat='49.35443' lon='21.77983' />
+ <node id='-51173' lat='49.39467' lon='21.82927' />
+ <node id='-51175' lat='49.3437' lon='21.96385' />
+ <node id='-51177' lat='49.41433' lon='21.43376' />
+ <node id='-51179' lat='49.45988' lon='21.27858' />
+ <node id='-51181' lat='49.4054' lon='21.19756' />
+ <node id='-51183' lat='49.41791' lon='21.041' />
+ <node id='-51185' lat='49.43666' lon='21.12477' />
+ <node id='-51187' lat='49.31685' lon='20.13738' />
+ <node id='-51189' lat='49.29626' lon='20.9229' />
+ <node id='-51191' lat='49.41344' lon='20.73201' />
+ <node id='-51193' lat='49.34817' lon='20.31453' />
+ <node id='-51195' lat='49.39914' lon='20.31728' />
+ <node id='-51197' lat='49.41612' lon='20.46422' />
+ <node id='-51199' lat='49.375' lon='20.5631' />
+ <node id='-51201' lat='49.41791' lon='20.61666' />
+ <node id='-51203' lat='49.35265' lon='20.21977' />
+ <node id='-51205' lat='49.23532' lon='19.90529' />
+ <node id='-51207' lat='49.22904' lon='19.98494' />
+ <node id='-51209' lat='49.20751' lon='19.75286' />
+ <node id='-51211' lat='49.19316' lon='19.86409' />
+ <node id='-51213' lat='49.41701' lon='19.78581' />
+ <node id='-51215' lat='49.61583' lon='19.45348' />
+ <node id='-51217' lat='49.40897' lon='19.6375' />
+ <node id='-51219' lat='49.46077' lon='19.57845' />
+ <node id='-51221' lat='49.45184' lon='19.64162' />
+ <node id='-51223' lat='49.39288' lon='19.72127' />
+ <node id='-51225' lat='49.52856' lon='19.53313' />
+ <node id='-51227' lat='49.57311' lon='19.52626' />
+ <node id='-51229' lat='49.52143' lon='18.94536' />
+ <node id='-51231' lat='49.49914' lon='18.97283' />
+ <node id='-51233' lat='49.39557' lon='18.9742' />
+ <node id='-51235' lat='49.41165' lon='19.18019' />
+ <node id='-51237' lat='49.53391' lon='19.25435' />
+ <node id='-51239' lat='49.574' lon='19.37795' />
+ <node id='-51241' lat='49.53747' lon='19.36009' />
+ <node id='-51243' lat='53.60942' lon='23.62004' />
+ <node id='-51245' lat='52.94016' lon='23.91805' />
+ <node id='-51247' lat='53.0831' lon='23.87548' />
+ <node id='-51249' lat='53.16469' lon='23.91393' />
+ <node id='-51251' lat='52.95919' lon='23.94689' />
+ <node id='-51253' lat='52.28812' lon='23.18196' />
+ <node id='-51255' lat='52.53273' lon='23.42778' />
+ <node id='-51257' lat='52.59868' lon='23.58296' />
+ <node id='-51259' lat='52.18215' lon='23.47859' />
+ <node id='-51261' lat='52.12148' lon='23.54314' />
+ <node id='-51263' lat='51.9906' lon='23.68733' />
+ <node id='-51265' lat='51.74043' lon='23.52941' />
+ <node id='-51267' lat='51.53673' lon='23.56236' />
+ <node id='-51269' lat='51.78208' lon='23.62691' />
+ <node id='-51271' lat='51.91442' lon='23.61318' />
+ <node id='-51273' lat='51.58369' lon='23.99907' />
+ <node id='-51275' lat='51.50255' lon='23.6736' />
+ <node id='-51277' lat='51.62122' lon='23.60906' />
+ <node id='-51279' lat='51.66809' lon='23.7766' />
+ <node id='-51281' lat='51.63316' lon='23.91118' />
+ <node id='-51283' lat='51.59734' lon='23.8741' />
+ <node id='-51285' lat='51.32783' lon='23.63378' />
+ <node id='-51287' lat='50.79271' lon='23.95925' />
+ <node id='-51289' lat='50.71625' lon='24.0595' />
+ <node id='-51291' lat='51.00836' lon='23.92217' />
+ <node id='-51293' lat='50.8621' lon='24.14876' />
+ <node id='-51295' lat='50.90196' lon='24.04576' />
+ <node id='-51297' lat='50.84043' lon='23.9771' />
+ <node id='-51299' lat='50.83262' lon='24.0952' />
+ <node id='-51301' lat='50.41618' lon='23.99495' />
+ <node id='-51303' lat='50.40481' lon='23.79445' />
+ <node id='-51305' lat='50.5071' lon='24.07048' />
+ <node id='-51307' lat='50.0957' lon='23.28221' />
+ <node id='-51309' lat='50.33385' lon='23.67635' />
+ <node id='-51311' lat='49.49378' lon='22.69444' />
+ <node id='-51313' lat='49.32759' lon='22.748' />
+ <node id='-51315' lat='51.75063' lon='24.3163' />
+ <node id='-51317' lat='51.80841' lon='24.29021' />
+ <node id='-51319' lat='51.88222' lon='24.37123' />
+ <node id='-51321' lat='51.91273' lon='24.98784' />
+ <node id='-51323' lat='51.92205' lon='25.46163' />
+ <node id='-51325' lat='51.92967' lon='26.00408' />
+ <node id='-51327' lat='51.86781' lon='26.19084' />
+ <node id='-51329' lat='51.76933' lon='26.99422' />
+ <node id='-51331' lat='51.82284' lon='26.69759' />
+ <node id='-51333' lat='51.80501' lon='26.46962' />
+ <node id='-51335' lat='51.73788' lon='26.9489' />
+ <node id='-51337' lat='51.60161' lon='27.24828' />
+ <node id='-51339' lat='51.65957' lon='27.26613' />
+ <node id='-51341' lat='51.60672' lon='27.71932' />
+ <node id='-51343' lat='51.50854' lon='27.67125' />
+ <node id='-51345' lat='51.47604' lon='27.76052' />
+ <node id='-51347' lat='51.62293' lon='27.85253' />
+ <node id='-51349' lat='51.56065' lon='27.95827' />
+ <node id='-51351' lat='51.57857' lon='28.10658' />
+ <node id='-51353' lat='51.61952' lon='27.91844' />
+ <node id='-51355' lat='51.61184' lon='27.47212' />
+ <node id='-51357' lat='51.63486' lon='27.55727' />
+ <node id='-51359' lat='51.5854' lon='27.51058' />
+ <node id='-51361' lat='51.39814' lon='29.49773' />
+ <node id='-51363' lat='51.37843' lon='29.32881' />
+ <node id='-51365' lat='51.4187' lon='29.42357' />
+ <node id='-51367' lat='51.65872' lon='29.1187' />
+ <node id='-51369' lat='51.64679' lon='29.16402' />
+ <node id='-51371' lat='51.49828' lon='29.25191' />
+ <node id='-51373' lat='51.56918' lon='29.20659' />
+ <node id='-51375' lat='51.57089' lon='29.25603' />
+ <node id='-51377' lat='51.41442' lon='28.75615' />
+ <node id='-51379' lat='51.59734' lon='28.47051' />
+ <node id='-51381' lat='51.44695' lon='28.69161' />
+ <node id='-51383' lat='51.46236' lon='28.73143' />
+ <node id='-51385' lat='51.45294' lon='28.78224' />
+ <node id='-51387' lat='51.55552' lon='28.81795' />
+ <node id='-51389' lat='51.48802' lon='28.76027' />
+ <node id='-51391' lat='51.59222' lon='28.95528' />
+ <node id='-51393' lat='51.56833' lon='28.99098' />
+ <node id='-51395' lat='51.53417' lon='29.7408' />
+ <node id='-51397' lat='51.4461' lon='29.77376' />
+ <node id='-51399' lat='51.51025' lon='30.17888' />
+ <node id='-51401' lat='51.25655' lon='30.56203' />
+ <node id='-51403' lat='51.35014' lon='30.64992' />
+ <node id='-51405' lat='51.42555' lon='30.34642' />
+ <node id='-51407' lat='51.33984' lon='30.36153' />
+ <node id='-51409' lat='51.59649' lon='30.51946' />
+ <node id='-51411' lat='52.1004' lon='31.13332' />
+ <node id='-51413' lat='52.04131' lon='31.25142' />
+ <node id='-51415' lat='52.12991' lon='31.38326' />
+ <node id='-51417' lat='52.1973' lon='31.6895' />
+ <node id='-51419' lat='52.26711' lon='31.70735' />
+ <node id='-51421' lat='52.18636' lon='31.77877' />
+ <node id='-51423' lat='52.05144' lon='31.92159' />
+ <node id='-51425' lat='52.09955' lon='31.81722' />
+ <node id='-51427' lat='52.11305' lon='31.85018' />
+ <node id='-51429' lat='52.08015' lon='31.96141' />
+ <node id='-51431' lat='52.55361' lon='31.63869' />
+ <node id='-51433' lat='52.33849' lon='31.62084' />
+ <node id='-51435' lat='52.51518' lon='31.56316' />
+ <node id='-51437' lat='52.48843' lon='31.61397' />
+ <node id='-51439' lat='52.79011' lon='31.592' />
+ <node id='-51441' lat='52.71613' lon='31.57277' />
+ <node id='-51443' lat='53.21406' lon='31.40523' />
+ <node id='-51445' lat='53.04101' lon='31.32283' />
+ <node id='-51447' lat='53.08805' lon='31.33519' />
+ <node id='-51449' lat='53.09712' lon='31.3915' />
+ <node id='-51451' lat='53.13504' lon='31.36403' />
+ <node id='-51453' lat='53.19432' lon='31.56316' />
+ <node id='-51455' lat='53.22886' lon='31.62496' />
+ <node id='-51457' lat='53.18033' lon='31.787' />
+ <node id='-51459' lat='53.11279' lon='31.82408' />
+ <node id='-51461' lat='53.18856' lon='32.40773' />
+ <node id='-51463' lat='53.30196' lon='32.51897' />
+ <node id='-51465' lat='53.74039' lon='32.45717' />
+ <node id='-51467' lat='53.68594' lon='32.50112' />
+ <node id='-51469' lat='53.6656' lon='32.40499' />
+ <node id='-51471' lat='53.5548' lon='32.47777' />
+ <node id='-51473' lat='53.45597' lon='32.74968' />
+ <node id='-51475' lat='53.81586' lon='32.12621' />
+ <node id='-51477' lat='53.78099' lon='31.89137' />
+ <node id='-51479' lat='54.14535' lon='31.57002' />
+ <node id='-51481' lat='54.46585' lon='31.22945' />
+ <node id='-51483' lat='54.74346' lon='30.95479' />
+ <node id='-51485' lat='54.67046' lon='30.99187' />
+ <node id='-51487' lat='54.66967' lon='31.17589' />
+ <node id='-51489' lat='54.63153' lon='31.20473' />
+ <node id='-51491' lat='54.68872' lon='30.98226' />
+ <node id='-51493' lat='54.70698' lon='31.0262' />
+ <node id='-51495' lat='54.71967' lon='30.97127' />
+ <node id='-51497' lat='55.06167' lon='31.02071' />
+ <node id='-51499' lat='54.9585' lon='30.93144' />
+ <node id='-51501' lat='54.98609' lon='30.95754' />
+ <node id='-51503' lat='55.02232' lon='30.9081' />
+ <node id='-51505' lat='55.02783' lon='31.00972' />
+ <node id='-51507' lat='55.03964' lon='30.94243' />
+ <node id='-51509' lat='55.6185' lon='30.93419' />
+ <node id='-51511' lat='55.3313' lon='30.8257' />
+ <node id='-51513' lat='55.3914' lon='30.93144' />
+ <node id='-51515' lat='55.46621' lon='30.90123' />
+ <node id='-51517' lat='55.50667' lon='30.95204' />
+ <node id='-51519' lat='55.86819' lon='30.27776' />
+ <node id='-51521' lat='55.58514' lon='30.7845' />
+ <node id='-51523' lat='55.63169' lon='30.86003' />
+ <node id='-51525' lat='55.66268' lon='30.72957' />
+ <node id='-51527' lat='55.64176' lon='30.67464' />
+ <node id='-51529' lat='55.73079' lon='30.63344' />
+ <node id='-51531' lat='55.75862' lon='29.3604' />
+ <node id='-51533' lat='55.70294' lon='29.51283' />
+ <node id='-51535' lat='55.87281' lon='29.97975' />
+ <node id='-51537' lat='55.77716' lon='29.61446' />
+ <node id='-51539' lat='55.79569' lon='29.80672' />
+ <node id='-51541' lat='55.95978' lon='29.44692' />
+ <node id='-51543' lat='56.06035' lon='28.30571' />
+ <node id='-51545' lat='55.97131' lon='28.73418' />
+ <node id='-51547' lat='56.03427' lon='29.08299' />
+ <node id='-51549' lat='56.07262' lon='28.63668' />
+ <node id='-51551' lat='56.11705' lon='28.5529' />
+ <node id='-51553' lat='56.10173' lon='28.68337' />
+ <node id='-51555' lat='56.09407' lon='28.43068' />
+ <node id='-51557' lat='56.05805' lon='28.36888' />
+ <node id='-51559' lat='56.11399' lon='28.37987' />
+ <node id='-51561' lat='52.2461' lon='32.89937' />
+ <node id='-51563' lat='52.3754' lon='33.18913' />
+ <node id='-51565' lat='52.32842' lon='32.3528' />
+ <node id='-51567' lat='52.1434' lon='32.34044' />
+ <node id='-51569' lat='52.32423' lon='32.54781' />
+ <node id='-51571' lat='52.25535' lon='32.69475' />
+ <node id='-51573' lat='52.27888' lon='32.85405' />
+ <node id='-51575' lat='52.24946' lon='32.38988' />
+ <node id='-51577' lat='52.23685' lon='32.33083' />
+ <node id='-51579' lat='52.35779' lon='33.51323' />
+ <node id='-51581' lat='52.31499' lon='33.48027' />
+ <node id='-51583' lat='52.30324' lon='33.55718' />
+ <node id='-51585' lat='52.37204' lon='33.78789' />
+ <node id='-51587' lat='52.14087' lon='34.11199' />
+ <node id='-51589' lat='52.00835' lon='34.09413' />
+ <node id='-51591' lat='51.82793' lon='34.41136' />
+ <node id='-51593' lat='51.67065' lon='34.07765' />
+ <node id='-51595' lat='51.72852' lon='34.42922' />
+ <node id='-51597' lat='51.5205' lon='34.30562' />
+ <node id='-51599' lat='51.26429' lon='34.23009' />
+ <node id='-51601' lat='51.4187' lon='34.22048' />
+ <node id='-51603' lat='51.363' lon='34.33446' />
+ <node id='-51605' lat='51.25053' lon='34.6613' />
+ <node id='-51607' lat='51.23936' lon='34.31661' />
+ <node id='-51609' lat='51.2746' lon='34.38802' />
+ <node id='-51611' lat='51.18' lon='34.6874' />
+ <node id='-51613' lat='51.2342' lon='34.97304' />
+ <node id='-51615' lat='51.23162' lon='35.14058' />
+ <node id='-51617' lat='51.17483' lon='34.82472' />
+ <node id='-51619' lat='51.04723' lon='35.20375' />
+ <node id='-51621' lat='51.16191' lon='35.12685' />
+ <node id='-51623' lat='51.08434' lon='35.31774' />
+ <node id='-51625' lat='51.04119' lon='35.40837' />
+ <node id='-51627' lat='50.94524' lon='35.32598' />
+ <node id='-51629' lat='50.64751' lon='35.39464' />
+ <node id='-51631' lat='50.66405' lon='35.48116' />
+ <node id='-51633' lat='50.77274' lon='35.47704' />
+ <node id='-51635' lat='50.45117' lon='35.58003' />
+ <node id='-51637' lat='50.50361' lon='35.45644' />
+ <node id='-51639' lat='50.41356' lon='35.80388' />
+ <node id='-51641' lat='50.35489' lon='35.73659' />
+ <node id='-51643' lat='50.35927' lon='35.61025' />
+ <node id='-51645' lat='50.45205' lon='36.06893' />
+ <node id='-51647' lat='50.29088' lon='36.30101' />
+ <node id='-51649' lat='50.3943' lon='36.20763' />
+ <node id='-51651' lat='50.31457' lon='36.47817' />
+ <node id='-51653' lat='50.218' lon='36.64571' />
+ <node id='-51655' lat='50.34963' lon='36.91762' />
+ <node id='-51657' lat='50.26982' lon='36.69377' />
+ <node id='-51659' lat='50.46079' lon='37.48204' />
+ <node id='-51661' lat='50.21976' lon='37.61113' />
+ <node id='-51663' lat='50.36277' lon='37.47243' />
+ <node id='-51665' lat='50.29966' lon='37.62486' />
+ <node id='-51667' lat='50.08161' lon='38.18517' />
+ <node id='-51669' lat='50.08866' lon='38.32524' />
+ <node id='-51671' lat='49.95719' lon='38.65071' />
+ <node id='-51673' lat='50.00664' lon='38.35408' />
+ <node id='-51675' lat='50.07896' lon='37.75807' />
+ <node id='-51677' lat='50.08425' lon='37.79515' />
+ <node id='-51679' lat='50.04194' lon='37.90776' />
+ <node id='-51681' lat='49.90592' lon='38.02999' />
+ <node id='-51683' lat='49.98104' lon='38.21675' />
+ <node id='-51685' lat='49.94482' lon='38.02999' />
+ <node id='-51687' lat='49.88911' lon='39.1808' />
+ <node id='-51689' lat='49.79524' lon='38.9391' />
+ <node id='-51691' lat='49.86787' lon='38.90477' />
+ <node id='-51693' lat='49.90238' lon='38.73311' />
+ <node id='-51695' lat='49.75976' lon='39.27968' />
+ <node id='-51697' lat='49.73758' lon='39.59142' />
+ <node id='-51699' lat='49.61761' lon='39.65047' />
+ <node id='-51701' lat='49.61672' lon='40.13249' />
+ <node id='-51703' lat='49.56064' lon='39.84548' />
+ <node id='-51705' lat='49.56865' lon='40.16683' />
+ <node id='-51707' lat='49.52321' lon='40.03636' />
+ <node id='-51709' lat='49.25683' lon='40.22176' />
+ <node id='-51711' lat='49.1761' lon='40.01988' />
+ <node id='-51713' lat='49.45452' lon='40.03087' />
+ <node id='-51715' lat='49.34996' lon='40.18331' />
+ <node id='-51717' lat='48.83739' lon='39.79466' />
+ <node id='-51719' lat='48.98' lon='39.75072' />
+ <node id='-51721' lat='48.91596' lon='39.78368' />
+ <node id='-51723' lat='48.86901' lon='39.98967' />
+ <node id='-51725' lat='48.79398' lon='39.97182' />
+ <node id='-51727' lat='48.87443' lon='40.08168' />
+ <node id='-51729' lat='48.91957' lon='40.03636' />
+ <node id='-51731' lat='48.22811' lon='39.94847' />
+ <node id='-51733' lat='48.22445' lon='40.00752' />
+ <node id='-51735' lat='48.31312' lon='39.98967' />
+ <node id='-51737' lat='48.27018' lon='39.91963' />
+ <node id='-51739' lat='48.57821' lon='39.84548' />
+ <node id='-51741' lat='48.30947' lon='39.84273' />
+ <node id='-51743' lat='48.3049' lon='39.90041' />
+ <node id='-51745' lat='48.33321' lon='39.84136' />
+ <node id='-51747' lat='48.35055' lon='39.94847' />
+ <node id='-51749' lat='48.46633' lon='39.86196' />
+ <node id='-51751' lat='48.04206' lon='39.77544' />
+ <node id='-51753' lat='48.04482' lon='39.88256' />
+ <node id='-51755' lat='48.06501' lon='39.83724' />
+ <node id='-51757' lat='47.96396' lon='39.82213' />
+ <node id='-51759' lat='47.81109' lon='38.79628' />
+ <node id='-51761' lat='47.30788' lon='38.22225' />
+ <node id='-51763' lat='47.2324' lon='38.23049' />
+ <node id='-51765' lat='47.30508' lon='38.33074' />
+ <node id='-51767' lat='47.2585' lon='38.32112' />
+ <node id='-51769' lat='47.39255' lon='38.28954' />
+ <node id='-51771' lat='47.53552' lon='38.28679' />
+ <node id='-51773' lat='41.80383' lon='56.96218' />
+ <node id='-51775' lat='41.41777' lon='57.03359' />
+ <node id='-51777' lat='41.36625' lon='57.13796' />
+ <node id='-51779' lat='42.18555' lon='57.84932' />
+ <node id='-51781' lat='41.92043' lon='57.03633' />
+ <node id='-51783' lat='42.16519' lon='57.6296' />
+ <node id='-51785' lat='42.14076' lon='57.30275' />
+ <node id='-51787' lat='42.29535' lon='58.40688' />
+ <node id='-51789' lat='42.30348' lon='58.51674' />
+ <node id='-51791' lat='42.56497' lon='58.29427' />
+ <node id='-51793' lat='42.43335' lon='58.3492' />
+ <node id='-51795' lat='42.50021' lon='57.99214' />
+ <node id='-51797' lat='42.62159' lon='58.14321' />
+ <node id='-51799' lat='42.69632' lon='58.27504' />
+ <node id='-51801' lat='42.64988' lon='58.57991' />
+ <node id='-51803' lat='42.79314' lon='58.6266' />
+ <node id='-51805' lat='42.5407' lon='58.93422' />
+ <node id='-51807' lat='42.52248' lon='59.17317' />
+ <node id='-51809' lat='42.29738' lon='59.4341' />
+ <node id='-51811' lat='42.4374' lon='57.90975' />
+ <node id='-51813' lat='42.24251' lon='57.8301' />
+ <node id='-51815' lat='42.24047' lon='57.92897' />
+ <node id='-51817' lat='42.28926' lon='59.84059' />
+ <node id='-51819' lat='42.212' lon='60.00539' />
+ <node id='-51821' lat='41.76287' lon='60.06032' />
+ <node id='-51823' lat='41.80997' lon='60.08504' />
+ <node id='-51825' lat='41.75058' lon='60.33223' />
+ <node id='-51827' lat='41.97966' lon='59.95046' />
+ <node id='-51829' lat='42.01028' lon='60.0356' />
+ <node id='-51831' lat='42.08982' lon='60.04659' />
+ <node id='-51833' lat='42.1428' lon='59.96419' />
+ <node id='-51835' lat='41.60082' lon='60.18117' />
+ <node id='-51837' lat='41.4363' lon='60.06581' />
+ <node id='-51839' lat='41.25691' lon='61.03261' />
+ <node id='-51841' lat='41.14946' lon='61.22212' />
+ <node id='-51843' lat='41.14946' lon='61.33199' />
+ <node id='-51845' lat='41.29407' lon='61.4446' />
+ <node id='-51847' lat='41.12257' lon='61.87856' />
+ <node id='-51849' lat='40.58242' lon='62.11751' />
+ <node id='-51851' lat='40.43206' lon='62.34273' />
+ <node id='-51853' lat='39.98528' lon='62.43337' />
+ <node id='-51855' lat='39.27666' lon='63.6913' />
+ <node id='-51857' lat='39.22349' lon='63.70778' />
+ <node id='-51859' lat='38.98691' lon='64.32576' />
+ <node id='-51861' lat='38.25733' lon='65.83913' />
+ <node id='-51863' lat='38.16238' lon='66.24013' />
+ <node id='-51865' lat='38.02403' lon='66.41042' />
+ <node id='-51867' lat='38.0435' lon='66.56697' />
+ <node id='-51869' lat='37.96776' lon='66.67684' />
+ <node id='-51871' lat='37.39827' lon='66.52303' />
+ <node id='-51873' lat='37.45497' lon='66.65761' />
+ <node id='-51875' lat='37.58568' lon='66.52852' />
+ <node id='-51877' lat='37.80084' lon='66.53676' />
+ <node id='-51879' lat='35.86208' lon='63.12276' />
+ <node id='-51881' lat='35.85985' lon='63.29579' />
+ <node id='-51883' lat='35.90881' lon='63.53475' />
+ <node id='-51885' lat='35.95106' lon='63.56496' />
+ <node id='-51887' lat='36.03773' lon='63.98519' />
+ <node id='-51889' lat='36.00218' lon='64.06209' />
+ <node id='-51891' lat='36.10433' lon='64.05385' />
+ <node id='-51893' lat='35.62801' lon='61.35671' />
+ <node id='-51895' lat='35.43803' lon='61.58742' />
+ <node id='-51897' lat='35.56101' lon='61.38967' />
+ <node id='-51899' lat='35.41341' lon='61.77693' />
+ <node id='-51901' lat='35.4604' lon='61.97743' />
+ <node id='-51903' lat='35.43803' lon='62.05709' />
+ <node id='-51905' lat='35.33278' lon='62.15871' />
+ <node id='-51907' lat='35.28571' lon='62.2878' />
+ <node id='-51909' lat='35.13312' lon='62.29878' />
+ <node id='-51911' lat='35.28796' lon='62.48006' />
+ <node id='-51913' lat='35.22067' lon='62.62288' />
+ <node id='-51915' lat='35.25432' lon='62.74098' />
+ <node id='-51917' lat='35.43131' lon='63.0898' />
+ <node id='-51919' lat='35.37086' lon='62.90853' />
+ <node id='-51921' lat='35.69049' lon='63.24636' />
+ <node id='-51923' lat='35.63024' lon='63.10079' />
+ <node id='-51925' lat='35.53196' lon='63.12276' />
+ <node id='-51927' lat='35.80641' lon='63.09529' />
+ <node id='-51929' lat='36.24401' lon='64.43288' />
+ <node id='-51931' lat='36.6351' lon='64.61141' />
+ <node id='-51933' lat='36.92767' lon='64.79268' />
+ <node id='-51935' lat='36.44311' lon='64.62514' />
+ <node id='-51937' lat='36.34362' lon='64.57295' />
+ <node id='-51939' lat='37.24756' lon='65.12776' />
+ <node id='-51941' lat='37.23881' lon='65.51778' />
+ <node id='-51943' lat='37.21913' lon='64.97945' />
+ <node id='-51945' lat='37.54649' lon='65.69631' />
+ <node id='-51947' lat='37.45061' lon='65.64137' />
+ <node id='-51949' lat='41.40335' lon='70.48909' />
+ <node id='-51951' lat='41.47953' lon='70.67586' />
+ <node id='-51953' lat='41.18254' lon='70.79396' />
+ <node id='-51955' lat='41.36419' lon='70.78572' />
+ <node id='-51957' lat='41.23833' lon='70.86263' />
+ <node id='-51959' lat='41.16393' lon='70.9615' />
+ <node id='-51961' lat='41.19494' lon='71.02193' />
+ <node id='-51963' lat='41.15359' lon='71.11806' />
+ <node id='-51965' lat='41.19494' lon='71.23891' />
+ <node id='-51967' lat='41.11015' lon='71.27187' />
+ <node id='-51969' lat='41.16807' lon='71.34877' />
+ <node id='-51971' lat='41.10601' lon='71.4037' />
+ <node id='-51973' lat='41.31883' lon='71.46688' />
+ <node id='-51975' lat='41.2982' lon='71.57399' />
+ <node id='-51977' lat='41.54945' lon='71.71956' />
+ <node id='-51979' lat='41.49599' lon='71.65914' />
+ <node id='-51981' lat='41.42189' lon='71.66463' />
+ <node id='-51983' lat='41.43012' lon='71.71132' />
+ <node id='-51985' lat='41.4466' lon='71.76625' />
+ <node id='-51987' lat='41.2982' lon='71.91457' />
+ <node id='-51989' lat='41.19081' lon='71.85964' />
+ <node id='-51991' lat='41.13084' lon='72.05739' />
+ <node id='-51993' lat='41.16186' lon='72.15627' />
+ <node id='-51995' lat='41.00245' lon='72.18923' />
+ <node id='-51997' lat='41.05425' lon='72.35127' />
+ <node id='-51999' lat='40.9755' lon='72.54354' />
+ <node id='-52001' lat='40.84889' lon='73.12032' />
+ <node id='-52003' lat='40.8094' lon='72.94454' />
+ <node id='-52005' lat='40.84681' lon='73.01869' />
+ <node id='-52007' lat='40.85512' lon='72.84291' />
+ <node id='-52009' lat='40.28765' lon='72.0519' />
+ <node id='-52011' lat='40.4007' lon='72.40346' />
+ <node id='-52013' lat='40.5219' lon='72.66713' />
+ <node id='-52015' lat='40.59076' lon='72.66713' />
+ <node id='-52017' lat='40.61787' lon='72.39797' />
+ <node id='-52019' lat='40.6137' lon='72.34853' />
+ <node id='-52021' lat='40.48222' lon='72.44191' />
+ <node id='-52023' lat='40.55947' lon='72.47487' />
+ <node id='-52025' lat='40.57616' lon='72.75502' />
+ <node id='-52027' lat='40.66997' lon='72.78249' />
+ <node id='-52029' lat='40.49893' lon='72.18648' />
+ <node id='-52031' lat='40.31907' lon='71.96401' />
+ <node id='-52033' lat='40.28765' lon='71.05901' />
+ <node id='-52035' lat='40.34106' lon='71.13042' />
+ <node id='-52037' lat='40.20904' lon='71.61382' />
+ <node id='-52039' lat='40.26775' lon='71.61931' />
+ <node id='-52041' lat='40.31593' lon='71.36663' />
+ <node id='-52043' lat='40.26984' lon='71.68386' />
+ <node id='-52045' lat='40.18492' lon='71.69621' />
+ <node id='-52047' lat='40.15238' lon='71.72231' />
+ <node id='-52049' lat='40.23735' lon='71.83492' />
+ <node id='-52051' lat='39.95582' lon='71.84316' />
+ <node id='-52053' lat='39.93581' lon='71.23067' />
+ <node id='-52055' lat='39.96634' lon='71.11394' />
+ <node id='-52057' lat='40.03052' lon='71.12218' />
+ <node id='-52059' lat='40.01369' lon='71.10295' />
+ <node id='-52061' lat='40.16813' lon='70.80495' />
+ <node id='-52063' lat='40.3442' lon='70.57149' />
+ <node id='-52065' lat='40.38605' lon='70.37511' />
+ <node id='-52067' lat='40.52503' lon='70.49871' />
+ <node id='-52069' lat='40.90555' lon='70.6721' />
+ <node id='-52071' lat='40.97661' lon='70.6158' />
+ <node id='-52073' lat='40.90296' lon='70.36655' />
+ <node id='-52075' lat='41.02014' lon='70.38028' />
+ <node id='-52077' lat='40.58562' lon='69.33933' />
+ <node id='-52079' lat='40.70233' lon='69.32834' />
+ <node id='-52081' lat='40.7918' lon='69.38327' />
+ <node id='-52083' lat='40.77621' lon='69.53021' />
+ <node id='-52085' lat='40.49274' lon='69.27066' />
+ <node id='-52087' lat='40.19129' lon='69.29813' />
+ <node id='-52089' lat='40.22904' lon='69.04544' />
+ <node id='-52091' lat='40.30554' lon='69.24869' />
+ <node id='-52093' lat='40.26782' lon='69.25006' />
+ <node id='-52095' lat='40.24791' lon='69.29263' />
+ <node id='-52097' lat='40.28459' lon='69.30911' />
+ <node id='-52099' lat='40.36102' lon='69.30774' />
+ <node id='-52101' lat='40.34532' lon='69.34756' />
+ <node id='-52103' lat='39.85265' lon='68.63071' />
+ <node id='-52105' lat='40.14826' lon='68.5332' />
+ <node id='-52107' lat='40.20492' lon='68.77902' />
+ <node id='-52109' lat='40.17555' lon='68.79276' />
+ <node id='-52111' lat='40.18604' lon='68.84357' />
+ <node id='-52113' lat='40.21226' lon='68.85455' />
+ <node id='-52115' lat='40.11676' lon='68.52771' />
+ <node id='-52117' lat='40.07789' lon='68.62796' />
+ <node id='-52119' lat='40.15771' lon='69.01523' />
+ <node id='-52121' lat='40.04952' lon='68.84906' />
+ <node id='-52123' lat='40.06949' lon='68.96579' />
+ <node id='-52125' lat='40.11466' lon='69.01935' />
+ <node id='-52127' lat='39.87163' lon='68.88889' />
+ <node id='-52129' lat='39.91167' lon='68.93695' />
+ <node id='-52131' lat='39.68905' lon='68.61972' />
+ <node id='-52133' lat='40.08525' lon='69.51785' />
+ <node id='-52135' lat='40.11886' lon='69.54395' />
+ <node id='-52137' lat='39.98431' lon='69.43134' />
+ <node id='-52139' lat='39.59281' lon='69.68677' />
+ <node id='-52141' lat='39.53141' lon='70.2869' />
+ <node id='-52143' lat='39.60128' lon='70.44757' />
+ <node id='-52145' lat='39.53882' lon='69.87491' />
+ <node id='-52147' lat='39.58223' lon='70.11111' />
+ <node id='-52149' lat='39.38933' lon='70.7854' />
+ <node id='-52151' lat='39.41586' lon='71.06418' />
+ <node id='-52153' lat='39.50704' lon='71.08752' />
+ <node id='-52155' lat='39.61397' lon='71.49814' />
+ <node id='-52157' lat='39.57588' lon='71.55856' />
+ <node id='-52159' lat='39.45722' lon='71.5517' />
+ <node id='-52161' lat='39.54306' lon='71.30862' />
+ <node id='-52163' lat='39.45828' lon='71.75357' />
+ <node id='-52165' lat='39.36704' lon='72.04059' />
+ <node id='-52167' lat='39.27674' lon='71.90601' />
+ <node id='-52169' lat='39.27355' lon='71.79202' />
+ <node id='-52171' lat='39.32031' lon='71.7522' />
+ <node id='-52173' lat='39.40631' lon='71.80164' />
+ <node id='-52175' lat='39.26823' lon='72.09689' />
+ <node id='-52177' lat='39.17248' lon='72.23834' />
+ <node id='-52179' lat='39.2661' lon='72.17242' />
+ <node id='-52181' lat='39.33093' lon='72.33173' />
+ <node id='-52183' lat='39.35536' lon='73.18454' />
+ <node id='-52185' lat='39.38615' lon='73.31912' />
+ <node id='-52187' lat='39.46677' lon='73.45096' />
+ <node id='-52189' lat='39.38402' lon='73.5004' />
+ <node id='-52191' lat='39.40843' lon='73.59241' />
+ <node id='-52193' lat='39.3543' lon='73.55396' />
+ <node id='-52195' lat='39.27567' lon='73.54572' />
+ <node id='-52197' lat='40.32857' lon='74.85996' />
+ <node id='-52199' lat='40.34637' lon='74.90939' />
+ <node id='-52201' lat='40.44886' lon='74.78168' />
+ <node id='-52203' lat='40.52197' lon='74.82013' />
+ <node id='-52205' lat='40.43945' lon='75.08243' />
+ <node id='-52207' lat='39.23739' lon='67.33226' />
+ <node id='-52209' lat='39.31287' lon='67.36522' />
+ <node id='-52211' lat='39.315' lon='67.45998' />
+ <node id='-52213' lat='39.52505' lon='67.39681' />
+ <node id='-52215' lat='39.46146' lon='67.46822' />
+ <node id='-52217' lat='39.53564' lon='67.46547' />
+ <node id='-52219' lat='39.57799' lon='67.44899' />
+ <node id='-52221' lat='39.60234' lon='67.62889' />
+ <node id='-52223' lat='39.66156' lon='67.70992' />
+ <node id='-52225' lat='39.56317' lon='68.12053' />
+ <node id='-52227' lat='39.14479' lon='67.67833' />
+ <node id='-52229' lat='38.85985' lon='68.19743' />
+ <node id='-52231' lat='38.47169' lon='68.11366' />
+ <node id='-52233' lat='38.56087' lon='68.05873' />
+ <node id='-52235' lat='38.64136' lon='68.0807' />
+ <node id='-52237' lat='38.71641' lon='68.05598' />
+ <node id='-52239' lat='38.73677' lon='68.12877' />
+ <node id='-52241' lat='37.91477' lon='68.27159' />
+ <node id='-52243' lat='38.19484' lon='68.40343' />
+ <node id='-52245' lat='38.40822' lon='68.13289' />
+ <node id='-52247' lat='37.43107' lon='67.81566' />
+ <node id='-52249' lat='37.1853' lon='67.2581' />
+ <node id='-52251' lat='37.2695' lon='67.49706' />
+ <node id='-52253' lat='37.32958' lon='66.64699' />
+ <node id='-52255' lat='37.40162' lon='66.95598' />
+ <node id='-52257' lat='37.24545' lon='67.2224' />
+ <node id='-52259' lat='37.27168' lon='67.13039' />
+ <node id='-52261' lat='37.35469' lon='67.08232' />
+ <node id='-52263' lat='40.03369' lon='71.21139' />
+ <node id='-52265' lat='39.96348' lon='71.71511' />
+ <node id='-52267' lat='39.86319' lon='70.74189' />
+ <node id='-52269' lat='40.95354' lon='76.75681' />
+ <node id='-52271' lat='41.0696' lon='76.99302' />
+ <node id='-52273' lat='41.0033' lon='77.28004' />
+ <node id='-52275' lat='41.04889' lon='77.81974' />
+ <node id='-52277' lat='41.14307' lon='77.81287' />
+ <node id='-52279' lat='41.23091' lon='78.12873' />
+ <node id='-52281' lat='41.38565' lon='78.15757' />
+ <node id='-52283' lat='41.0375' lon='77.3693' />
+ <node id='-52285' lat='41.01574' lon='77.76206' />
+ <node id='-52287' lat='41.00227' lon='77.52723' />
+ <node id='-52289' lat='40.4371' lon='76.27753' />
+ <node id='-52291' lat='40.3482' lon='76.33659' />
+ <node id='-52293' lat='40.46114' lon='76.5261' />
+ <node id='-52295' lat='40.78842' lon='76.69776' />
+ <node id='-52297' lat='40.7593' lon='76.6442' />
+ <node id='-52299' lat='40.55407' lon='76.55357' />
+ <node id='-52301' lat='40.63332' lon='76.65382' />
+ <node id='-52303' lat='40.66874' lon='75.5854' />
+ <node id='-52305' lat='40.45382' lon='75.22834' />
+ <node id='-52307' lat='40.50396' lon='75.65269' />
+ <node id='-52309' lat='40.47681' lon='75.7241' />
+ <node id='-52311' lat='40.3618' lon='75.65681' />
+ <node id='-52313' lat='40.28642' lon='75.69663' />
+ <node id='-52315' lat='40.2948' lon='75.91361' />
+ <node id='-52317' lat='40.38064' lon='75.96168' />
+ <node id='-52319' lat='40.36494' lon='76.15806' />
+ <node id='-52321' lat='40.32098' lon='75.81748' />
+ <node id='-52323' lat='31.61665' lon='68.79997' />
+ <node id='-52325' lat='31.83158' lon='68.57475' />
+ <node id='-52327' lat='31.75687' lon='68.6956' />
+ <node id='-52329' lat='31.52772' lon='67.58323' />
+ <node id='-52331' lat='31.52304' lon='67.72056' />
+ <node id='-52333' lat='31.63536' lon='67.86887' />
+ <node id='-52335' lat='31.6564' lon='68.00071' />
+ <node id='-52337' lat='31.82691' lon='68.1655' />
+ <node id='-52339' lat='31.80357' lon='68.25614' />
+ <node id='-52341' lat='31.75863' lon='68.27605' />
+ <node id='-52343' lat='31.76446' lon='68.44222' />
+ <node id='-52345' lat='31.71308' lon='68.56307' />
+ <node id='-52347' lat='31.75396' lon='68.58916' />
+ <node id='-52349' lat='31.07597' lon='66.68166' />
+ <node id='-52351' lat='31.20526' lon='66.72561' />
+ <node id='-52353' lat='31.40473' lon='67.62374' />
+ <node id='-52355' lat='31.4188' lon='67.7748' />
+ <node id='-52357' lat='31.33203' lon='67.78854' />
+ <node id='-52359' lat='31.19586' lon='67.29964' />
+ <node id='-52361' lat='31.24519' lon='67.03323' />
+ <node id='-52363' lat='31.31561' lon='67.04147' />
+ <node id='-52365' lat='31.26867' lon='66.83273' />
+ <node id='-52367' lat='37.21565' lon='74.80605' />
+ <node id='-52369' lat='37.28343' lon='74.74426' />
+ <node id='-52371' lat='37.14453' lon='74.45449' />
+ <node id='-52373' lat='37.23862' lon='74.66048' />
+ <node id='-52375' lat='37.24518' lon='74.49981' />
+ <node id='-52377' lat='36.04974' lon='75.95138' />
+ <node id='-52379' lat='36.01754' lon='76.00356' />
+ <node id='-52381' lat='36.02198' lon='76.09008' />
+ <node id='-52383' lat='35.82848' lon='76.14913' />
+ <node id='-52385' lat='35.9264' lon='76.15325' />
+ <node id='-52387' lat='35.89081' lon='76.51443' />
+ <node id='-52389' lat='35.93085' lon='76.55425' />
+ <node id='-52391' lat='35.90527' lon='76.58859' />
+ <node id='-52393' lat='35.81846' lon='76.56799' />
+ <node id='-52395' lat='35.84296' lon='76.33453' />
+ <node id='-52397' lat='36.56986' lon='75.92391' />
+ <node id='-52399' lat='36.41198' lon='76.0324' />
+ <node id='-52401' lat='36.17511' lon='76.00906' />
+ <node id='-52403' lat='36.34896' lon='75.98296' />
+ <node id='-52405' lat='36.23273' lon='76.00219' />
+ <node id='-52407' lat='36.22498' lon='76.06261' />
+ <node id='-52409' lat='36.93407' lon='74.89257' />
+ <node id='-52411' lat='37.05472' lon='74.83627' />
+ <node id='-52413' lat='37.08978' lon='74.67696' />
+ <node id='-52415' lat='37.01745' lon='74.747' />
+ <node id='-52417' lat='36.95382' lon='75.40481' />
+ <node id='-52419' lat='36.71971' lon='75.45562' />
+ <node id='-52421' lat='36.77803' lon='75.54214' />
+ <node id='-52423' lat='36.72412' lon='75.52291' />
+ <node id='-52425' lat='36.94504' lon='74.93102' />
+ <node id='-52427' lat='36.98345' lon='74.92004' />
+ <node id='-52429' lat='37.02622' lon='75.13839' />
+ <node id='-52431' lat='36.97028' lon='75.20431' />
+ <node id='-52433' lat='38.84782' lon='73.7033' />
+ <node id='-52435' lat='38.93867' lon='73.7445' />
+ <node id='-52437' lat='38.91517' lon='73.82964' />
+ <node id='-52439' lat='38.95469' lon='73.85162' />
+ <node id='-52441' lat='39.04007' lon='73.81728' />
+ <node id='-52443' lat='39.023' lon='73.75823' />
+ <node id='-52445' lat='38.61106' lon='73.79806' />
+ <node id='-52447' lat='38.52945' lon='73.97933' />
+ <node id='-52449' lat='38.53697' lon='74.0837' />
+ <node id='-52451' lat='38.57778' lon='74.0631' />
+ <node id='-52453' lat='38.65504' lon='74.17022' />
+ <node id='-52455' lat='38.47034' lon='74.51217' />
+ <node id='-52457' lat='38.42947' lon='74.69619' />
+ <node id='-52459' lat='38.28733' lon='74.70443' />
+ <node id='-52461' lat='38.03033' lon='74.9063' />
+ <node id='-52463' lat='37.83428' lon='74.92416' />
+ <node id='-52465' lat='38.19889' lon='74.80331' />
+ <node id='-52467' lat='38.22155' lon='74.69894' />
+ <node id='-52469' lat='38.07359' lon='74.82665' />
+ <node id='-52471' lat='37.31839' lon='75.12328' />
+ <node id='-52473' lat='37.28234' lon='74.92416' />
+ <node id='-52475' lat='37.52779' lon='75.06011' />
+ <node id='-52477' lat='37.41443' lon='75.15899' />
+ <node id='-52479' lat='37.37297' lon='75.09719' />
+ <node id='-52481' lat='37.49184' lon='75.03402' />
+ <node id='-52483' lat='37.67576' lon='74.8912' />
+ <node id='-52485' lat='37.60834' lon='74.93514' />
+ <node id='-52487' lat='37.55501' lon='74.94338' />
+ <node id='-52489' lat='37.3435' lon='74.8294' />
+ <node id='-52491' lat='37.3948' lon='74.68383' />
+ <node id='-52493' lat='37.37734' lon='74.56161' />
+ <node id='-52495' lat='37.41116' lon='74.23339' />
+ <node id='-52497' lat='37.3948' lon='74.41055' />
+ <node id='-52499' lat='37.4068' lon='74.55199' />
+ <node id='-52501' lat='37.4417' lon='73.77197' />
+ <node id='-52503' lat='37.33913' lon='73.76647' />
+ <node id='-52505' lat='37.27469' lon='73.61129' />
+ <node id='-52507' lat='37.23643' lon='73.64974' />
+ <node id='-52509' lat='37.22659' lon='73.82552' />
+ <node id='-52511' lat='37.22222' lon='72.79693' />
+ <node id='-52513' lat='37.31729' lon='73.06884' />
+ <node id='-52515' lat='36.99551' lon='72.35198' />
+ <node id='-52517' lat='36.74943' lon='71.57195' />
+ <node id='-52519' lat='36.67346' lon='71.67083' />
+ <node id='-52521' lat='37.48203' lon='71.52389' />
+ <node id='-52523' lat='37.52779' lon='71.49505' />
+ <node id='-52525' lat='37.89283' lon='71.32751' />
+ <node id='-52527' lat='37.95349' lon='71.51565' />
+ <node id='-52529' lat='37.92425' lon='71.58843' />
+ <node id='-52531' lat='37.79956' lon='71.59255' />
+ <node id='-52533' lat='38.48862' lon='70.98693' />
+ <node id='-52535' lat='38.45421' lon='70.76583' />
+ <node id='-52537' lat='38.44346' lon='70.84548' />
+ <node id='-52539' lat='38.47357' lon='70.87569' />
+ <node id='-52541' lat='38.4327' lon='70.92651' />
+ <node id='-52543' lat='38.40903' lon='71.0556' />
+ <node id='-52545' lat='38.42517' lon='71.09542' />
+ <node id='-52547' lat='38.12546' lon='70.4898' />
+ <node id='-52549' lat='37.84296' lon='70.1863' />
+ <node id='-52551' lat='37.81258' lon='70.27694' />
+ <node id='-52553' lat='37.66706' lon='70.28243' />
+ <node id='-52555' lat='37.16752' lon='69.39529' />
+ <node id='-52557' lat='37.23315' lon='69.45022' />
+ <node id='-52559' lat='37.40462' lon='69.36645' />
+ <node id='-52561' lat='37.5844' lon='69.51888' />
+ <node id='-52563' lat='37.5746' lon='69.80041' />
+ <node id='-52565' lat='37.5659' lon='69.95971' />
+ <node id='-52567' lat='37.60616' lon='69.84435' />
+ <node id='-52569' lat='37.61378' lon='69.93362' />
+ <node id='-52571' lat='37.19487' lon='68.5974' />
+ <node id='-52573' lat='37.25174' lon='69.03274' />
+ <node id='-52575' lat='37.27906' lon='68.6798' />
+ <node id='-52577' lat='37.32603' lon='68.96407' />
+ <node id='-52579' lat='37.23862' lon='68.81438' />
+ <node id='-52581' lat='37.32494' lon='68.80889' />
+ <node id='-52583' lat='37.26704' lon='68.91189' />
+ <node id='-52585' lat='37.33368' lon='68.88168' />
+ <node id='-52587' lat='37.02074' lon='68.18542' />
+ <node id='-52589' lat='37.13906' lon='68.41888' />
+ <node id='-52591' lat='37.10621' lon='68.29253' />
+ <node id='-52593' lat='37.00977' lon='68.27605' />
+ <node id='-52595' lat='37.10402' lon='68.41201' />
+ <node id='-52597' lat='37.08978' lon='67.7803' />
+ <node id='-52599' lat='37.0591' lon='67.87917' />
+ <node id='-52601' lat='31.93186' lon='69.3225' />
+ <node id='-52603' lat='32.14141' lon='69.27032' />
+ <node id='-52605' lat='31.64822' lon='68.95995' />
+ <node id='-52607' lat='31.62249' lon='69.00939' />
+ <node id='-52609' lat='31.85957' lon='69.20577' />
+ <node id='-52611' lat='31.70782' lon='69.11514' />
+ <node id='-52613' lat='32.8768' lon='69.5436' />
+ <node id='-52615' lat='32.45946' lon='69.23599' />
+ <node id='-52617' lat='32.53938' lon='69.2868' />
+ <node id='-52619' lat='32.7302' lon='69.43649' />
+ <node id='-52621' lat='32.56601' lon='69.38155' />
+ <node id='-52623' lat='32.6678' lon='69.44747' />
+ <node id='-52625' lat='32.76601' lon='69.38018' />
+ <node id='-52627' lat='32.85834' lon='69.47082' />
+ <node id='-52629' lat='33.01509' lon='69.49004' />
+ <node id='-52631' lat='33.09911' lon='69.57656' />
+ <node id='-52633' lat='33.22557' lon='70.07369' />
+ <node id='-52635' lat='33.14282' lon='70.02563' />
+ <node id='-52637' lat='33.13247' lon='69.79766' />
+ <node id='-52639' lat='33.09451' lon='69.85259' />
+ <node id='-52641' lat='33.09911' lon='69.71526' />
+ <node id='-52643' lat='33.34496' lon='70.32775' />
+ <node id='-52645' lat='33.21064' lon='70.13686' />
+ <node id='-52647' lat='33.64387' lon='70.20141' />
+ <node id='-52649' lat='34.04194' lon='69.90203' />
+ <node id='-52651' lat='33.9463' lon='70.54336' />
+ <node id='-52653' lat='33.97933' lon='70.88119' />
+ <node id='-52655' lat='34.06242' lon='71.07345' />
+ <node id='-52657' lat='34.10564' lon='71.06933' />
+ <node id='-52659' lat='34.16589' lon='71.12426' />
+ <node id='-52661' lat='33.6553' lon='70.14785' />
+ <node id='-52663' lat='33.71701' lon='70.14236' />
+ <node id='-52665' lat='33.73528' lon='70.00503' />
+ <node id='-52667' lat='33.93719' lon='69.85671' />
+ <node id='-52669' lat='34.80882' lon='71.28356' />
+ <node id='-52671' lat='34.69034' lon='71.08718' />
+ <node id='-52673' lat='34.63047' lon='71.11602' />
+ <node id='-52675' lat='34.54568' lon='71.0089' />
+ <node id='-52677' lat='34.44835' lon='71.02401' />
+ <node id='-52679' lat='34.42796' lon='71.0556' />
+ <node id='-52681' lat='34.37697' lon='71.11877' />
+ <node id='-52683' lat='34.43249' lon='71.11465' />
+ <node id='-52685' lat='35.21262' lon='71.67495' />
+ <node id='-52687' lat='35.4479' lon='71.65435' />
+ <node id='-52689' lat='35.28776' lon='71.5541' />
+ <node id='-52691' lat='34.97328' lon='71.50329' />
+ <node id='-52693' lat='35.09023' lon='71.52938' />
+ <node id='-52695' lat='35.02615' lon='71.55273' />
+ <node id='-52697' lat='35.00478' lon='71.49917' />
+ <node id='-52699' lat='35.31129' lon='71.54586' />
+ <node id='-52701' lat='35.95865' lon='71.37969' />
+ <node id='-52703' lat='35.6267' lon='71.49917' />
+ <node id='-52705' lat='35.56863' lon='71.62276' />
+ <node id='-52707' lat='35.71483' lon='71.55273' />
+ <node id='-52709' lat='36.48268' lon='71.64886' />
+ <node id='-52711' lat='36.39872' lon='71.80404' />
+ <node id='-52713' lat='36.49924' lon='71.80267' />
+ <node id='-52715' lat='36.39429' lon='71.60491' />
+ <node id='-52717' lat='37.00977' lon='74.43389' />
+ <node id='-52719' lat='37.01745' lon='74.52041' />
+ <node id='-52721' lat='28.12356' lon='88.63235' />
+ <node id='-52723' lat='28.01936' lon='88.83559' />
+ <node id='-52725' lat='27.9478' lon='88.25332' />
+ <node id='-52727' lat='27.45415' lon='88.77517' />
+ <node id='-52729' lat='27.85192' lon='88.88091' />
+ <node id='-52731' lat='28.06057' lon='88.54858' />
+ <node id='-52733' lat='22.05965' lon='99.96612' />
+ <node id='-52735' lat='21.69773' lon='99.99221' />
+ <node id='-52737' lat='21.82782' lon='99.94003' />
+ <node id='-52739' lat='21.97053' lon='99.99084' />
+ <node id='-52741' lat='21.70539' lon='100.12679' />
+ <node id='-52743' lat='21.65306' lon='100.17486' />
+ <node id='-52745' lat='21.59945' lon='100.10757' />
+ <node id='-52747' lat='21.50365' lon='100.12542' />
+ <node id='-52749' lat='21.45637' lon='100.57861' />
+ <node id='-52751' lat='21.51898' lon='100.72143' />
+ <node id='-52753' lat='21.54325' lon='100.42892' />
+ <node id='-52755' lat='21.46148' lon='100.4811' />
+ <node id='-52757' lat='21.53176' lon='100.35201' />
+ <node id='-52759' lat='21.47043' lon='100.25863' />
+ <node id='-52761' lat='21.48704' lon='100.1625' />
+ <node id='-52763' lat='21.51898' lon='100.18447' />
+ <node id='-52765' lat='22.09656' lon='99.33166' />
+ <node id='-52767' lat='22.13345' lon='99.47585' />
+ <node id='-52769' lat='22.04183' lon='99.85351' />
+ <node id='-52771' lat='22.73893' lon='99.31243' />
+ <node id='-52773' lat='22.50188' lon='99.37972' />
+ <node id='-52775' lat='22.4105' lon='99.28771' />
+ <node id='-52777' lat='22.57544' lon='99.38247' />
+ <node id='-52779' lat='23.16382' lon='99.05975' />
+ <node id='-52781' lat='23.13099' lon='99.34127' />
+ <node id='-52783' lat='23.12215' lon='99.04601' />
+ <node id='-52785' lat='23.08678' lon='99.25201' />
+ <node id='-52787' lat='23.80492' lon='98.68209' />
+ <node id='-52789' lat='23.77476' lon='98.80294' />
+ <node id='-52791' lat='23.5345' lon='98.80294' />
+ <node id='-52793' lat='23.48665' lon='98.87984' />
+ <node id='-52795' lat='23.60499' lon='98.8771' />
+ <node id='-52797' lat='23.47783' lon='98.81942' />
+ <node id='-52799' lat='23.33038' lon='98.87573' />
+ <node id='-52801' lat='23.36946' lon='98.92104' />
+ <node id='-52803' lat='23.32029' lon='98.94027' />
+ <node id='-52805' lat='23.9644' lon='98.67797' />
+ <node id='-52807' lat='24.10612' lon='98.89632' />
+ <node id='-52809' lat='24.13119' lon='98.54476' />
+ <node id='-52811' lat='24.08857' lon='98.59145' />
+ <node id='-52813' lat='23.9644' lon='97.81142' />
+ <node id='-52815' lat='24.44163' lon='97.52715' />
+ <node id='-52817' lat='24.45288' lon='97.66998' />
+ <node id='-52819' lat='24.30027' lon='97.66723' />
+ <node id='-52821' lat='24.26772' lon='97.76336' />
+ <node id='-52823' lat='24.20762' lon='97.71667' />
+ <node id='-52825' lat='24.29652' lon='97.71941' />
+ <node id='-52827' lat='24.35658' lon='97.7098' />
+ <node id='-52829' lat='24.33781' lon='97.65624' />
+ <node id='-52831' lat='24.54535' lon='97.56286' />
+ <node id='-52833' lat='24.84355' lon='97.69469' />
+ <node id='-52835' lat='24.82735' lon='97.77297' />
+ <node id='-52837' lat='24.85601' lon='97.79632' />
+ <node id='-52839' lat='24.91332' lon='97.72903' />
+ <node id='-52841' lat='25.08508' lon='97.72216' />
+ <node id='-52843' lat='25.2715' lon='97.83614' />
+ <node id='-52845' lat='25.11492' lon='97.77023' />
+ <node id='-52847' lat='25.20815' lon='97.92541' />
+ <node id='-52849' lat='25.41547' lon='98.14925' />
+ <node id='-52851' lat='25.50722' lon='98.12591' />
+ <node id='-52853' lat='25.56298' lon='98.18084' />
+ <node id='-52855' lat='25.62739' lon='98.16848' />
+ <node id='-52857' lat='25.55307' lon='98.31268' />
+ <node id='-52859' lat='25.61129' lon='98.40606' />
+ <node id='-52861' lat='25.6051' lon='98.25774' />
+ <node id='-52863' lat='25.85129' lon='98.54064' />
+ <node id='-52865' lat='25.79937' lon='98.63128' />
+ <node id='-52867' lat='25.86241' lon='98.70818' />
+ <node id='-52869' lat='26.11547' lon='98.57085' />
+ <node id='-52871' lat='26.15492' lon='98.63128' />
+ <node id='-52873' lat='26.17218' lon='98.7329' />
+ <node id='-52875' lat='26.24487' lon='98.67797' />
+ <node id='-52877' lat='26.36183' lon='98.72741' />
+ <node id='-52879' lat='26.61994' lon='98.77547' />
+ <node id='-52881' lat='27.9478' lon='98.13964' />
+ <node id='-52883' lat='27.51385' lon='98.32641' />
+ <node id='-52885' lat='27.55404' lon='98.42529' />
+ <node id='-52887' lat='27.67086' lon='98.43353' />
+ <node id='-52889' lat='27.56499' lon='98.69582' />
+ <node id='-52891' lat='28.55628' lon='97.56835' />
+ <node id='-52893' lat='28.29783' lon='97.41729' />
+ <node id='-52895' lat='28.2688' lon='97.47085' />
+ <node id='-52897' lat='28.49716' lon='97.50518' />
+ <node id='-52899' lat='28.33168' lon='97.79632' />
+ <node id='-52901' lat='28.5056' lon='97.70705' />
+ <node id='-52903' lat='28.3776' lon='97.90069' />
+ <node id='-52905' lat='28.12114' lon='98.15337' />
+ <node id='-52907' lat='22.45873' lon='93.13537' />
+ <node id='-52909' lat='22.16017' lon='92.70416' />
+ <node id='-52911' lat='22.03547' lon='92.67532' />
+ <node id='-52913' lat='22.05456' lon='92.86208' />
+ <node id='-52915' lat='21.95143' lon='92.89504' />
+ <node id='-52917' lat='22.02656' lon='92.93899' />
+ <node id='-52919' lat='21.98964' lon='92.99804' />
+ <node id='-52921' lat='22.05965' lon='92.99255' />
+ <node id='-52923' lat='22.20595' lon='93.04885' />
+ <node id='-52925' lat='22.18687' lon='93.15734' />
+ <node id='-52927' lat='22.24535' lon='93.14224' />
+ <node id='-52929' lat='22.25425' lon='93.19991' />
+ <node id='-52931' lat='22.43716' lon='93.18206' />
+ <node id='-52933' lat='23.05772' lon='93.12988' />
+ <node id='-52935' lat='22.69459' lon='93.09417' />
+ <node id='-52937' lat='22.92498' lon='93.134' />
+ <node id='-52939' lat='23.00464' lon='93.2878' />
+ <node id='-52941' lat='22.54374' lon='93.11477' />
+ <node id='-52943' lat='22.59573' lon='93.134' />
+ <node id='-52945' lat='23.14109' lon='93.37569' />
+ <node id='-52947' lat='23.92925' lon='93.3908' />
+ <node id='-52949' lat='23.93176' lon='93.36059' />
+ <node id='-52951' lat='24.04468' lon='93.32351' />
+ <node id='-52953' lat='23.68299' lon='93.43475' />
+ <node id='-52955' lat='23.7622' lon='93.3908' />
+ <node id='-52957' lat='23.4728' lon='93.38805' />
+ <node id='-52959' lat='24.07854' lon='93.41415' />
+ <node id='-52961' lat='23.97067' lon='93.46633' />
+ <node id='-52963' lat='23.94432' lon='93.50616' />
+ <node id='-52965' lat='23.92549' lon='93.80279' />
+ <node id='-52967' lat='23.95812' lon='93.92089' />
+ <node id='-52969' lat='23.88531' lon='94.08981' />
+ <node id='-52971' lat='24.23392' lon='94.29443' />
+ <node id='-52973' lat='25.20318' lon='94.57458' />
+ <node id='-52975' lat='25.13606' lon='94.74212' />
+ <node id='-52977' lat='24.59281' lon='94.50729' />
+ <node id='-52979' lat='24.70764' lon='94.5526' />
+ <node id='-52981' lat='24.70889' lon='94.60204' />
+ <node id='-52983' lat='25.00545' lon='94.73937' />
+ <node id='-52985' lat='24.86349' lon='94.6556' />
+ <node id='-52987' lat='25.47003' lon='94.68032' />
+ <node id='-52989' lat='25.49359' lon='94.80117' />
+ <node id='-52991' lat='25.74248' lon='95.04287' />
+ <node id='-52993' lat='25.7264' lon='94.99343' />
+ <node id='-52995' lat='25.96494' lon='95.09643' />
+ <node id='-52997' lat='26.1019' lon='95.11428' />
+ <node id='-52999' lat='26.38397' lon='95.12801' />
+ <node id='-53001' lat='26.45408' lon='95.05798' />
+ <node id='-53003' lat='26.68499' lon='95.23513' />
+ <node id='-53005' lat='26.7083' lon='95.437' />
+ <node id='-53007' lat='27.01335' lon='95.81603' />
+ <node id='-53009' lat='27.24679' lon='96.14562' />
+ <node id='-53011' lat='27.04149' lon='95.93002' />
+ <node id='-53013' lat='27.19428' lon='96.04949' />
+ <node id='-53015' lat='27.09041' lon='97.14675' />
+ <node id='-53017' lat='27.17474' lon='96.89132' />
+ <node id='-53019' lat='27.29928' lon='96.55761' />
+ <node id='-53021' lat='27.36638' lon='96.73888' />
+ <node id='-53023' lat='27.2065' lon='96.85287' />
+ <node id='-53025' lat='27.25046' lon='96.88445' />
+ <node id='-53027' lat='27.14052' lon='97.17422' />
+ <node id='-53029' lat='27.92233' lon='97.29919' />
+ <node id='-53031' lat='28.06784' lon='97.31292' />
+ <node id='-53033' lat='27.87256' lon='97.35824' />
+ <node id='-53035' lat='28.06663' lon='97.35412' />
+ <node id='-53037' lat='28.01329' lon='97.38845' />
+ <node id='-53039' lat='28.42955' lon='96.48895' />
+ <node id='-53041' lat='28.51526' lon='96.40929' />
+ <node id='-53043' lat='28.72742' lon='96.61391' />
+ <node id='-53045' lat='28.4875' lon='96.47384' />
+ <node id='-53047' lat='28.58281' lon='96.53701' />
+ <node id='-53049' lat='28.3619' lon='97.1289' />
+ <node id='-53051' lat='28.32564' lon='96.98882' />
+ <node id='-53053' lat='28.61657' lon='96.6455' />
+ <node id='-53055' lat='28.4875' lon='96.85561' />
+ <node id='-53057' lat='28.39452' lon='96.88445' />
+ <node id='-53059' lat='29.32063' lon='95.75149' />
+ <node id='-53061' lat='29.02325' lon='96.20467' />
+ <node id='-53063' lat='29.10607' lon='96.3626' />
+ <node id='-53065' lat='29.09767' lon='96.26235' />
+ <node id='-53067' lat='29.04486' lon='96.36123' />
+ <node id='-53069' lat='29.11087' lon='96.18682' />
+ <node id='-53071' lat='29.18643' lon='96.31316' />
+ <node id='-53073' lat='29.38167' lon='96.05361' />
+ <node id='-53075' lat='29.35534' lon='95.82839' />
+ <node id='-53077' lat='29.31464' lon='95.84899' />
+ <node id='-53079' lat='29.17804' lon='94.81353' />
+ <node id='-53081' lat='29.07727' lon='95.26122' />
+ <node id='-53083' lat='29.14446' lon='95.0978' />
+ <node id='-53085' lat='29.13847' lon='95.3038' />
+ <node id='-53087' lat='29.13487' lon='95.50842' />
+ <node id='-53089' lat='29.19243' lon='95.50155' />
+ <node id='-53091' lat='29.13007' lon='95.41091' />
+ <node id='-53093' lat='29.19123' lon='95.43288' />
+ <node id='-53095' lat='29.13727' lon='95.46172' />
+ <node id='-53097' lat='29.19003' lon='95.59768' />
+ <node id='-53099' lat='29.23558' lon='95.59768' />
+ <node id='-53101' lat='29.09527' lon='95.11291' />
+ <node id='-53103' lat='29.10727' lon='95.2214' />
+ <node id='-53105' lat='29.11687' lon='94.2752' />
+ <node id='-53107' lat='29.01965' lon='94.35897' />
+ <node id='-53109' lat='28.50319' lon='93.18069' />
+ <node id='-53111' lat='28.37035' lon='93.14635' />
+ <node id='-53113' lat='28.25671' lon='92.93075' />
+ <node id='-53115' lat='28.2071' lon='92.92663' />
+ <node id='-53117' lat='27.76325' lon='91.84722' />
+ <node id='-53119' lat='27.7195' lon='91.87057' />
+ <node id='-53121' lat='28.07632' lon='92.65472' />
+ <node id='-53123' lat='28.05814' lon='92.73025' />
+ <node id='-53125' lat='27.98662' lon='92.7275' />
+ <node id='-53127' lat='27.79363' lon='92.32101' />
+ <node id='-53129' lat='27.89077' lon='92.27432' />
+ <node id='-53131' lat='27.83614' lon='92.42263' />
+ <node id='-53133' lat='27.80092' lon='92.42538' />
+ <node id='-53135' lat='35.67356' lon='76.84539' />
+ <node id='-53137' lat='35.5932' lon='76.96624' />
+ <node id='-53139' lat='35.46132' lon='77.44277' />
+ <node id='-53141' lat='35.52505' lon='77.19283' />
+ <node id='-53143' lat='35.54517' lon='77.29995' />
+ <node id='-53145' lat='35.60102' lon='77.04314' />
+ <node id='-53147' lat='35.48704' lon='77.49496' />
+ <node id='-53149' lat='35.46244' lon='77.70232' />
+ <node id='-53151' lat='35.47698' lon='77.91518' />
+ <node id='-53153' lat='35.52058' lon='77.80532' />
+ <node id='-53155' lat='35.23954' lon='78.00033' />
+ <node id='-53157' lat='35.3785' lon='78.03466' />
+ <node id='-53159' lat='35.10146' lon='78.1253' />
+ <node id='-53161' lat='34.88771' lon='78.22692' />
+ <node id='-53163' lat='34.71857' lon='78.20632' />
+ <node id='-53165' lat='34.8201' lon='78.22555' />
+ <node id='-53167' lat='34.7998' lon='78.18435' />
+ <node id='-53169' lat='34.70502' lon='78.27087' />
+ <node id='-53171' lat='34.08858' lon='78.66225' />
+ <node id='-53173' lat='34.15452' lon='78.91769' />
+ <node id='-53175' lat='34.30894' lon='78.97811' />
+ <node id='-53177' lat='34.29532' lon='79.05502' />
+ <node id='-53179' lat='34.32482' lon='79.05364' />
+ <node id='-53181' lat='34.45174' lon='78.74465' />
+ <node id='-53183' lat='34.48684' lon='78.75976' />
+ <node id='-53185' lat='34.54229' lon='78.64715' />
+ <node id='-53187' lat='34.57283' lon='78.54964' />
+ <node id='-53189' lat='34.50835' lon='78.56475' />
+ <node id='-53191' lat='34.583' lon='78.48785' />
+ <node id='-53193' lat='34.54229' lon='78.43978' />
+ <node id='-53195' lat='34.59431' lon='78.4233' />
+ <node id='-53197' lat='34.01121' lon='78.73367' />
+ <node id='-53199' lat='33.62901' lon='78.75838' />
+ <node id='-53201' lat='33.62215' lon='78.7062' />
+ <node id='-53203' lat='33.66445' lon='78.67599' />
+ <node id='-53205' lat='33.73871' lon='78.77349' />
+ <node id='-53207' lat='33.17156' lon='79.15252' />
+ <node id='-53209' lat='33.02545' lon='79.14016' />
+ <node id='-53211' lat='32.95289' lon='79.23217' />
+ <node id='-53213' lat='32.79718' lon='79.2253' />
+ <node id='-53215' lat='32.61345' lon='79.29809' />
+ <node id='-53217' lat='32.68745' lon='79.2665' />
+ <node id='-53219' lat='32.78564' lon='79.26788' />
+ <node id='-53221' lat='32.7198' lon='79.29122' />
+ <node id='-53223' lat='32.33655' lon='78.96713' />
+ <node id='-53225' lat='32.37948' lon='78.99322' />
+ <node id='-53227' lat='32.53938' lon='78.38897' />
+ <node id='-53229' lat='32.69438' lon='78.73916' />
+ <node id='-53231' lat='32.2762' lon='78.49609' />
+ <node id='-53233' lat='32.45367' lon='78.4645' />
+ <node id='-53235' lat='32.46873' lon='78.7831' />
+ <node id='-53237' lat='31.78723' lon='78.69933' />
+ <node id='-53239' lat='31.99478' lon='78.78036' />
+ <node id='-53241' lat='31.50197' lon='78.71032' />
+ <node id='-53243' lat='31.44223' lon='78.79409' />
+ <node id='-53245' lat='31.37191' lon='78.74465' />
+ <node id='-53247' lat='31.31209' lon='78.77898' />
+ <node id='-53249' lat='31.2898' lon='78.8861' />
+ <node id='-53251' lat='31.45863' lon='79.07562' />
+ <node id='-53253' lat='31.36487' lon='78.94241' />
+ <node id='-53255' lat='31.42817' lon='79.01931' />
+ <node id='-53257' lat='31.34494' lon='79.0097' />
+ <node id='-53259' lat='31.10772' lon='79.41344' />
+ <node id='-53261' lat='31.43403' lon='79.14016' />
+ <node id='-53263' lat='31.26397' lon='79.23217' />
+ <node id='-53265' lat='31.14181' lon='79.31319' />
+ <node id='-53267' lat='31.23462' lon='79.29397' />
+ <node id='-53269' lat='31.36839' lon='79.16763' />
+ <node id='-53271' lat='31.34963' lon='79.22805' />
+ <node id='-53273' lat='31.02891' lon='79.42718' />
+ <node id='-53275' lat='31.03597' lon='79.50683' />
+ <node id='-53277' lat='30.96063' lon='79.5494' />
+ <node id='-53279' lat='30.93943' lon='79.59884' />
+ <node id='-53281' lat='30.99948' lon='79.75265' />
+ <node id='-53283' lat='30.96652' lon='79.87762' />
+ <node id='-53285' lat='30.88288' lon='79.93255' />
+ <node id='-53287' lat='30.78146' lon='80.11382' />
+ <node id='-53289' lat='30.81449' lon='80.16738' />
+ <node id='-53291' lat='30.72836' lon='80.24429' />
+ <node id='-53293' lat='30.24908' lon='81.02294' />
+ <node id='-53295' lat='30.47067' lon='80.59859' />
+ <node id='-53297' lat='30.32023' lon='80.83343' />
+ <node id='-53299' lat='30.44936' lon='80.54504' />
+ <node id='-53301' lat='30.58541' lon='80.20721' />
+ <node id='-53303' lat='30.63387' lon='80.21682' />
+ <node id='-53305' lat='30.66813' lon='80.19485' />
+ <node id='-53307' lat='24.31904' lon='68.7416' />
+ <node id='-53309' lat='24.34032' lon='68.81164' />
+ <node id='-53311' lat='24.23642' lon='68.85833' />
+ <node id='-53313' lat='24.33156' lon='68.90914' />
+ <node id='-53315' lat='24.26021' lon='68.97781' />
+ <node id='-53317' lat='24.29777' lon='69.07806' />
+ <node id='-53319' lat='24.25646' lon='69.19341' />
+ <node id='-53321' lat='24.30027' lon='69.30053' />
+ <node id='-53323' lat='24.29777' lon='69.59579' />
+ <node id='-53325' lat='24.43787' lon='70.5667' />
+ <node id='-53327' lat='24.27774' lon='70.57906' />
+ <node id='-53329' lat='24.27398' lon='70.88393' />
+ <node id='-53331' lat='24.23517' lon='70.71502' />
+ <node id='-53333' lat='24.30903' lon='70.85784' />
+ <node id='-53335' lat='24.3791' lon='70.94985' />
+ <node id='-53337' lat='24.34657' lon='71.04461' />
+ <node id='-53339' lat='24.69017' lon='71.09405' />
+ <node id='-53341' lat='24.60904' lon='70.97594' />
+ <node id='-53343' lat='24.46038' lon='71.00341' />
+ <node id='-53345' lat='24.42662' lon='71.12838' />
+ <node id='-53347' lat='25.27398' lon='70.7521' />
+ <node id='-53349' lat='25.32985' lon='70.73837' />
+ <node id='-53351' lat='25.39314' lon='70.66695' />
+ <node id='-53353' lat='25.68186' lon='70.67382' />
+ <node id='-53355' lat='25.71156' lon='70.2687' />
+ <node id='-53357' lat='25.67443' lon='70.37444' />
+ <node id='-53359' lat='25.68928' lon='70.53649' />
+ <node id='-53361' lat='25.71898' lon='70.60378' />
+ <node id='-53363' lat='25.71527' lon='70.65322' />
+ <node id='-53365' lat='26.08094' lon='70.08193' />
+ <node id='-53367' lat='26.56836' lon='69.88555' />
+ <node id='-53369' lat='26.60398' lon='70.05584' />
+ <node id='-53371' lat='26.24118' lon='70.17532' />
+ <node id='-53373' lat='26.29659' lon='70.16296' />
+ <node id='-53375' lat='26.55362' lon='70.17532' />
+ <node id='-53377' lat='28.01208' lon='70.37307' />
+ <node id='-53379' lat='28.03754' lon='70.53375' />
+ <node id='-53381' lat='27.92718' lon='70.6697' />
+ <node id='-53383' lat='27.87863' lon='71.66396' />
+ <node id='-53385' lat='27.70369' lon='70.88668' />
+ <node id='-53387' lat='27.86164' lon='71.28219' />
+ <node id='-53389' lat='30.28466' lon='73.95736' />
+ <node id='-53391' lat='31.13829' lon='74.51629' />
+ <node id='-53393' lat='31.12771' lon='74.6852' />
+ <node id='-53395' lat='31.05479' lon='74.67971' />
+ <node id='-53397' lat='31.08303' lon='74.56023' />
+ <node id='-53399' lat='31.13711' lon='74.60006' />
+ <node id='-53401' lat='31.10419' lon='74.60281' />
+ <node id='-53403' lat='31.50197' lon='74.59319' />
+ <node id='-53405' lat='31.55698' lon='74.61517' />
+ <node id='-53407' lat='31.75687' lon='74.54238' />
+ <node id='-53409' lat='31.87824' lon='74.58907' />
+ <node id='-53411' lat='32.10187' lon='75.25649' />
+ <node id='-53413' lat='31.95983' lon='74.79919' />
+ <node id='-53415' lat='32.04485' lon='74.86236' />
+ <node id='-53417' lat='32.0658' lon='74.9269' />
+ <node id='-53419' lat='32.03786' lon='75.00793' />
+ <node id='-53421' lat='32.45367' lon='74.97634' />
+ <node id='-53423' lat='32.49538' lon='75.03265' />
+ <node id='-53425' lat='32.36556' lon='75.28259' />
+ <node id='-53427' lat='32.49075' lon='74.84725' />
+ <node id='-53429' lat='32.92061' lon='74.31579' />
+ <node id='-53431' lat='32.84219' lon='74.7113' />
+ <node id='-53433' lat='32.90563' lon='74.41467' />
+ <node id='-53435' lat='32.77755' lon='74.45312' />
+ <node id='-53437' lat='32.75561' lon='74.6289' />
+ <node id='-53439' lat='32.82604' lon='74.64675' />
+ <node id='-53441' lat='33.02891' lon='74.31854' />
+ <node id='-53443' lat='32.97823' lon='74.34875' />
+ <node id='-53445' lat='33.07495' lon='74.17571' />
+ <node id='-53447' lat='33.13477' lon='74.15374' />
+ <node id='-53449' lat='33.25199' lon='74.01366' />
+ <node id='-53451' lat='33.26232' lon='74.08782' />
+ <node id='-53453' lat='33.3679' lon='74.17983' />
+ <node id='-53455' lat='33.4745' lon='74.18121' />
+ <node id='-53457' lat='33.73071' lon='73.96423' />
+ <node id='-53459' lat='34.01235' lon='73.91341' />
+ <node id='-53461' lat='34.03853' lon='74.21554' />
+ <node id='-53463' lat='33.82089' lon='74.05898' />
+ <node id='-53465' lat='33.83002' lon='74.14001' />
+ <node id='-53467' lat='33.8688' lon='74.21691' />
+ <node id='-53469' lat='33.92237' lon='74.26086' />
+ <node id='-53471' lat='34.01577' lon='74.25262' />
+ <node id='-53473' lat='34.05105' lon='73.88732' />
+ <node id='-53475' lat='34.2522' lon='73.98208' />
+ <node id='-53477' lat='34.35317' lon='73.90517' />
+ <node id='-53479' lat='34.34183' lon='73.74862' />
+ <node id='-53481' lat='34.32935' lon='73.8475' />
+ <node id='-53483' lat='34.3781' lon='73.74999' />
+ <node id='-53485' lat='34.48911' lon='73.88732' />
+ <node id='-53487' lat='34.68244' lon='73.96423' />
+ <node id='-53489' lat='34.54568' lon='73.89419' />
+ <node id='-53491' lat='34.63386' lon='73.93401' />
+ <node id='-53493' lat='34.57169' lon='73.93951' />
+ <node id='-53495' lat='34.77386' lon='74.58083' />
+ <node id='-53497' lat='34.64629' lon='75.01479' />
+ <node id='-53499' lat='34.55021' lon='75.38009' />
+ <node id='-53501' lat='34.66437' lon='75.14526' />
+ <node id='-53503' lat='34.76371' lon='76.67648' />
+ <node id='-53505' lat='34.84039' lon='76.74377' />
+ <node id='-53507' lat='34.92488' lon='76.74514' />
+ <node id='-53509' lat='34.6429' lon='76.15463' />
+ <node id='-53511' lat='34.78965' lon='76.47186' />
+ <node id='-53513' lat='34.67566' lon='76.04614' />
+ <node id='-53515' lat='35.03965' lon='77.01431' />
+ <node id='-53517' lat='35.52617' lon='76.75475' />
+ <node id='-53519' lat='35.39754' lon='76.85088' />
+ <node id='-53521' lat='35.39866' lon='76.93465' />
+ <node id='-53523' lat='35.30793' lon='77.00332' />
+ <node id='-53525' lat='35.16548' lon='77.07198' />
+ <node id='-53527' lat='35.18793' lon='77.00607' />
+ <node id='-53529' lat='35.25524' lon='76.97997' />
+ <node id='-53531' lat='49.94612' lon='-2.39388' />
+ <node id='-53533' lat='54.44148' lon='-4.86305' />
+ <node id='-53535' lat='54.57861' lon='-4.1819' />
+ <node id='-53537' lat='54.12723' lon='-3.64906' />
+ <node id='-53539' lat='60.61414' lon='19.23413' />
+ <node id='-53541' lat='60.71528' lon='20.96741' />
+ <node id='-53543' lat='60.54555' lon='21.15143' />
+ <node id='-53545' lat='60.12142' lon='21.02509' />
+ <node id='-53547' lat='59.67511' lon='21.35468' />
+ <node id='-53549' lat='18.07976' lon='-63.95092' />
+ <node id='-53551' lat='18.93262' lon='-63.90607' />
+ <node id='-53553' lat='-60.0' lon='180.0' />
+ <node id='-53555' lat='-85.0' lon='180.0' />
+ <node id='-53557' lat='-85.0' lon='-180.0' />
+ <node id='-53559' lat='-60.0' lon='-180.0' />
+ <node id='-53561' lat='12.75292' lon='-69.5195' />
+ <node id='-53563' lat='11.78151' lon='-68.33524' />
+ <node id='-53565' lat='12.62309' lon='-68.90012' />
+ <node id='-53567' lat='-10.176' lon='105.30283' />
+ <node id='-53569' lat='-10.18257' lon='105.97626' />
+ <node id='-53571' lat='-10.81333' lon='105.9699' />
+ <node id='-53573' lat='-10.80676' lon='105.29647' />
+ <node id='-53575' lat='-11.5651' lon='96.54423' />
+ <node id='-53577' lat='-11.57036' lon='97.25212' />
+ <node id='-53579' lat='-12.47233' lon='97.24513' />
+ <node id='-53581' lat='-12.46709' lon='96.53724' />
+ <node id='-53583' lat='-7.52784' lon='-167.75329' />
+ <node id='-53585' lat='-23.22266' lon='-167.73129' />
+ <node id='-53587' lat='-23.21255' lon='-156.46451' />
+ <node id='-53589' lat='-53.93403' lon='-58.84651' />
+ <node id='-53591' lat='-51.15168' lon='-55.76919' />
+ <node id='-53593' lat='-52.56305' lon='-43.57991' />
+ <node id='-53595' lat='-57.40649' lon='-40.68557' />
+ <node id='-53597' lat='13.92273' lon='143.82485' />
+ <node id='-53599' lat='13.85876' lon='146.25931' />
+ <node id='-53601' lat='20.05526' lon='136.0511' />
+ <node id='-53603' lat='-51.48322' lon='72.87012' />
+ <node id='-53605' lat='-53.99822' lon='75.44182' />
+ <node id='-53607' lat='22.13873' lon='113.92195' />
+ <node id='-53609' lat='22.15017' lon='114.50148' />
+ <node id='-53611' lat='22.55977' lon='114.44998' />
+ <node id='-53613' lat='22.55977' lon='114.25154' />
+ <node id='-53615' lat='22.42972' lon='113.86771' />
+ <node id='-53617' lat='22.2163' lon='113.81621' />
+ <node id='-53619' lat='22.1826' lon='113.83338' />
+ <node id='-53621' lat='22.5065' lon='114.03113' />
+ <node id='-53623' lat='22.5436' lon='114.22888' />
+ <node id='-53625' lat='22.50253' lon='114.05087' />
+ <node id='-53627' lat='22.53948' lon='114.12726' />
+ <node id='-53629' lat='22.53013' lon='114.11284' />
+ <node id='-53631' lat='22.51617' lon='114.06272' />
+ <node id='-53633' lat='22.51855' lon='114.07267' />
+ <node id='-53635' lat='22.52997' lon='114.07817' />
+ <node id='-53637' lat='22.5352' lon='114.1034' />
+ <node id='-53639' lat='22.54091' lon='114.1482' />
+ <node id='-53641' lat='22.56041' lon='114.1597' />
+ <node id='-53643' lat='22.55343' lon='114.22185' />
+ <node id='-53645' lat='29.18961' lon='-177.8563' />
+ <node id='-53647' lat='27.68616' lon='-177.84531' />
+ <node id='-53649' lat='27.68129' lon='-176.81808' />
+ <node id='-53651' lat='29.19028' lon='-176.83456' />
+ <node id='-53653' lat='17.13856' lon='-169.97341' />
+ <node id='-53655' lat='17.13856' lon='-169.02347' />
+ <node id='-53657' lat='16.32808' lon='-169.02347' />
+ <node id='-53659' lat='16.32808' lon='-169.97341' />
+ <node id='-53661' lat='5.24198' lon='-163.24478' />
+ <node id='-53663' lat='-1.36251' lon='-161.04969' />
+ <node id='-53665' lat='1.67574' lon='-175.33167' />
+ <node id='-53667' lat='-1.43294' lon='-177.43039' />
+ <node id='-53669' lat='17.56928' lon='-65.27974' />
+ <node id='-53671' lat='22.14519' lon='113.54942' />
+ <node id='-53673' lat='22.10909' lon='113.54839' />
+ <node id='-53675' lat='22.07696' lon='113.57191' />
+ <node id='-53677' lat='22.10782' lon='113.63011' />
+ <node id='-53679' lat='22.20464' lon='113.60504' />
+ <node id='-53681' lat='22.20416' lon='113.57123' />
+ <node id='-53683' lat='22.20973' lon='113.56865' />
+ <node id='-53685' lat='22.21672' lon='113.5508' />
+ <node id='-53687' lat='22.21688' lon='113.54333' />
+ <node id='-53689' lat='22.21314' lon='113.54093' />
+ <node id='-53691' lat='22.21402' lon='113.53578' />
+ <node id='-53693' lat='22.21267' lon='113.53286' />
+ <node id='-53695' lat='22.20607' lon='113.53552' />
+ <node id='-53697' lat='22.18271' lon='113.52659' />
+ <node id='-53699' lat='22.15497' lon='113.54093' />
+ <node id='-53701' lat='-13.22353' lon='45.54824' />
+ <node id='-53703' lat='-13.30845' lon='44.82644' />
+ <node id='-53705' lat='-12.30345' lon='45.45962' />
+ <node id='-53707' lat='-23.23027' lon='-173.11048' />
+ <node id='-53709' lat='-30.60259' lon='169.35326' />
+ <node id='-53711' lat='-27.25416' lon='166.75333' />
+ <node id='-53713' lat='31.46619' lon='34.052' />
+ <node id='-53715' lat='31.70393' lon='34.29262' />
+ <node id='-53717' lat='31.54197' lon='34.56797' />
+ <node id='-53719' lat='31.36976' lon='34.36403' />
+ <node id='-53721' lat='31.29058' lon='34.37227' />
+ <node id='-53723' lat='31.22182' lon='34.26622' />
+ <node id='-53725' lat='31.49578' lon='35.47672' />
+ <node id='-53727' lat='31.49572' lon='35.39675' />
+ <node id='-53729' lat='31.37445' lon='35.22921' />
+ <node id='-53731' lat='31.3551' lon='35.13033' />
+ <node id='-53733' lat='31.35979' lon='35.02459' />
+ <node id='-53735' lat='31.34337' lon='34.92571' />
+ <node id='-53737' lat='31.37093' lon='34.88932' />
+ <node id='-53739' lat='31.39321' lon='34.87833' />
+ <node id='-53741' lat='31.43891' lon='34.89756' />
+ <node id='-53743' lat='31.47816' lon='34.93258' />
+ <node id='-53745' lat='31.50743' lon='34.94356' />
+ <node id='-53747' lat='31.55601' lon='34.9415' />
+ <node id='-53749' lat='31.59813' lon='34.95249' />
+ <node id='-53751' lat='31.65426' lon='35.00879' />
+ <node id='-53753' lat='31.69107' lon='35.08226' />
+ <node id='-53755' lat='31.73722' lon='35.1475' />
+ <node id='-53757' lat='31.71269' lon='35.23676' />
+ <node id='-53759' lat='31.7489' lon='35.26079' />
+ <node id='-53761' lat='31.83994' lon='35.25599' />
+ <node id='-53763' lat='31.88426' lon='35.21341' />
+ <node id='-53765' lat='31.81952' lon='35.21135' />
+ <node id='-53767' lat='31.82944' lon='35.18457' />
+ <node id='-53769' lat='31.81077' lon='35.18595' />
+ <node id='-53771' lat='31.81194' lon='35.142' />
+ <node id='-53773' lat='31.85627' lon='35.07677' />
+ <node id='-53775' lat='31.85685' lon='35.05617' />
+ <node id='-53777' lat='31.82944' lon='35.01978' />
+ <node id='-53779' lat='31.83352' lon='34.9724' />
+ <node id='-53781' lat='31.85569' lon='34.99712' />
+ <node id='-53783' lat='31.85919' lon='35.03489' />
+ <node id='-53785' lat='31.92448' lon='35.03489' />
+ <node id='-53787' lat='31.93264' lon='35.00124' />
+ <node id='-53789' lat='31.96935' lon='34.98682' />
+ <node id='-53791' lat='32.027' lon='35.00261' />
+ <node id='-53793' lat='32.09508' lon='34.98201' />
+ <node id='-53795' lat='32.10962' lon='34.99437' />
+ <node id='-53797' lat='32.19101' lon='34.95386' />
+ <node id='-53799' lat='32.23981' lon='35.01841' />
+ <node id='-53801' lat='32.2671' lon='35.02939' />
+ <node id='-53803' lat='32.2822' lon='35.01017' />
+ <node id='-53805' lat='32.34139' lon='35.01841' />
+ <node id='-53807' lat='32.36053' lon='35.04999' />
+ <node id='-53809' lat='32.38779' lon='35.04313' />
+ <node id='-53811' lat='32.4585' lon='35.07059' />
+ <node id='-53813' lat='32.55289' lon='35.2244' />
+ <node id='-53815' lat='32.52453' lon='35.25049' />
+ <node id='-53817' lat='32.50947' lon='35.29306' />
+ <node id='-53819' lat='32.52047' lon='35.35212' />
+ <node id='-53821' lat='32.50136' lon='35.40224' />
+ <node id='-53823' lat='32.45792' lon='35.42009' />
+ <node id='-53825' lat='32.43706' lon='35.41048' />
+ <node id='-53827' lat='32.41562' lon='35.42078' />
+ <node id='-53829' lat='32.38674' lon='35.55807' />
+ <node id='-53831' lat='75.46568' lon='33.12005' />
+ <node id='-53833' lat='80.57056' lon='35.22046' />
+ <node id='-53835' lat='-12.45583' lon='47.29063' />
+ <node id='-53837' lat='-17.08802' lon='41.06663' />
+ <node id='-53839' lat='-15.5001' lon='54.08717' />
+ <node id='-53841' lat='-15.45342' lon='54.91606' />
+ <node id='-53843' lat='-16.28353' lon='54.96649' />
+ <node id='-53845' lat='-16.33002' lon='54.13761' />
+ <node id='-53847' lat='-8.70814' lon='-14.82771' />
+ <node id='-53849' lat='-8.07391' lon='-13.33271' />
+ <node id='-53851' lat='29.61659' lon='-12.42686' />
+ <node id='-53853' lat='30.94071' lon='-14.33337' />
+ <node id='-53855' lat='36.05227' lon='-5.10878' />
+ <node id='-53857' lat='35.17419' lon='-4.30191' />
+ <node id='-53859' lat='35.17058' lon='-4.30112' />
+ <node id='-53861' lat='35.17149' lon='-4.29436' />
+ <node id='-53863' lat='35.22024' lon='-3.90288' />
+ <node id='-53865' lat='35.21406' lon='-3.88617' />
+ <node id='-53867' lat='35.1877' lon='-2.41265' />
+ <node id='-53869' lat='35.18777' lon='-2.44896' />
+ <node id='-53871' lat='35.17075' lon='-2.44887' />
+ <node id='-53873' lat='-7.71938' lon='72.09053' />
+ <node id='-53875' lat='-6.94304' lon='72.0768' />
+ <node id='-53877' lat='-6.94577' lon='73.19718' />
+ <node id='-53879' lat='-36.6746' lon='-13.48367' />
+ <node id='-53881' lat='-36.60319' lon='-11.55782' />
+ <node id='-53883' lat='-37.8367' lon='-11.48092' />
+ <node id='-53885' lat='-37.88844' lon='-13.41694' />
+ <node id='-53887' lat='-26.70736' lon='99.6403' />
+ <node id='-53889' lat='-28.32101' lon='165.46901' />
+ <node id='-53891' lat='45.96485' lon='8.95861' />
+ <node id='-53893' lat='45.98436' lon='8.96668' />
+ <node id='-53895' lat='45.98317' lon='8.97741' />
+ <node id='-53897' lat='45.96151' lon='8.97604' />
+ <node id='-53899' lat='22.00405' lon='33.17563' />
+ <node id='-53901' lat='22.00501' lon='34.0765' />
+ <node id='-53903' lat='21.72406' lon='33.57251' />
+ <node id='-53905' lat='21.76784' lon='33.99686' />
+ <node id='-53907' lat='51.4353' lon='4.91493' />
+ <node id='-53909' lat='51.43329' lon='4.92652' />
+ <node id='-53911' lat='51.42984' lon='4.92952' />
+ <node id='-53913' lat='51.43064' lon='4.93986' />
+ <node id='-53915' lat='51.44003' lon='4.94265' />
+ <node id='-53917' lat='51.43861' lon='4.93471' />
+ <node id='-53919' lat='51.44185' lon='4.93416' />
+ <node id='-53921' lat='51.44193' lon='4.94025' />
+ <node id='-53923' lat='51.44634' lon='4.93544' />
+ <node id='-53925' lat='51.44161' lon='4.92879' />
+ <node id='-53927' lat='51.43856' lon='4.92815' />
+ <node id='-53929' lat='51.44273' lon='4.92566' />
+ <node id='-53931' lat='51.4437' lon='4.92811' />
+ <node id='-53933' lat='51.44741' lon='4.92287' />
+ <node id='-53935' lat='51.44621' lon='4.91811' />
+ <node id='-53937' lat='51.44252' lon='4.92227' />
+ <node id='-53939' lat='51.43634' lon='4.91935' />
+ <node id='-53941' lat='51.44945' lon='4.93295' />
+ <node id='-53943' lat='51.44632' lon='4.93909' />
+ <node id='-53945' lat='51.45014' lon='4.9524' />
+ <node id='-53947' lat='51.45207' lon='4.95244' />
+ <node id='-53949' lat='-14.42902' lon='129.0' />
+ <node id='-53951' lat='-43.08851' lon='129.0' />
+ <node id='-53953' lat='-25.99861' lon='129.00057' />
+ <node id='-53955' lat='-25.99861' lon='129.00183' />
+ <node id='-53957' lat='-25.99819' lon='137.99993' />
+ <node id='-53959' lat='-26.00101' lon='141.00013' />
+ <node id='-53961' lat='-16.23841' lon='138.00067' />
+ <node id='-53963' lat='-38.2743' lon='140.96369' />
+ <node id='-53965' lat='-39.16128' lon='152.57175' />
+ <node id='-53967' lat='-55.66823' lon='158.89388' />
+ <node id='-53969' lat='-47.26522' lon='137.66184' />
+ <node id='-53971' lat='-39.23791' lon='140.64335' />
+ <node id='-53973' lat='-33.98067' lon='140.9638' />
+ <node id='-53975' lat='-34.02172' lon='141.00268' />
+ <node id='-53977' lat='-34.18902' lon='141.5377' />
+ <node id='-53979' lat='-34.0924' lon='141.71349' />
+ <node id='-53981' lat='-34.12651' lon='142.0211' />
+ <node id='-53983' lat='-34.18334' lon='142.22023' />
+ <node id='-53985' lat='-34.3014' lon='142.24495' />
+ <node id='-53987' lat='-34.34563' lon='142.37404' />
+ <node id='-53989' lat='-34.74267' lon='142.50999' />
+ <node id='-53991' lat='-34.77765' lon='142.61711' />
+ <node id='-53993' lat='-34.56871' lon='142.76268' />
+ <node id='-53995' lat='-34.79344' lon='143.34221' />
+ <node id='-53997' lat='-34.99618' lon='143.3271' />
+ <node id='-53999' lat='-35.18047' lon='143.39027' />
+ <node id='-54001' lat='-35.20741' lon='143.57155' />
+ <node id='-54003' lat='-35.33634' lon='143.56743' />
+ <node id='-54005' lat='-35.57238' lon='144.08241' />
+ <node id='-54007' lat='-36.11895' lon='144.74022' />
+ <node id='-54009' lat='-36.05236' lon='144.94896' />
+ <node id='-54011' lat='-35.86673' lon='144.9778' />
+ <node id='-54013' lat='-35.81774' lon='145.1165' />
+ <node id='-54015' lat='-35.86005' lon='145.34447' />
+ <node id='-54017' lat='-35.80772' lon='145.50789' />
+ <node id='-54019' lat='-35.98461' lon='145.80589' />
+ <node id='-54021' lat='-36.03571' lon='146.36894' />
+ <node id='-54023' lat='-35.96794' lon='146.42387' />
+ <node id='-54025' lat='-35.97349' lon='146.59966' />
+ <node id='-54027' lat='-36.08788' lon='146.85097' />
+ <node id='-54029' lat='-36.09898' lon='147.04185' />
+ <node id='-54031' lat='-36.00683' lon='147.10503' />
+ <node id='-54033' lat='-36.05458' lon='147.31926' />
+ <node id='-54035' lat='-35.94681' lon='147.39616' />
+ <node id='-54037' lat='-35.94237' lon='147.71202' />
+ <node id='-54039' lat='-36.0457' lon='147.99217' />
+ <node id='-54041' lat='-36.39248' lon='148.04573' />
+ <node id='-54043' lat='-36.59782' lon='148.20366' />
+ <node id='-54045' lat='-36.79272' lon='148.10753' />
+ <node id='-54047' lat='-36.79602' lon='148.19405' />
+ <node id='-54049' lat='-37.59458' lon='150.19768' />
+ <node id='-54051' lat='-28.99903' lon='140.99934' />
+ <node id='-54053' lat='-28.99906' lon='148.95806' />
+ <node id='-54055' lat='-28.77479' lon='149.19248' />
+ <node id='-54057' lat='-28.68628' lon='149.37788' />
+ <node id='-54059' lat='-28.58202' lon='149.48705' />
+ <node id='-54061' lat='-28.57056' lon='149.58044' />
+ <node id='-54063' lat='-28.62723' lon='149.67519' />
+ <node id='-54065' lat='-28.53558' lon='150.30004' />
+ <node id='-54067' lat='-28.66098' lon='150.43737' />
+ <node id='-54069' lat='-28.63446' lon='150.74499' />
+ <node id='-54071' lat='-28.94017' lon='151.27508' />
+ <node id='-54073' lat='-29.15627' lon='151.30392' />
+ <node id='-54075' lat='-29.17186' lon='151.39318' />
+ <node id='-54077' lat='-28.94858' lon='151.55248' />
+ <node id='-54079' lat='-28.86683' lon='151.72552' />
+ <node id='-54081' lat='-28.9606' lon='151.7777' />
+ <node id='-54083' lat='-28.89449' lon='152.01391' />
+ <node id='-54085' lat='-28.69351' lon='152.06472' />
+ <node id='-54087' lat='-28.54282' lon='151.94662' />
+ <node id='-54089' lat='-28.25168' lon='152.49731' />
+ <node id='-54091' lat='-28.3327' lon='152.57696' />
+ <node id='-54093' lat='-28.27466' lon='152.60442' />
+ <node id='-54095' lat='-28.35929' lon='152.74725' />
+ <node id='-54097' lat='-28.30852' lon='152.87222' />
+ <node id='-54099' lat='-28.35445' lon='153.10293' />
+ <node id='-54101' lat='-28.25289' lon='153.18121' />
+ <node id='-54103' lat='-28.242' lon='153.36385' />
+ <node id='-54105' lat='-28.15789' lon='153.47715' />
+ <node id='-54107' lat='-28.17635' lon='153.53414' />
+ <node id='-54109' lat='-28.16364' lon='153.55096' />
+ <node id='-54111' lat='-19.80828' lon='149.03078' />
+ <node id='-54113' lat='-24.72709' lon='153.5901' />
+ <node id='-54115' lat='-33.24807' lon='159.35793' />
+ <node id='-54117' lat='-27.34698' lon='155.3142' />
+ <node id='-54119' lat='-35.1241' lon='149.12159' />
+ <node id='-54121' lat='-35.30698' lon='148.80951' />
+ <node id='-54123' lat='-35.49504' lon='148.76247' />
+ <node id='-54125' lat='-35.69995' lon='148.78891' />
+ <node id='-54127' lat='-35.76043' lon='148.85723' />
+ <node id='-54129' lat='-35.715' lon='148.8768' />
+ <node id='-54131' lat='-35.75095' lon='148.89431' />
+ <node id='-54133' lat='-35.82504' lon='148.89602' />
+ <node id='-54135' lat='-35.8971' lon='148.96194' />
+ <node id='-54137' lat='-35.91684' lon='149.04811' />
+ <node id='-54139' lat='-35.81223' lon='149.09824' />
+ <node id='-54141' lat='-35.6411' lon='149.09549' />
+ <node id='-54143' lat='-35.58193' lon='149.07936' />
+ <node id='-54145' lat='-35.59337' lon='149.14219' />
+ <node id='-54147' lat='-35.55288' lon='149.12983' />
+ <node id='-54149' lat='-35.50566' lon='149.15283' />
+ <node id='-54151' lat='-35.45338' lon='149.13429' />
+ <node id='-54153' lat='-35.34732' lon='149.2057' />
+ <node id='-54155' lat='-35.33024' lon='149.25136' />
+ <node id='-54157' lat='-35.33976' lon='149.33719' />
+ <node id='-54159' lat='-35.3518' lon='149.35058' />
+ <node id='-54161' lat='-35.32435' lon='149.39796' />
+ <node id='-54163' lat='-35.30362' lon='149.39418' />
+ <node id='-54165' lat='-35.24336' lon='149.23488' />
+ <node id='-54167' lat='-35.2285' lon='149.2469' />
+ <node id='-54169' lat='-35.18502' lon='149.19746' />
+ <node id='-54171' lat='-35.20157' lon='149.18956' />
+ <node id='-54173' lat='-35.11779' lon='150.66156' />
+ <node id='-54175' lat='-35.12312' lon='150.70087' />
+ <node id='-54177' lat='-35.10852' lon='150.78069' />
+ <node id='-54179' lat='-35.20971' lon='150.7431' />
+ <node id='-54181' lat='-35.18389' lon='150.59307' />
+ <node id='-54183' lat='-35.14376' lon='150.59384' />
+ <node id='-54185' lat='-35.17225' lon='150.59126' />
+ <node id='-54187' lat='-35.15197' lon='150.59564' />
+ <node id='-54189' lat='-35.15429' lon='150.60534' />
+ <node id='-54191' lat='-35.1672' lon='150.60036' />
+ <node id='-54193' lat='60.00043' lon='-120.00135' />
+ <node id='-54195' lat='53.79861' lon='-120.00143' />
+ <node id='-54197' lat='48.99885' lon='-114.0683' />
+ <node id='-54199' lat='49.57064' lon='-114.74352' />
+ <node id='-54201' lat='50.29534' lon='-114.70812' />
+ <node id='-54203' lat='59.99944' lon='-110.00637' />
+ <node id='-54205' lat='48.99901' lon='-110.0051' />
+ <node id='-54207' lat='59.99922' lon='-102.00759' />
+ <node id='-54209' lat='48.99935' lon='-101.36198' />
+ <node id='-54211' lat='55.81762' lon='-101.98961' />
+ <node id='-54213' lat='59.99917' lon='-94.78348' />
+ <node id='-54215' lat='56.84662' lon='-88.99084' />
+ <node id='-54217' lat='52.84191' lon='-95.15374' />
+ <node id='-54219' lat='55.13419' lon='-82.10455' />
+ <node id='-54221' lat='52.92137' lon='-82.09357' />
+ <node id='-54223' lat='51.46031' lon='-79.51659' />
+ <node id='-54225' lat='47.53313' lon='-79.51787' />
+ <node id='-54227' lat='47.51342' lon='-79.55581' />
+ <node id='-54229' lat='47.42941' lon='-79.58877' />
+ <node id='-54231' lat='47.30711' lon='-79.48921' />
+ <node id='-54233' lat='47.25307' lon='-79.42535' />
+ <node id='-54235' lat='47.10512' lon='-79.44869' />
+ <node id='-54237' lat='46.83335' lon='-79.21317' />
+ <node id='-54239' lat='46.82678' lon='-79.17335' />
+ <node id='-54241' lat='46.68518' lon='-79.08958' />
+ <node id='-54243' lat='46.64607' lon='-79.04563' />
+ <node id='-54245' lat='46.63664' lon='-79.01817' />
+ <node id='-54247' lat='46.54604' lon='-78.98796' />
+ <node id='-54249' lat='46.45624' lon='-78.88496' />
+ <node id='-54251' lat='46.38619' lon='-78.73115' />
+ <node id='-54253' lat='46.3407' lon='-78.72703' />
+ <node id='-54255' lat='46.32173' lon='-78.703' />
+ <node id='-54257' lat='46.29138' lon='-78.38508' />
+ <node id='-54259' lat='46.25388' lon='-78.31642' />
+ <node id='-54261' lat='46.27714' lon='-78.24981' />
+ <node id='-54263' lat='46.18452' lon='-77.69363' />
+ <node id='-54265' lat='46.19925' lon='-77.67852' />
+ <node id='-54267' lat='46.05696' lon='-77.35717' />
+ <node id='-54269' lat='46.02741' lon='-77.31803' />
+ <node id='-54271' lat='46.0174' lon='-77.27683' />
+ <node id='-54273' lat='45.98258' lon='-77.28782' />
+ <node id='-54275' lat='45.93962' lon='-77.2734' />
+ <node id='-54277' lat='45.86556' lon='-77.19238' />
+ <node id='-54279' lat='45.84165' lon='-77.12097' />
+ <node id='-54281' lat='45.83543' lon='-77.07565' />
+ <node id='-54283' lat='45.8072' lon='-77.04681' />
+ <node id='-54285' lat='45.80863' lon='-77.01866' />
+ <node id='-54287' lat='45.78613' lon='-76.98982' />
+ <node id='-54289' lat='45.789' lon='-76.94107' />
+ <node id='-54291' lat='45.80624' lon='-76.91085' />
+ <node id='-54293' lat='45.89137' lon='-76.93077' />
+ <node id='-54295' lat='45.90141' lon='-76.893' />
+ <node id='-54297' lat='45.87273' lon='-76.77696' />
+ <node id='-54299' lat='45.84978' lon='-76.7646' />
+ <node id='-54301' lat='45.75308' lon='-76.77558' />
+ <node id='-54303' lat='45.69172' lon='-76.68975' />
+ <node id='-54305' lat='45.66438' lon='-76.71653' />
+ <node id='-54307' lat='45.62357' lon='-76.6719' />
+ <node id='-54309' lat='45.58466' lon='-76.67602' />
+ <node id='-54311' lat='45.56015' lon='-76.65885' />
+ <node id='-54313' lat='45.53226' lon='-76.60873' />
+ <node id='-54315' lat='45.51638' lon='-76.5023' />
+ <node id='-54317' lat='45.45814' lon='-76.36772' />
+ <node id='-54319' lat='45.46873' lon='-76.24343' />
+ <node id='-54321' lat='45.51109' lon='-76.23245' />
+ <node id='-54323' lat='45.52023' lon='-76.19468' />
+ <node id='-54325' lat='45.51735' lon='-76.091' />
+ <node id='-54327' lat='45.47643' lon='-75.97152' />
+ <node id='-54329' lat='45.41477' lon='-75.91522' />
+ <node id='-54331' lat='45.37716' lon='-75.8493' />
+ <node id='-54333' lat='45.3762' lon='-75.80535' />
+ <node id='-54335' lat='45.4114' lon='-75.75935' />
+ <node id='-54337' lat='45.41736' lon='-75.72982' />
+ <node id='-54339' lat='45.41766' lon='-75.72381' />
+ <node id='-54341' lat='45.422' lon='-75.7239' />
+ <node id='-54343' lat='45.42158' lon='-75.71772' />
+ <node id='-54345' lat='45.42345' lon='-75.70957' />
+ <node id='-54347' lat='45.42706' lon='-75.70424' />
+ <node id='-54349' lat='45.43712' lon='-75.70287' />
+ <node id='-54351' lat='45.45187' lon='-75.69334' />
+ <node id='-54353' lat='45.45826' lon='-75.68562' />
+ <node id='-54355' lat='45.47192' lon='-75.61876' />
+ <node id='-54357' lat='45.47361' lon='-75.58151' />
+ <node id='-54359' lat='45.51368' lon='-75.4804' />
+ <node id='-54361' lat='45.53581' lon='-75.33981' />
+ <node id='-54363' lat='45.58677' lon='-75.24162' />
+ <node id='-54365' lat='45.57715' lon='-75.13038' />
+ <node id='-54367' lat='45.59589' lon='-75.02601' />
+ <node id='-54369' lat='45.64536' lon='-74.94087' />
+ <node id='-54371' lat='45.62856' lon='-74.71427' />
+ <node id='-54373' lat='45.64008' lon='-74.64286' />
+ <node id='-54375' lat='45.62183' lon='-74.61059' />
+ <node id='-54377' lat='45.59157' lon='-74.52819' />
+ <node id='-54379' lat='45.59638' lon='-74.48081' />
+ <node id='-54381' lat='45.56562' lon='-74.38125' />
+ <node id='-54383' lat='45.30253' lon='-74.47257' />
+ <node id='-54385' lat='45.18844' lon='-74.32151' />
+ <node id='-54387' lat='45.06927' lon='-74.50073' />
+ <node id='-54389' lat='45.00646' lon='-74.66689' />
+ <node id='-54391' lat='45.68615' lon='-64.54574' />
+ <node id='-54393' lat='45.8557' lon='-64.33563' />
+ <node id='-54395' lat='45.83274' lon='-64.28619' />
+ <node id='-54397' lat='45.9799' lon='-64.1571' />
+ <node id='-54399' lat='45.97703' lon='-64.04861' />
+ <node id='-54401' lat='46.01901' lon='-64.03625' />
+ <node id='-54403' lat='46.10096' lon='-63.58306' />
+ <node id='-54405' lat='45.85952' lon='-62.49954' />
+ <node id='-54407' lat='47.38172' lon='-60.49316' />
+ <node id='-54409' lat='46.22936' lon='-63.75335' />
+ <node id='-54411' lat='46.6005' lon='-64.66796' />
+ <node id='-54413' lat='46.42845' lon='-61.75622' />
+ <node id='-54415' lat='47.30076' lon='-69.05073' />
+ <node id='-54417' lat='47.34824' lon='-68.80844' />
+ <node id='-54419' lat='47.42727' lon='-68.57223' />
+ <node id='-54421' lat='47.55439' lon='-68.38546' />
+ <node id='-54423' lat='47.91553' lon='-68.38409' />
+ <node id='-54425' lat='47.91461' lon='-68.12454' />
+ <node id='-54427' lat='48.00014' lon='-68.12316' />
+ <node id='-54429' lat='48.00014' lon='-67.60543' />
+ <node id='-54431' lat='47.93209' lon='-67.60406' />
+ <node id='-54433' lat='47.85751' lon='-67.37884' />
+ <node id='-54435' lat='47.93117' lon='-67.06161' />
+ <node id='-54437' lat='47.89159' lon='-66.96548' />
+ <node id='-54439' lat='47.97716' lon='-66.93664' />
+ <node id='-54441' lat='48.04698' lon='-66.52465' />
+ <node id='-54443' lat='48.0791' lon='-66.50405' />
+ <node id='-54445' lat='48.08919' lon='-66.37908' />
+ <node id='-54447' lat='48.03872' lon='-66.28295' />
+ <node id='-54449' lat='47.92013' lon='-65.19393' />
+ <node id='-54451' lat='48.12037' lon='-64.29855' />
+ <node id='-54453' lat='47.11511' lon='-64.01702' />
+ <node id='-54455' lat='51.99856' lon='-57.10774' />
+ <node id='-54457' lat='51.37809' lon='-57.10928' />
+ <node id='-54459' lat='51.99787' lon='-63.8082' />
+ <node id='-54461' lat='51.57984' lon='-64.55407' />
+ <node id='-54463' lat='52.90413' lon='-67.35283' />
+ <node id='-54465' lat='54.45267' lon='-67.83623' />
+ <node id='-54467' lat='55.09899' lon='-66.84746' />
+ <node id='-54469' lat='54.63112' lon='-63.7603' />
+ <node id='-54471' lat='60.27404' lon='-64.79302' />
+ <node id='-54473' lat='62.9266' lon='-53.68108' />
+ <node id='-54475' lat='60.00396' lon='-68.84423' />
+ <node id='-54477' lat='61.12682' lon='-69.3496' />
+ <node id='-54479' lat='62.57769' lon='-73.67821' />
+ <node id='-54481' lat='62.65853' lon='-78.62206' />
+ <node id='-54483' lat='58.64783' lon='-79.23729' />
+ <node id='-54485' lat='57.55654' lon='-77.32567' />
+ <node id='-54487' lat='56.02851' lon='-77.17186' />
+ <node id='-54489' lat='54.90049' lon='-78.98049' />
+ <node id='-54491' lat='54.66449' lon='-79.92119' />
+ <node id='-54493' lat='52.08899' lon='-78.74291' />
+ <node id='-54495' lat='51.58666' lon='-79.56139' />
+ <node id='-54497' lat='69.40701' lon='-136.61065' />
+ <node id='-54499' lat='68.88195' lon='-136.4486' />
+ <node id='-54501' lat='67.65377' lon='-136.4486' />
+ <node id='-54503' lat='67.59731' lon='-136.21788' />
+ <node id='-54505' lat='67.0511' lon='-136.20381' />
+ <node id='-54507' lat='67.00031' lon='-136.15918' />
+ <node id='-54509' lat='67.00286' lon='-134.09581' />
+ <node id='-54511' lat='60.77223' lon='-126.80638' />
+ <node id='-54513' lat='60.9114' lon='-124.71898' />
+ <node id='-54515' lat='59.99964' lon='-123.86203' />
+ <node id='-54517' lat='79.74266' lon='-110.08928' />
+ <node id='-54519' lat='70.00345' lon='-110.07969' />
+ <node id='-54521' lat='69.63965' lon='-120.71446' />
+ <node id='-54523' lat='68.0217' lon='-120.71446' />
+ <node id='-54525' lat='65.10654' lon='-111.26622' />
+ <node id='-54527' lat='64.2419' lon='-102.08165' />
+ <node id='-54529' lat='38.93441' lon='-77.11962' />
+ <node id='-54531' lat='38.99552' lon='-77.04117' />
+ <node id='-54533' lat='38.89301' lon='-76.90939' />
+ <node id='-54535' lat='38.79153' lon='-77.03906' />
+ <node id='-54537' lat='38.92787' lon='-77.11536' />
+ <node id='-54539' lat='38.91912' lon='-77.10592' />
+ <node id='-54541' lat='38.91264' lon='-77.10201' />
+ <node id='-54543' lat='38.90436' lon='-77.08897' />
+ <node id='-54545' lat='38.90106' lon='-77.07047' />
+ <node id='-54547' lat='38.89895' lon='-77.06759' />
+ <node id='-54549' lat='38.88152' lon='-77.05957' />
+ <node id='-54551' lat='38.87964' lon='-77.05493' />
+ <node id='-54553' lat='38.87343' lon='-77.0491' />
+ <node id='-54555' lat='38.87557' lon='-77.04592' />
+ <node id='-54557' lat='38.86133' lon='-77.03021' />
+ <node id='-54559' lat='31.89065' lon='-88.47496' />
+ <node id='-54561' lat='34.89407' lon='-88.09868' />
+ <node id='-54563' lat='34.9211' lon='-88.14949' />
+ <node id='-54565' lat='35.00664' lon='-88.20305' />
+ <node id='-54567' lat='34.98639' lon='-85.60478' />
+ <node id='-54569' lat='32.85909' lon='-85.18318' />
+ <node id='-54571' lat='32.5818' lon='-85.07057' />
+ <node id='-54573' lat='32.51697' lon='-84.99916' />
+ <node id='-54575' lat='32.42661' lon='-84.9662' />
+ <node id='-54577' lat='32.33034' lon='-85.0074' />
+ <node id='-54579' lat='32.26185' lon='-84.88518' />
+ <node id='-54581' lat='32.13519' lon='-85.06233' />
+ <node id='-54583' lat='32.01766' lon='-85.05547' />
+ <node id='-54585' lat='31.844' lon='-85.14336' />
+ <node id='-54587' lat='31.62676' lon='-85.07332' />
+ <node id='-54589' lat='31.52965' lon='-85.04311' />
+ <node id='-54591' lat='31.27295' lon='-85.10902' />
+ <node id='-54593' lat='31.16255' lon='-85.09804' />
+ <node id='-54595' lat='31.02143' lon='-85.00191' />
+ <node id='-54597' lat='31.0026' lon='-85.00191' />
+ <node id='-54599' lat='30.99671' lon='-87.5988' />
+ <node id='-54601' lat='30.96375' lon='-87.59056' />
+ <node id='-54603' lat='30.86596' lon='-87.63588' />
+ <node id='-54605' lat='30.74093' lon='-87.52739' />
+ <node id='-54607' lat='30.67362' lon='-87.40654' />
+ <node id='-54609' lat='30.62518' lon='-87.39418' />
+ <node id='-54611' lat='30.52113' lon='-87.44774' />
+ <node id='-54613' lat='30.47144' lon='-87.42989' />
+ <node id='-54615' lat='30.44658' lon='-87.3777' />
+ <node id='-54617' lat='30.31863' lon='-87.50679' />
+ <node id='-54619' lat='30.30677' lon='-87.44774' />
+ <node id='-54621' lat='30.28187' lon='-87.51915' />
+ <node id='-54623' lat='30.07055' lon='-87.51915' />
+ <node id='-54625' lat='31.3333' lon='-109.05235' />
+ <node id='-54627' lat='37.00061' lon='-109.04686' />
+ <node id='-54629' lat='37.00171' lon='-114.05113' />
+ <node id='-54631' lat='36.1991' lon='-114.04564' />
+ <node id='-54633' lat='36.11372' lon='-114.12254' />
+ <node id='-54635' lat='36.02936' lon='-114.14864' />
+ <node id='-54637' lat='36.01715' lon='-114.2379' />
+ <node id='-54639' lat='36.06379' lon='-114.30931' />
+ <node id='-54641' lat='36.147' lon='-114.37523' />
+ <node id='-54643' lat='36.15254' lon='-114.57298' />
+ <node id='-54645' lat='36.13036' lon='-114.61281' />
+ <node id='-54647' lat='36.14367' lon='-114.63066' />
+ <node id='-54649' lat='36.09486' lon='-114.75014' />
+ <node id='-54651' lat='36.03159' lon='-114.72404' />
+ <node id='-54653' lat='36.0127' lon='-114.74052' />
+ <node id='-54655' lat='35.98271' lon='-114.74602' />
+ <node id='-54657' lat='35.87039' lon='-114.66774' />
+ <node id='-54659' lat='35.85592' lon='-114.70482' />
+ <node id='-54661' lat='35.65197' lon='-114.68971' />
+ <node id='-54663' lat='35.60956' lon='-114.65263' />
+ <node id='-54665' lat='35.49783' lon='-114.68147' />
+ <node id='-54667' lat='35.33331' lon='-114.59633' />
+ <node id='-54669' lat='35.15498' lon='-114.57024' />
+ <node id='-54671' lat='35.12803' lon='-114.5826' />
+ <node id='-54673' lat='35.12129' lon='-114.62791' />
+ <node id='-54675' lat='35.10444' lon='-114.64577' />
+ <node id='-54677' lat='35.07635' lon='-114.60732' />
+ <node id='-54679' lat='35.01451' lon='-114.64165' />
+ <node id='-54681' lat='34.86704' lon='-114.63203' />
+ <node id='-54683' lat='34.83773' lon='-114.58672' />
+ <node id='-54685' lat='34.77233' lon='-114.5565' />
+ <node id='-54687' lat='34.71478' lon='-114.47411' />
+ <node id='-54689' lat='34.58939' lon='-114.42879' />
+ <node id='-54691' lat='34.52153' lon='-114.37798' />
+ <node id='-54693' lat='34.45361' lon='-114.38484' />
+ <node id='-54695' lat='34.44682' lon='-114.3409' />
+ <node id='-54697' lat='34.3074' lon='-114.1404' />
+ <node id='-54699' lat='34.26315' lon='-114.13628' />
+ <node id='-54701' lat='34.11434' lon='-114.3821' />
+ <node id='-54703' lat='33.93223' lon='-114.53728' />
+ <node id='-54705' lat='33.87182' lon='-114.50432' />
+ <node id='-54707' lat='33.85015' lon='-114.52766' />
+ <node id='-54709' lat='33.69718' lon='-114.49745' />
+ <node id='-54711' lat='33.68461' lon='-114.52904' />
+ <node id='-54713' lat='33.55196' lon='-114.53316' />
+ <node id='-54715' lat='33.41336' lon='-114.65263' />
+ <node id='-54717' lat='33.40763' lon='-114.72954' />
+ <node id='-54719' lat='33.35947' lon='-114.69795' />
+ <node id='-54721' lat='33.3044' lon='-114.72816' />
+ <node id='-54723' lat='33.22517' lon='-114.67186' />
+ <node id='-54725' lat='33.0918' lon='-114.70894' />
+ <node id='-54727' lat='33.0262' lon='-114.61693' />
+ <node id='-54729' lat='33.03196' lon='-114.5208' />
+ <node id='-54731' lat='32.91098' lon='-114.46724' />
+ <node id='-54733' lat='32.84294' lon='-114.47136' />
+ <node id='-54735' lat='32.79216' lon='-114.5359' />
+ <node id='-54737' lat='32.75405' lon='-114.53178' />
+ <node id='-54739' lat='32.73442' lon='-114.59633' />
+ <node id='-54741' lat='32.7425' lon='-114.70482' />
+ <node id='-54743' lat='33.01929' lon='-94.04366' />
+ <node id='-54745' lat='33.55539' lon='-94.0464' />
+ <node id='-54747' lat='33.57828' lon='-94.07661' />
+ <node id='-54749' lat='33.56455' lon='-94.38423' />
+ <node id='-54751' lat='33.64004' lon='-94.48448' />
+ <node id='-54753' lat='35.38371' lon='-94.43092' />
+ <node id='-54755' lat='36.49995' lon='-94.61906' />
+ <node id='-54757' lat='36.49885' lon='-90.1545' />
+ <node id='-54759' lat='36.41711' lon='-90.13939' />
+ <node id='-54761' lat='36.39833' lon='-90.07347' />
+ <node id='-54763' lat='36.27442' lon='-90.07759' />
+ <node id='-54765' lat='36.26446' lon='-90.11467' />
+ <node id='-54767' lat='35.99826' lon='-90.37834' />
+ <node id='-54769' lat='36.00048' lon='-89.73701' />
+ <node id='-54771' lat='35.91489' lon='-89.64638' />
+ <node id='-54773' lat='35.8804' lon='-89.67384' />
+ <node id='-54775' lat='35.91044' lon='-89.73564' />
+ <node id='-54777' lat='35.87261' lon='-89.77409' />
+ <node id='-54779' lat='35.83366' lon='-89.70131' />
+ <node id='-54781' lat='35.8047' lon='-89.72878' />
+ <node id='-54783' lat='35.73228' lon='-89.95399' />
+ <node id='-54785' lat='35.66871' lon='-89.94301' />
+ <node id='-54787' lat='35.64528' lon='-89.89357' />
+ <node id='-54789' lat='35.38483' lon='-90.11604' />
+ <node id='-54791' lat='35.1314' lon='-90.07072' />
+ <node id='-54793' lat='35.13252' lon='-90.16136' />
+ <node id='-54795' lat='34.99989' lon='-90.31242' />
+ <node id='-54797' lat='34.93349' lon='-90.24925' />
+ <node id='-54799' lat='34.72946' lon='-90.56236' />
+ <node id='-54801' lat='34.49776' lon='-90.58846' />
+ <node id='-54803' lat='33.96299' lon='-91.08696' />
+ <node id='-54805' lat='33.29866' lon='-91.14052' />
+ <node id='-54807' lat='33.00432' lon='-91.16798' />
+ <node id='-54809' lat='38.99862' lon='-120.00023' />
+ <node id='-54811' lat='41.99495' lon='-120.0016' />
+ <node id='-54813' lat='42.00605' lon='-125.69978' />
+ <node id='-54815' lat='41.00069' lon='-109.05003' />
+ <node id='-54817' lat='41.00235' lon='-102.05165' />
+ <node id='-54819' lat='36.99314' lon='-102.04214' />
+ <node id='-54821' lat='42.0497' lon='-73.48746' />
+ <node id='-54823' lat='41.2957' lon='-73.5508' />
+ <node id='-54825' lat='41.21298' lon='-73.48283' />
+ <node id='-54827' lat='41.10079' lon='-73.72761' />
+ <node id='-54829' lat='41.01225' lon='-73.65535' />
+ <node id='-54831' lat='41.00098' lon='-73.66067' />
+ <node id='-54833' lat='40.99373' lon='-73.65947' />
+ <node id='-54835' lat='40.99062' lon='-73.65723' />
+ <node id='-54837' lat='40.98854' lon='-73.65981' />
+ <node id='-54839' lat='40.9494' lon='-73.62136' />
+ <node id='-54841' lat='41.32188' lon='-71.85736' />
+ <node id='-54843' lat='41.34199' lon='-71.82955' />
+ <node id='-54845' lat='41.3626' lon='-71.83917' />
+ <node id='-54847' lat='41.37033' lon='-71.83333' />
+ <node id='-54849' lat='41.38837' lon='-71.83367' />
+ <node id='-54851' lat='41.39455' lon='-71.84191' />
+ <node id='-54853' lat='41.40948' lon='-71.84363' />
+ <node id='-54855' lat='41.41952' lon='-71.81926' />
+ <node id='-54857' lat='41.41592' lon='-71.79866' />
+ <node id='-54859' lat='41.65621' lon='-71.78733' />
+ <node id='-54861' lat='42.0236' lon='-71.80067' />
+ <node id='-54863' lat='42.03756' lon='-72.75464' />
+ <node id='-54865' lat='42.00491' lon='-72.76837' />
+ <node id='-54867' lat='41.9993' lon='-72.81712' />
+ <node id='-54869' lat='42.03654' lon='-72.81369' />
+ <node id='-54871' lat='38.46017' lon='-75.69382' />
+ <node id='-54873' lat='38.4507' lon='-74.98718' />
+ <node id='-54875' lat='38.79724' lon='-75.01808' />
+ <node id='-54877' lat='39.30382' lon='-75.38063' />
+ <node id='-54879' lat='39.45773' lon='-75.56053' />
+ <node id='-54881' lat='39.63352' lon='-75.55641' />
+ <node id='-54883' lat='39.77457' lon='-75.46131' />
+ <node id='-54885' lat='39.7962' lon='-75.40672' />
+ <node id='-54887' lat='39.81414' lon='-75.43796' />
+ <node id='-54889' lat='39.82548' lon='-75.46783' />
+ <node id='-54891' lat='39.83365' lon='-75.49942' />
+ <node id='-54893' lat='39.83945' lon='-75.53959' />
+ <node id='-54895' lat='39.83945' lon='-75.57632' />
+ <node id='-54897' lat='39.83734' lon='-75.59898' />
+ <node id='-54899' lat='39.83259' lon='-75.62713' />
+ <node id='-54901' lat='39.82337' lon='-75.65975' />
+ <node id='-54903' lat='39.81387' lon='-75.68172' />
+ <node id='-54905' lat='39.79515' lon='-75.71434' />
+ <node id='-54907' lat='39.78644' lon='-75.72532' />
+ <node id='-54909' lat='39.77378' lon='-75.74043' />
+ <node id='-54911' lat='39.75002' lon='-75.76' />
+ <node id='-54913' lat='39.7223' lon='-75.77476' />
+ <node id='-54915' lat='39.72204' lon='-75.78987' />
+ <node id='-54917' lat='39.65388' lon='-75.78918' />
+ <node id='-54919' lat='24.36791' lon='-83.18732' />
+ <node id='-54921' lat='30.71535' lon='-81.56078' />
+ <node id='-54923' lat='30.83098' lon='-81.95354' />
+ <node id='-54925' lat='30.77554' lon='-81.97826' />
+ <node id='-54927' lat='30.7897' lon='-82.01946' />
+ <node id='-54929' lat='30.66575' lon='-82.05105' />
+ <node id='-54931' lat='30.56765' lon='-82.00847' />
+ <node id='-54933' lat='30.36287' lon='-82.04555' />
+ <node id='-54935' lat='30.3605' lon='-82.17052' />
+ <node id='-54937' lat='30.40908' lon='-82.20897' />
+ <node id='-54939' lat='30.56765' lon='-82.2282' />
+ <node id='-54941' lat='30.7118' lon='-84.86355' />
+ <node id='-54943' lat='30.76256' lon='-84.92122' />
+ <node id='-54945' lat='30.88285' lon='-84.9377' />
+ <node id='-54947' lat='30.97591' lon='-85.00637' />
+ <node id='-54949' lat='35.0011' lon='-83.10796' />
+ <node id='-54951' lat='34.99098' lon='-83.09869' />
+ <node id='-54953' lat='34.9544' lon='-83.12616' />
+ <node id='-54955' lat='34.94033' lon='-83.11689' />
+ <node id='-54957' lat='34.87417' lon='-83.2374' />
+ <node id='-54959' lat='34.78878' lon='-83.32357' />
+ <node id='-54961' lat='34.75861' lon='-83.32048' />
+ <node id='-54963' lat='34.72814' lon='-83.35447' />
+ <node id='-54965' lat='34.69455' lon='-83.34829' />
+ <node id='-54967' lat='34.61096' lon='-83.22916' />
+ <node id='-54969' lat='34.60728' lon='-83.17148' />
+ <node id='-54971' lat='34.59259' lon='-83.16873' />
+ <node id='-54973' lat='34.48625' lon='-83.03655' />
+ <node id='-54975' lat='34.47238' lon='-83.00085' />
+ <node id='-54977' lat='34.48625' lon='-82.90231' />
+ <node id='-54979' lat='34.47408' lon='-82.87519' />
+ <node id='-54981' lat='34.36419' lon='-82.83365' />
+ <node id='-54983' lat='34.34039' lon='-82.79657' />
+ <node id='-54985' lat='34.29672' lon='-82.78043' />
+ <node id='-54987' lat='34.2709' lon='-82.75057' />
+ <node id='-54989' lat='34.20789' lon='-82.74095' />
+ <node id='-54991' lat='34.14882' lon='-82.71658' />
+ <node id='-54993' lat='34.0951' lon='-82.64311' />
+ <node id='-54995' lat='34.06809' lon='-82.64105' />
+ <node id='-54997' lat='34.02855' lon='-82.59538' />
+ <node id='-54999' lat='33.95567' lon='-82.56414' />
+ <node id='-55001' lat='33.85651' lon='-82.39008' />
+ <node id='-55003' lat='33.80062' lon='-82.3015' />
+ <node id='-55005' lat='33.66214' lon='-82.20022' />
+ <node id='-55007' lat='33.63013' lon='-82.19747' />
+ <node id='-55009' lat='33.59095' lon='-82.1343' />
+ <node id='-55011' lat='33.59782' lon='-82.10752' />
+ <node id='-55013' lat='33.56464' lon='-82.05019' />
+ <node id='-55015' lat='33.51342' lon='-81.99766' />
+ <node id='-55017' lat='33.48794' lon='-81.9877' />
+ <node id='-55019' lat='33.46674' lon='-81.92968' />
+ <node id='-55021' lat='33.43953' lon='-81.91354' />
+ <node id='-55023' lat='33.34609' lon='-81.93964' />
+ <node id='-55025' lat='33.30248' lon='-81.85587' />
+ <node id='-55027' lat='33.24622' lon='-81.85037' />
+ <node id='-55029' lat='33.20716' lon='-81.78858' />
+ <node id='-55031' lat='33.2198' lon='-81.77553' />
+ <node id='-55033' lat='33.19912' lon='-81.75974' />
+ <node id='-55035' lat='33.18303' lon='-81.7721' />
+ <node id='-55037' lat='33.15947' lon='-81.76248' />
+ <node id='-55039' lat='33.11807' lon='-81.70824' />
+ <node id='-55041' lat='33.09276' lon='-81.64163' />
+ <node id='-55043' lat='33.09564' lon='-81.62103' />
+ <node id='-55045' lat='33.00988' lon='-81.49538' />
+ <node id='-55047' lat='32.93557' lon='-81.50087' />
+ <node id='-55049' lat='32.84851' lon='-81.45555' />
+ <node id='-55051' lat='32.84101' lon='-81.42809' />
+ <node id='-55053' lat='32.65101' lon='-81.39581' />
+ <node id='-55055' lat='32.63193' lon='-81.41847' />
+ <node id='-55057' lat='32.59086' lon='-81.38277' />
+ <node id='-55059' lat='32.55788' lon='-81.3244' />
+ <node id='-55061' lat='32.55904' lon='-81.28595' />
+ <node id='-55063' lat='32.53531' lon='-81.27771' />
+ <node id='-55065' lat='32.46292' lon='-81.19257' />
+ <node id='-55067' lat='32.42409' lon='-81.20767' />
+ <node id='-55069' lat='32.29127' lon='-81.11772' />
+ <node id='-55071' lat='32.24017' lon='-81.15823' />
+ <node id='-55073' lat='32.1937' lon='-81.11978' />
+ <node id='-55075' lat='32.11638' lon='-81.11635' />
+ <node id='-55077' lat='32.08497' lon='-81.05386' />
+ <node id='-55079' lat='32.1001' lon='-81.00511' />
+ <node id='-55081' lat='32.03667' lon='-80.92066' />
+ <node id='-55083' lat='32.0326' lon='-80.49837' />
+ <node id='-55085' lat='42.00013' lon='-117.02619' />
+ <node id='-55087' lat='42.00049' lon='-111.04628' />
+ <node id='-55089' lat='44.47412' lon='-111.04897' />
+ <node id='-55091' lat='44.75395' lon='-111.38328' />
+ <node id='-55093' lat='44.64267' lon='-111.51237' />
+ <node id='-55095' lat='44.539' lon='-111.48765' />
+ <node id='-55097' lat='44.55662' lon='-112.31163' />
+ <node id='-55099' lat='44.44888' lon='-112.39403' />
+ <node id='-55101' lat='44.50571' lon='-112.71812' />
+ <node id='-55103' lat='44.43712' lon='-112.83897' />
+ <node id='-55105' lat='44.36255' lon='-112.82249' />
+ <node id='-55107' lat='44.45476' lon='-113.00926' />
+ <node id='-55109' lat='44.7754' lon='-113.13286' />
+ <node id='-55111' lat='44.82802' lon='-113.25645' />
+ <node id='-55113' lat='44.7871' lon='-113.3361' />
+ <node id='-55115' lat='44.93506' lon='-113.5009' />
+ <node id='-55117' lat='44.97005' lon='-113.44047' />
+ <node id='-55119' lat='45.05742' lon='-113.45421' />
+ <node id='-55121' lat='45.34385' lon='-113.75084' />
+ <node id='-55123' lat='45.59809' lon='-113.82225' />
+ <node id='-55125' lat='45.70752' lon='-113.98155' />
+ <node id='-55127' lat='45.46148' lon='-114.33861' />
+ <node id='-55129' lat='45.5731' lon='-114.54735' />
+ <node id='-55131' lat='45.77653' lon='-114.55559' />
+ <node id='-55133' lat='45.88752' lon='-114.39628' />
+ <node id='-55135' lat='46.04407' lon='-114.49516' />
+ <node id='-55137' lat='46.64887' lon='-114.31938' />
+ <node id='-55139' lat='46.64322' lon='-114.61052' />
+ <node id='-55141' lat='47.25631' lon='-115.33562' />
+ <node id='-55143' lat='47.43311' lon='-115.75859' />
+ <node id='-55145' lat='47.47953' lon='-115.63225' />
+ <node id='-55147' lat='47.55002' lon='-115.75859' />
+ <node id='-55149' lat='47.60746' lon='-115.68992' />
+ <node id='-55151' lat='47.97742' lon='-116.04835' />
+ <node id='-55153' lat='48.99999' lon='-116.04938' />
+ <node id='-55155' lat='49.00056' lon='-117.03266' />
+ <node id='-55157' lat='46.4257' lon='-117.04021' />
+ <node id='-55159' lat='46.42309' lon='-117.03644' />
+ <node id='-55161' lat='46.40794' lon='-117.03575' />
+ <node id='-55163' lat='46.37787' lon='-117.04914' />
+ <node id='-55165' lat='46.3665' lon='-117.06287' />
+ <node id='-55167' lat='46.34873' lon='-117.06184' />
+ <node id='-55169' lat='46.34281' lon='-117.04811' />
+ <node id='-55171' lat='46.34138' lon='-117.03472' />
+ <node id='-55173' lat='46.16048' lon='-116.92348' />
+ <node id='-55175' lat='46.08242' lon='-116.98116' />
+ <node id='-55177' lat='46.07004' lon='-116.94958' />
+ <node id='-55179' lat='45.99567' lon='-116.91799' />
+ <node id='-55181' lat='45.82129' lon='-116.77585' />
+ <node id='-55183' lat='45.7533' lon='-116.54789' />
+ <node id='-55185' lat='45.60746' lon='-116.46274' />
+ <node id='-55187' lat='45.3185' lon='-116.67972' />
+ <node id='-55189' lat='45.11342' lon='-116.75388' />
+ <node id='-55191' lat='45.02321' lon='-116.84864' />
+ <node id='-55193' lat='44.97563' lon='-116.85825' />
+ <node id='-55195' lat='44.92995' lon='-116.83353' />
+ <node id='-55197' lat='44.78588' lon='-116.9379' />
+ <node id='-55199' lat='44.74298' lon='-117.05051' />
+ <node id='-55201' lat='44.53093' lon='-117.15626' />
+ <node id='-55203' lat='44.48392' lon='-117.22492' />
+ <node id='-55205' lat='44.37408' lon='-117.24003' />
+ <node id='-55207' lat='44.34266' lon='-117.18921' />
+ <node id='-55209' lat='44.30238' lon='-117.22149' />
+ <node id='-55211' lat='44.26453' lon='-117.18304' />
+ <node id='-55213' lat='44.24387' lon='-116.97841' />
+ <node id='-55215' lat='44.19565' lon='-116.97155' />
+ <node id='-55217' lat='44.17792' lon='-116.90151' />
+ <node id='-55219' lat='44.15526' lon='-116.89602' />
+ <node id='-55221' lat='44.09513' lon='-116.94271' />
+ <node id='-55223' lat='44.08921' lon='-116.97429' />
+ <node id='-55225' lat='44.05172' lon='-116.97704' />
+ <node id='-55227' lat='44.03198' lon='-116.93722' />
+ <node id='-55229' lat='43.98654' lon='-116.93859' />
+ <node id='-55231' lat='43.96282' lon='-116.97704' />
+ <node id='-55233' lat='43.91734' lon='-116.96194' />
+ <node id='-55235' lat='43.8629' lon='-116.99215' />
+ <node id='-55237' lat='43.83121' lon='-117.02923' />
+ <node id='-55239' lat='42.49706' lon='-87.02282' />
+ <node id='-55241' lat='41.75764' lon='-87.20959' />
+ <node id='-55243' lat='41.76174' lon='-87.51995' />
+ <node id='-55245' lat='39.35835' lon='-87.52819' />
+ <node id='-55247' lat='39.33286' lon='-87.59411' />
+ <node id='-55249' lat='39.20103' lon='-87.59411' />
+ <node id='-55251' lat='39.15845' lon='-87.65453' />
+ <node id='-55253' lat='39.05188' lon='-87.57213' />
+ <node id='-55255' lat='38.98786' lon='-87.57213' />
+ <node id='-55257' lat='38.9537' lon='-87.5172' />
+ <node id='-55259' lat='38.86821' lon='-87.55565' />
+ <node id='-55261' lat='38.76121' lon='-87.49523' />
+ <node id='-55263' lat='38.68406' lon='-87.52819' />
+ <node id='-55265' lat='38.6712' lon='-87.61059' />
+ <node id='-55267' lat='38.51234' lon='-87.66552' />
+ <node id='-55269' lat='38.47364' lon='-87.75341' />
+ <node id='-55271' lat='38.4005' lon='-87.74792' />
+ <node id='-55273' lat='38.24535' lon='-87.97863' />
+ <node id='-55275' lat='38.14606' lon='-87.93468' />
+ <node id='-55277' lat='38.04231' lon='-88.03356' />
+ <node id='-55279' lat='37.8864' lon='-88.02257' />
+ <node id='-55281' lat='37.90807' lon='-88.09124' />
+ <node id='-55283' lat='37.80181' lon='-88.03356' />
+ <node id='-55285' lat='37.66279' lon='-88.15716' />
+ <node id='-55287' lat='37.47121' lon='-88.06652' />
+ <node id='-55289' lat='37.44286' lon='-88.30822' />
+ <node id='-55291' lat='37.40142' lon='-88.35491' />
+ <node id='-55293' lat='37.4276' lon='-88.40984' />
+ <node id='-55295' lat='37.39487' lon='-88.47301' />
+ <node id='-55297' lat='37.27476' lon='-88.51696' />
+ <node id='-55299' lat='37.15884' lon='-88.42357' />
+ <node id='-55301' lat='37.06247' lon='-88.46477' />
+ <node id='-55303' lat='37.06247' lon='-88.55266' />
+ <node id='-55305' lat='37.11505' lon='-88.62682' />
+ <node id='-55307' lat='37.23323' lon='-88.95916' />
+ <node id='-55309' lat='37.1676' lon='-89.09649' />
+ <node id='-55311' lat='37.01862' lon='-89.19536' />
+ <node id='-55313' lat='37.09314' lon='-89.286' />
+ <node id='-55315' lat='36.99011' lon='-89.28325' />
+ <node id='-55317' lat='37.04274' lon='-89.38488' />
+ <node id='-55319' lat='37.20698' lon='-89.46728' />
+ <node id='-55321' lat='37.28788' lon='-89.52495' />
+ <node id='-55323' lat='37.3403' lon='-89.49199' />
+ <node id='-55325' lat='37.35559' lon='-89.42882' />
+ <node id='-55327' lat='37.4385' lon='-89.43706' />
+ <node id='-55329' lat='37.52786' lon='-89.52221' />
+ <node id='-55331' lat='37.69322' lon='-89.52221' />
+ <node id='-55333' lat='37.90374' lon='-89.83806' />
+ <node id='-55335' lat='38.07258' lon='-90.18139' />
+ <node id='-55337' lat='38.20436' lon='-90.35168' />
+ <node id='-55339' lat='38.32728' lon='-90.37914' />
+ <node id='-55341' lat='38.43278' lon='-90.29674' />
+ <node id='-55343' lat='38.54027' lon='-90.26104' />
+ <node id='-55345' lat='38.60094' lon='-90.19031' />
+ <node id='-55347' lat='38.64385' lon='-90.17795' />
+ <node id='-55349' lat='38.68138' lon='-90.18894' />
+ <node id='-55351' lat='38.70604' lon='-90.21366' />
+ <node id='-55353' lat='38.73015' lon='-90.2116' />
+ <node id='-55355' lat='38.7778' lon='-90.16079' />
+ <node id='-55357' lat='38.79761' lon='-90.12234' />
+ <node id='-55359' lat='38.84789' lon='-90.1086' />
+ <node id='-55361' lat='38.91951' lon='-90.25554' />
+ <node id='-55363' lat='38.96438' lon='-90.41141' />
+ <node id='-55365' lat='38.96705' lon='-90.46429' />
+ <node id='-55367' lat='38.90616' lon='-90.50342' />
+ <node id='-55369' lat='38.87088' lon='-90.55767' />
+ <node id='-55371' lat='38.87302' lon='-90.59475' />
+ <node id='-55373' lat='38.94035' lon='-90.66822' />
+ <node id='-55375' lat='39.05828' lon='-90.71491' />
+ <node id='-55377' lat='39.09612' lon='-90.67989' />
+ <node id='-55379' lat='39.25847' lon='-90.72933' />
+ <node id='-55381' lat='39.45756' lon='-91.04656' />
+ <node id='-55383' lat='39.73481' lon='-91.37615' />
+ <node id='-55385' lat='39.80026' lon='-91.36242' />
+ <node id='-55387' lat='39.8551' lon='-91.44756' />
+ <node id='-55389' lat='40.18533' lon='-91.52996' />
+ <node id='-55391' lat='40.60368' lon='-91.3377' />
+ <node id='-55393' lat='40.66621' lon='-91.15093' />
+ <node id='-55395' lat='41.01115' lon='-90.96416' />
+ <node id='-55397' lat='41.28415' lon='-91.10149' />
+ <node id='-55399' lat='41.43259' lon='-91.04107' />
+ <node id='-55401' lat='41.46141' lon='-90.67303' />
+ <node id='-55403' lat='41.49565' lon='-90.60572' />
+ <node id='-55405' lat='41.51468' lon='-90.59267' />
+ <node id='-55407' lat='41.5274' lon='-90.54581' />
+ <node id='-55409' lat='41.51828' lon='-90.50667' />
+ <node id='-55411' lat='41.52162' lon='-90.46581' />
+ <node id='-55413' lat='41.57481' lon='-90.3956' />
+ <node id='-55415' lat='41.58803' lon='-90.34187' />
+ <node id='-55417' lat='41.65143' lon='-90.34325' />
+ <node id='-55419' lat='41.75012' lon='-90.30651' />
+ <node id='-55421' lat='41.809' lon='-90.18566' />
+ <node id='-55423' lat='42.0287' lon='-90.14515' />
+ <node id='-55425' lat='42.14692' lon='-90.19184' />
+ <node id='-55427' lat='42.22019' lon='-90.40333' />
+ <node id='-55429' lat='42.34617' lon='-90.43079' />
+ <node id='-55431' lat='42.48406' lon='-90.65258' />
+ <node id='-55433' lat='42.50785' lon='-90.64245' />
+ <node id='-55435' lat='41.761' lon='-84.80614' />
+ <node id='-55437' lat='39.10708' lon='-84.81884' />
+ <node id='-55439' lat='39.05911' lon='-84.89643' />
+ <node id='-55441' lat='38.97696' lon='-84.82433' />
+ <node id='-55443' lat='38.90486' lon='-84.88064' />
+ <node id='-55445' lat='38.88294' lon='-84.7852' />
+ <node id='-55447' lat='38.83054' lon='-84.82845' />
+ <node id='-55449' lat='38.78881' lon='-84.80991' />
+ <node id='-55451' lat='38.77543' lon='-84.99188' />
+ <node id='-55453' lat='38.68597' lon='-85.16628' />
+ <node id='-55455' lat='38.73848' lon='-85.2734' />
+ <node id='-55457' lat='38.72402' lon='-85.443' />
+ <node id='-55459' lat='38.53574' lon='-85.41828' />
+ <node id='-55461' lat='38.3825' lon='-85.6387' />
+ <node id='-55463' lat='38.3125' lon='-85.65723' />
+ <node id='-55465' lat='38.26345' lon='-85.74925' />
+ <node id='-55467' lat='38.28717' lon='-85.79182' />
+ <node id='-55469' lat='38.27316' lon='-85.84057' />
+ <node id='-55471' lat='38.23379' lon='-85.83576' />
+ <node id='-55473' lat='38.17552' lon='-85.90511' />
+ <node id='-55475' lat='38.0664' lon='-85.91267' />
+ <node id='-55477' lat='38.01016' lon='-85.94219' />
+ <node id='-55479' lat='37.99771' lon='-86.01772' />
+ <node id='-55481' lat='37.9582' lon='-86.04244' />
+ <node id='-55483' lat='38.01557' lon='-86.10973' />
+ <node id='-55485' lat='38.01611' lon='-86.20106' />
+ <node id='-55487' lat='38.05937' lon='-86.27728' />
+ <node id='-55489' lat='38.13989' lon='-86.27384' />
+ <node id='-55491' lat='38.17552' lon='-86.32465' />
+ <node id='-55493' lat='38.03288' lon='-86.52378' />
+ <node id='-55495' lat='37.91813' lon='-86.52309' />
+ <node id='-55497' lat='37.90133' lon='-86.74282' />
+ <node id='-55499' lat='37.99717' lon='-86.81217' />
+ <node id='-55501' lat='37.89971' lon='-87.04357' />
+ <node id='-55503' lat='37.82002' lon='-87.05387' />
+ <node id='-55505' lat='37.78313' lon='-87.09301' />
+ <node id='-55507' lat='37.7853' lon='-87.13078' />
+ <node id='-55509' lat='37.84334' lon='-87.16442' />
+ <node id='-55511' lat='37.90794' lon='-86.65645' />
+ <node id='-55513' lat='37.91303' lon='-86.58981' />
+ <node id='-55515' lat='37.83675' lon='-86.63556' />
+ <node id='-55517' lat='37.84768' lon='-87.23309' />
+ <node id='-55519' lat='37.94683' lon='-87.41093' />
+ <node id='-55521' lat='37.90567' lon='-87.51049' />
+ <node id='-55523' lat='37.94629' lon='-87.5771' />
+ <node id='-55525' lat='37.97336' lon='-87.59014' />
+ <node id='-55527' lat='37.92463' lon='-87.62447' />
+ <node id='-55529' lat='37.87912' lon='-87.58328' />
+ <node id='-55531' lat='37.82761' lon='-87.60662' />
+ <node id='-55533' lat='37.82273' lon='-87.67735' />
+ <node id='-55535' lat='37.90079' lon='-87.67666' />
+ <node id='-55537' lat='37.87478' lon='-87.83527' />
+ <node id='-55539' lat='37.92842' lon='-87.89089' />
+ <node id='-55541' lat='37.88427' lon='-87.94102' />
+ <node id='-55543' lat='37.82273' lon='-87.90222' />
+ <node id='-55545' lat='37.76983' lon='-87.95578' />
+ <node id='-55547' lat='42.65026' lon='-90.70901' />
+ <node id='-55549' lat='42.7068' lon='-91.02487' />
+ <node id='-55551' lat='42.7774' lon='-91.08804' />
+ <node id='-55553' lat='42.8761' lon='-91.09354' />
+ <node id='-55555' lat='42.93646' lon='-91.1622' />
+ <node id='-55557' lat='43.02085' lon='-91.15121' />
+ <node id='-55559' lat='43.17528' lon='-91.16769' />
+ <node id='-55561' lat='43.27334' lon='-91.07706' />
+ <node id='-55563' lat='43.31932' lon='-91.09628' />
+ <node id='-55565' lat='43.38123' lon='-91.21439' />
+ <node id='-55567' lat='43.4989' lon='-91.22537' />
+ <node id='-55569' lat='43.50089' lon='-96.60043' />
+ <node id='-55571' lat='43.31333' lon='-96.52902' />
+ <node id='-55573' lat='43.28334' lon='-96.58121' />
+ <node id='-55575' lat='43.22733' lon='-96.54275' />
+ <node id='-55577' lat='43.22133' lon='-96.48233' />
+ <node id='-55579' lat='43.11516' lon='-96.43838' />
+ <node id='-55581' lat='42.74513' lon='-96.63614' />
+ <node id='-55583' lat='42.57547' lon='-96.49057' />
+ <node id='-55585' lat='42.49249' lon='-96.47134' />
+ <node id='-55587' lat='42.49249' lon='-96.40268' />
+ <node id='-55589' lat='42.46616' lon='-96.38071' />
+ <node id='-55591' lat='42.4317' lon='-96.3862' />
+ <node id='-55593' lat='42.40737' lon='-96.41641' />
+ <node id='-55595' lat='42.02699' lon='-96.25162' />
+ <node id='-55597' lat='41.9678' lon='-96.14999' />
+ <node id='-55599' lat='41.53956' lon='-96.08682' />
+ <node id='-55601' lat='41.45728' lon='-95.91928' />
+ <node id='-55603' lat='41.34603' lon='-95.95224' />
+ <node id='-55605' lat='41.32489' lon='-95.93507' />
+ <node id='-55607' lat='41.31922' lon='-95.88701' />
+ <node id='-55609' lat='41.30426' lon='-95.8719' />
+ <node id='-55611' lat='41.28569' lon='-95.87602' />
+ <node id='-55613' lat='41.26917' lon='-95.92203' />
+ <node id='-55615' lat='41.23046' lon='-95.91173' />
+ <node id='-55617' lat='41.20566' lon='-95.93095' />
+ <node id='-55619' lat='41.18655' lon='-95.92203' />
+ <node id='-55621' lat='41.18861' lon='-95.86092' />
+ <node id='-55623' lat='41.18035' lon='-95.84512' />
+ <node id='-55625' lat='41.16484' lon='-95.84581' />
+ <node id='-55627' lat='41.16587' lon='-95.87534' />
+ <node id='-55629' lat='41.14985' lon='-95.88426' />
+ <node id='-55631' lat='41.08829' lon='-95.86298' />
+ <node id='-55633' lat='41.05568' lon='-95.88495' />
+ <node id='-55635' lat='40.67557' lon='-95.84238' />
+ <node id='-55637' lat='40.58647' lon='-95.77211' />
+ <node id='-55639' lat='40.61201' lon='-91.73074' />
+ <node id='-55641' lat='40.37471' lon='-91.44307' />
+ <node id='-55643' lat='36.9986' lon='-94.61795' />
+ <node id='-55645' lat='39.11895' lon='-94.60772' />
+ <node id='-55647' lat='39.13759' lon='-94.5909' />
+ <node id='-55649' lat='39.15384' lon='-94.58953' />
+ <node id='-55651' lat='39.16129' lon='-94.60601' />
+ <node id='-55653' lat='39.1533' lon='-94.64686' />
+ <node id='-55655' lat='39.15863' lon='-94.66128' />
+ <node id='-55657' lat='39.17673' lon='-94.66094' />
+ <node id='-55659' lat='39.18498' lon='-94.67845' />
+ <node id='-55661' lat='39.16874' lon='-94.72239' />
+ <node id='-55663' lat='39.17194' lon='-94.75157' />
+ <node id='-55665' lat='39.18684' lon='-94.77011' />
+ <node id='-55667' lat='39.20174' lon='-94.77664' />
+ <node id='-55669' lat='39.30383' lon='-94.90298' />
+ <node id='-55671' lat='39.35216' lon='-94.91122' />
+ <node id='-55673' lat='39.37446' lon='-94.87895' />
+ <node id='-55675' lat='39.39622' lon='-94.89405' />
+ <node id='-55677' lat='39.38561' lon='-94.92839' />
+ <node id='-55679' lat='39.53404' lon='-95.10348' />
+ <node id='-55681' lat='39.57851' lon='-95.10279' />
+ <node id='-55683' lat='39.67371' lon='-95.02177' />
+ <node id='-55685' lat='39.74133' lon='-94.86247' />
+ <node id='-55687' lat='39.75769' lon='-94.85903' />
+ <node id='-55689' lat='39.773' lon='-94.86865' />
+ <node id='-55691' lat='39.75875' lon='-94.90779' />
+ <node id='-55693' lat='39.77221' lon='-94.93491' />
+ <node id='-55695' lat='39.78804' lon='-94.93251' />
+ <node id='-55697' lat='39.79542' lon='-94.88272' />
+ <node id='-55699' lat='39.82391' lon='-94.87654' />
+ <node id='-55701' lat='40.00166' lon='-95.31497' />
+ <node id='-55703' lat='40.00324' lon='-102.04923' />
+ <node id='-55705' lat='36.9678' lon='-89.19146' />
+ <node id='-55707' lat='36.98097' lon='-89.10907' />
+ <node id='-55709' lat='36.56737' lon='-89.22168' />
+ <node id='-55711' lat='36.63352' lon='-89.36175' />
+ <node id='-55713' lat='36.50778' lon='-89.41668' />
+ <node id='-55715' lat='36.49674' lon='-88.05987' />
+ <node id='-55717' lat='36.67979' lon='-88.06536' />
+ <node id='-55719' lat='36.63792' lon='-87.80993' />
+ <node id='-55721' lat='36.65555' lon='-86.5932' />
+ <node id='-55723' lat='36.63572' lon='-86.56848' />
+ <node id='-55725' lat='36.65555' lon='-86.51355' />
+ <node id='-55727' lat='36.58281' lon='-83.69109' />
+ <node id='-55729' lat='36.75244' lon='-83.14074' />
+ <node id='-55731' lat='36.84701' lon='-83.08032' />
+ <node id='-55733' lat='36.88437' lon='-82.89904' />
+ <node id='-55735' lat='36.98316' lon='-82.86059' />
+ <node id='-55737' lat='37.04018' lon='-82.73425' />
+ <node id='-55739' lat='37.12564' lon='-82.72326' />
+ <node id='-55741' lat='37.2744' lon='-82.34698' />
+ <node id='-55743' lat='37.53839' lon='-81.9707' />
+ <node id='-55745' lat='39.14851' lon='-84.74887' />
+ <node id='-55747' lat='39.09844' lon='-84.68432' />
+ <node id='-55749' lat='39.07392' lon='-84.62252' />
+ <node id='-55751' lat='39.08671' lon='-84.56622' />
+ <node id='-55753' lat='39.10163' lon='-84.54631' />
+ <node id='-55755' lat='39.09151' lon='-84.51747' />
+ <node id='-55757' lat='39.0995' lon='-84.49893' />
+ <node id='-55759' lat='39.12188' lon='-84.47695' />
+ <node id='-55761' lat='39.11922' lon='-84.4488' />
+ <node id='-55763' lat='39.09577' lon='-84.4337' />
+ <node id='-55765' lat='39.05739' lon='-84.43026' />
+ <node id='-55767' lat='39.0446' lon='-84.41035' />
+ <node id='-55769' lat='39.0382' lon='-84.34924' />
+ <node id='-55771' lat='38.99445' lon='-84.30117' />
+ <node id='-55773' lat='38.95334' lon='-84.29293' />
+ <node id='-55775' lat='38.88176' lon='-84.23388' />
+ <node id='-55777' lat='38.81331' lon='-84.23388' />
+ <node id='-55779' lat='38.77263' lon='-84.07183' />
+ <node id='-55781' lat='38.78762' lon='-83.95648' />
+ <node id='-55783' lat='38.69765' lon='-83.79443' />
+ <node id='-55785' lat='38.65047' lon='-83.7752' />
+ <node id='-55787' lat='38.62902' lon='-83.66534' />
+ <node id='-55789' lat='38.67621' lon='-83.62414' />
+ <node id='-55791' lat='38.70408' lon='-83.52801' />
+ <node id='-55793' lat='38.64618' lon='-83.33575' />
+ <node id='-55795' lat='38.60112' lon='-83.31652' />
+ <node id='-55797' lat='38.59897' lon='-83.27533' />
+ <node id='-55799' lat='38.63116' lon='-83.24511' />
+ <node id='-55801' lat='38.61614' lon='-83.20117' />
+ <node id='-55803' lat='38.62258' lon='-83.14898' />
+ <node id='-55805' lat='38.67621' lon='-83.10778' />
+ <node id='-55807' lat='37.56235' lon='-82.13961' />
+ <node id='-55809' lat='37.63416' lon='-82.17669' />
+ <node id='-55811' lat='37.67656' lon='-82.29754' />
+ <node id='-55813' lat='37.77758' lon='-82.33462' />
+ <node id='-55815' lat='37.84593' lon='-82.41702' />
+ <node id='-55817' lat='37.93372' lon='-82.49392' />
+ <node id='-55819' lat='37.98569' lon='-82.46646' />
+ <node id='-55821' lat='38.13922' lon='-82.63263' />
+ <node id='-55823' lat='38.1673' lon='-82.64361' />
+ <node id='-55825' lat='38.17378' lon='-82.60791' />
+ <node id='-55827' lat='38.21156' lon='-82.59692' />
+ <node id='-55829' lat='38.24176' lon='-82.61203' />
+ <node id='-55831' lat='38.25039' lon='-82.58319' />
+ <node id='-55833' lat='38.32261' lon='-82.57495' />
+ <node id='-55835' lat='38.342' lon='-82.59692' />
+ <node id='-55837' lat='38.42382' lon='-82.59692' />
+ <node id='-55839' lat='38.47329' lon='-82.61203' />
+ <node id='-55841' lat='38.55603' lon='-82.72601' />
+ <node id='-55843' lat='38.56355' lon='-82.79879' />
+ <node id='-55845' lat='38.58502' lon='-82.84549' />
+ <node id='-55847' lat='38.69121' lon='-82.87844' />
+ <node id='-55849' lat='38.73943' lon='-82.8702' />
+ <node id='-55851' lat='38.7555' lon='-82.89492' />
+ <node id='-55853' lat='38.72765' lon='-82.97869' />
+ <node id='-55855' lat='38.72872' lon='-83.02951' />
+ <node id='-55857' lat='38.69336' lon='-83.0556' />
+ <node id='-55859' lat='29.81005' lon='-93.92382' />
+ <node id='-55861' lat='30.05521' lon='-93.71508' />
+ <node id='-55863' lat='30.28791' lon='-93.70959' />
+ <node id='-55865' lat='30.33771' lon='-93.76452' />
+ <node id='-55867' lat='31.03684' lon='-93.52008' />
+ <node id='-55869' lat='31.91524' lon='-93.92932' />
+ <node id='-55871' lat='32.00379' lon='-94.04467' />
+ <node id='-55873' lat='32.31769' lon='-90.90533' />
+ <node id='-55875' lat='31.54147' lon='-91.44641' />
+ <node id='-55877' lat='31.00153' lon='-91.63317' />
+ <node id='-55879' lat='31.00389' lon='-89.73529' />
+ <node id='-55881' lat='30.67373' lon='-89.85339' />
+ <node id='-55883' lat='30.5177' lon='-89.77374' />
+ <node id='-55885' lat='30.46089' lon='-89.69134' />
+ <node id='-55887' lat='30.1835' lon='-89.58972' />
+ <node id='-55889' lat='43.56977' lon='-70.97613' />
+ <node id='-55891' lat='43.55783' lon='-70.95278' />
+ <node id='-55893' lat='43.3884' lon='-70.98849' />
+ <node id='-55895' lat='43.33749' lon='-70.96377' />
+ <node id='-55897' lat='43.33549' lon='-70.93493' />
+ <node id='-55899' lat='43.29052' lon='-70.89648' />
+ <node id='-55901' lat='43.23052' lon='-70.81271' />
+ <node id='-55903' lat='43.13238' lon='-70.83331' />
+ <node id='-55905' lat='43.07272' lon='-70.73786' />
+ <node id='-55907' lat='43.07623' lon='-70.70422' />
+ <node id='-55909' lat='43.04463' lon='-70.70216' />
+ <node id='-55911' lat='38.02735' lon='-75.16879' />
+ <node id='-55913' lat='37.99597' lon='-75.62472' />
+ <node id='-55915' lat='37.94509' lon='-75.65768' />
+ <node id='-55917' lat='37.90934' lon='-75.88153' />
+ <node id='-55919' lat='37.8985' lon='-76.23034' />
+ <node id='-55921' lat='38.15704' lon='-76.61074' />
+ <node id='-55923' lat='38.23475' lon='-76.92248' />
+ <node id='-55925' lat='38.42973' lon='-77.03784' />
+ <node id='-55927' lat='38.35223' lon='-77.20813' />
+ <node id='-55929' lat='38.38454' lon='-77.28778' />
+ <node id='-55931' lat='38.50178' lon='-77.28915' />
+ <node id='-55933' lat='38.6038' lon='-77.21225' />
+ <node id='-55935' lat='38.63385' lon='-77.12161' />
+ <node id='-55937' lat='38.68103' lon='-77.12023' />
+ <node id='-55939' lat='38.70568' lon='-77.08041' />
+ <node id='-55941' lat='38.70568' lon='-77.04196' />
+ <node id='-55943' lat='38.9699' lon='-77.1477' />
+ <node id='-55945' lat='38.97417' lon='-77.22186' />
+ <node id='-55947' lat='39.00192' lon='-77.25619' />
+ <node id='-55949' lat='39.02006' lon='-77.23971' />
+ <node id='-55951' lat='39.05846' lon='-77.30975' />
+ <node id='-55953' lat='39.07872' lon='-77.46081' />
+ <node id='-55955' lat='39.11282' lon='-77.48416' />
+ <node id='-55957' lat='39.12135' lon='-77.51849' />
+ <node id='-55959' lat='39.14691' lon='-77.5281' />
+ <node id='-55961' lat='39.18311' lon='-77.51162' />
+ <node id='-55963' lat='39.18844' lon='-77.47729' />
+ <node id='-55965' lat='39.22462' lon='-77.45532' />
+ <node id='-55967' lat='39.25227' lon='-77.49102' />
+ <node id='-55969' lat='39.27247' lon='-77.54596' />
+ <node id='-55971' lat='39.30861' lon='-77.56655' />
+ <node id='-55973' lat='39.3033' lon='-77.61462' />
+ <node id='-55975' lat='39.32667' lon='-77.68054' />
+ <node id='-55977' lat='39.32349' lon='-77.73135' />
+ <node id='-55979' lat='39.72086' lon='-79.47663' />
+ <node id='-55981' lat='39.20187' lon='-79.48702' />
+ <node id='-55983' lat='39.22448' lon='-79.42831' />
+ <node id='-55985' lat='39.27261' lon='-79.37853' />
+ <node id='-55987' lat='39.27526' lon='-79.35999' />
+ <node id='-55989' lat='39.29652' lon='-79.33801' />
+ <node id='-55991' lat='39.30502' lon='-79.31158' />
+ <node id='-55993' lat='39.29865' lon='-79.29235' />
+ <node id='-55995' lat='39.35575' lon='-79.25321' />
+ <node id='-55997' lat='39.36424' lon='-79.21579' />
+ <node id='-55999' lat='39.38733' lon='-79.19657' />
+ <node id='-56001' lat='39.47643' lon='-79.06885' />
+ <node id='-56003' lat='39.4804' lon='-79.0455' />
+ <node id='-56005' lat='39.43958' lon='-78.96688' />
+ <node id='-56007' lat='39.5678' lon='-78.83951' />
+ <node id='-56009' lat='39.56065' lon='-78.81925' />
+ <node id='-56011' lat='39.63472' lon='-78.79659' />
+ <node id='-56013' lat='39.64715' lon='-78.76501' />
+ <node id='-56015' lat='39.62177' lon='-78.77702' />
+ <node id='-56017' lat='39.62388' lon='-78.73789' />
+ <node id='-56019' lat='39.60775' lon='-78.73892' />
+ <node id='-56021' lat='39.60457' lon='-78.77771' />
+ <node id='-56023' lat='39.58262' lon='-78.76364' />
+ <node id='-56025' lat='39.58632' lon='-78.73789' />
+ <node id='-56027' lat='39.56356' lon='-78.72621' />
+ <node id='-56029' lat='39.53576' lon='-78.66167' />
+ <node id='-56031' lat='39.5167' lon='-78.46872' />
+ <node id='-56033' lat='39.617' lon='-78.40658' />
+ <node id='-56035' lat='39.59479' lon='-78.31732' />
+ <node id='-56037' lat='39.69524' lon='-78.18411' />
+ <node id='-56039' lat='39.68203' lon='-78.10789' />
+ <node id='-56041' lat='39.64768' lon='-78.05021' />
+ <node id='-56043' lat='39.42632' lon='-77.75289' />
+ <node id='-56045' lat='39.43587' lon='-77.79821' />
+ <node id='-56047' lat='39.49312' lon='-77.78036' />
+ <node id='-56049' lat='39.49842' lon='-77.84216' />
+ <node id='-56051' lat='39.55774' lon='-77.88885' />
+ <node id='-56053' lat='39.56621' lon='-77.83392' />
+ <node id='-56055' lat='39.60431' lon='-77.83392' />
+ <node id='-56057' lat='39.617' lon='-77.87512' />
+ <node id='-56059' lat='39.60113' lon='-78.01107' />
+ <node id='-56061' lat='42.0867' lon='-73.50942' />
+ <node id='-56063' lat='42.74494' lon='-73.26498' />
+ <node id='-56065' lat='42.69651' lon='-71.29465' />
+ <node id='-56067' lat='42.74343' lon='-71.25139' />
+ <node id='-56069' lat='42.7399' lon='-71.18273' />
+ <node id='-56071' lat='42.79484' lon='-71.18616' />
+ <node id='-56073' lat='42.82305' lon='-71.13878' />
+ <node id='-56075' lat='42.80744' lon='-71.06531' />
+ <node id='-56077' lat='42.85981' lon='-71.04196' />
+ <node id='-56079' lat='42.86887' lon='-70.96781' />
+ <node id='-56081' lat='42.88698' lon='-70.92592' />
+ <node id='-56083' lat='42.88446' lon='-70.88541' />
+ <node id='-56085' lat='42.86182' lon='-70.84627' />
+ <node id='-56087' lat='42.8739' lon='-70.81606' />
+ <node id='-56089' lat='42.00779' lon='-71.8001' />
+ <node id='-56091' lat='42.0194' lon='-71.38117' />
+ <node id='-56093' lat='41.89277' lon='-71.3822' />
+ <node id='-56095' lat='41.89916' lon='-71.33894' />
+ <node id='-56097' lat='41.79814' lon='-71.341' />
+ <node id='-56099' lat='41.7815' lon='-71.32898' />
+ <node id='-56101' lat='41.75231' lon='-71.26135' />
+ <node id='-56103' lat='41.67465' lon='-71.19577' />
+ <node id='-56105' lat='41.65952' lon='-71.13432' />
+ <node id='-56107' lat='41.60717' lon='-71.14153' />
+ <node id='-56109' lat='41.591' lon='-71.13123' />
+ <node id='-56111' lat='41.43444' lon='-71.10101' />
+ <node id='-56113' lat='40.56828' lon='-69.97282' />
+ <node id='-56115' lat='41.69747' lon='-84.80645' />
+ <node id='-56117' lat='41.73233' lon='-83.42355' />
+ <node id='-56119' lat='41.95671' lon='-83.11184' />
+ <node id='-56121' lat='46.56636' lon='-90.42047' />
+ <node id='-56123' lat='46.53331' lon='-90.39026' />
+ <node id='-56125' lat='46.5522' lon='-90.33396' />
+ <node id='-56127' lat='46.50212' lon='-90.2186' />
+ <node id='-56129' lat='46.3355' lon='-90.11148' />
+ <node id='-56131' lat='46.14078' lon='-89.09387' />
+ <node id='-56133' lat='46.02457' lon='-88.8096' />
+ <node id='-56135' lat='45.98832' lon='-88.64618' />
+ <node id='-56137' lat='46.02362' lon='-88.51846' />
+ <node id='-56139' lat='45.95587' lon='-88.30835' />
+ <node id='-56141' lat='45.9234' lon='-88.10098' />
+ <node id='-56143' lat='45.87371' lon='-88.07901' />
+ <node id='-56145' lat='45.82205' lon='-88.13669' />
+ <node id='-56147' lat='45.78088' lon='-88.0845' />
+ <node id='-56149' lat='45.79333' lon='-88.01172' />
+ <node id='-56151' lat='45.75023' lon='-87.86752' />
+ <node id='-56153' lat='45.67639' lon='-87.77826' />
+ <node id='-56155' lat='45.65912' lon='-87.83182' />
+ <node id='-56157' lat='45.6063' lon='-87.77414' />
+ <node id='-56159' lat='45.56209' lon='-87.79474' />
+ <node id='-56161' lat='45.57074' lon='-87.84143' />
+ <node id='-56163' lat='45.53805' lon='-87.80435' />
+ <node id='-56165' lat='45.47067' lon='-87.8071' />
+ <node id='-56167' lat='45.43888' lon='-87.85791' />
+ <node id='-56169' lat='45.35499' lon='-87.87027' />
+ <node id='-56171' lat='45.35209' lon='-87.75903' />
+ <node id='-56173' lat='45.38972' lon='-87.69724' />
+ <node id='-56175' lat='45.34534' lon='-87.64368' />
+ <node id='-56177' lat='45.19554' lon='-87.74118' />
+ <node id='-56179' lat='45.10643' lon='-87.65741' />
+ <node id='-56181' lat='45.07735' lon='-87.44318' />
+ <node id='-56183' lat='45.20134' lon='-87.41022' />
+ <node id='-56185' lat='45.44563' lon='-87.09574' />
+ <node id='-56187' lat='45.44467' lon='-86.7428' />
+ <node id='-56189' lat='45.23713' lon='-86.25116' />
+ <node id='-56191' lat='43.50083' lon='-96.45334' />
+ <node id='-56193' lat='45.29706' lon='-96.45334' />
+ <node id='-56195' lat='45.36367' lon='-96.49591' />
+ <node id='-56197' lat='45.41382' lon='-96.68405' />
+ <node id='-56199' lat='45.62263' lon='-96.86258' />
+ <node id='-56201' lat='45.74735' lon='-96.65109' />
+ <node id='-56203' lat='45.82588' lon='-96.58106' />
+ <node id='-56205' lat='45.93486' lon='-96.56732' />
+ <node id='-56207' lat='46.32981' lon='-96.60303' />
+ <node id='-56209' lat='46.45011' lon='-96.72525' />
+ <node id='-56211' lat='46.63902' lon='-96.7898' />
+ <node id='-56213' lat='46.81035' lon='-96.79666' />
+ <node id='-56215' lat='46.92114' lon='-96.76233' />
+ <node id='-56217' lat='47.0083' lon='-96.83511' />
+ <node id='-56219' lat='47.60148' lon='-96.85983' />
+ <node id='-56221' lat='47.89144' lon='-97.02738' />
+ <node id='-56223' lat='47.91905' lon='-97.01639' />
+ <node id='-56225' lat='47.9485' lon='-97.05484' />
+ <node id='-56227' lat='48.17245' lon='-97.14685' />
+ <node id='-56229' lat='48.59745' lon='-97.15372' />
+ <node id='-56231' lat='48.68275' lon='-97.09604' />
+ <node id='-56233' lat='48.99952' lon='-97.24024' />
+ <node id='-56235' lat='43.77649' lon='-91.24582' />
+ <node id='-56237' lat='43.99227' lon='-91.42572' />
+ <node id='-56239' lat='44.06533' lon='-91.65094' />
+ <node id='-56241' lat='44.3832' lon='-91.9874' />
+ <node id='-56243' lat='44.74132' lon='-92.82511' />
+ <node id='-56245' lat='44.82953' lon='-92.77017' />
+ <node id='-56247' lat='45.28643' lon='-92.76056' />
+ <node id='-56249' lat='45.40804' lon='-92.65207' />
+ <node id='-56251' lat='45.56786' lon='-92.76056' />
+ <node id='-56253' lat='45.56978' lon='-92.88416' />
+ <node id='-56255' lat='45.72051' lon='-92.8718' />
+ <node id='-56257' lat='45.76364' lon='-92.78803' />
+ <node id='-56259' lat='45.889' lon='-92.72348' />
+ <node id='-56261' lat='46.07794' lon='-92.29639' />
+ <node id='-56263' lat='46.66258' lon='-92.29227' />
+ <node id='-56265' lat='46.65221' lon='-92.2085' />
+ <node id='-56267' lat='46.69744' lon='-92.203' />
+ <node id='-56269' lat='46.75016' lon='-92.1055' />
+ <node id='-56271' lat='46.70498' lon='-92.02448' />
+ <node id='-56273' lat='40.99766' lon='-111.04675' />
+ <node id='-56275' lat='41.00188' lon='-104.0521' />
+ <node id='-56277' lat='44.99972' lon='-104.05897' />
+ <node id='-56279' lat='44.99947' lon='-111.05503' />
+ <node id='-56281' lat='34.99532' lon='-88.20029' />
+ <node id='-56283' lat='40.39775' lon='-95.65168' />
+ <node id='-56285' lat='36.46431' lon='-89.45127' />
+ <node id='-56287' lat='36.46541' lon='-89.48972' />
+ <node id='-56289' lat='36.55813' lon='-89.47187' />
+ <node id='-56291' lat='36.5846' lon='-89.52268' />
+ <node id='-56293' lat='36.56144' lon='-89.57212' />
+ <node id='-56295' lat='36.46762' lon='-89.52268' />
+ <node id='-56297' lat='36.43117' lon='-89.5474' />
+ <node id='-56299' lat='36.24754' lon='-89.57212' />
+ <node id='-56301' lat='36.24089' lon='-89.6916' />
+ <node id='-56303' lat='36.1478' lon='-89.58997' />
+ <node id='-56305' lat='36.10897' lon='-89.61332' />
+ <node id='-56307' lat='48.99925' lon='-104.05004' />
+ <node id='-56309' lat='43.00258' lon='-104.05548' />
+ <node id='-56311' lat='43.00058' lon='-98.50401' />
+ <node id='-56313' lat='42.93275' lon='-98.44908' />
+ <node id='-56315' lat='42.76612' lon='-97.99383' />
+ <node id='-56317' lat='42.77065' lon='-97.95057' />
+ <node id='-56319' lat='42.86685' lon='-97.84826' />
+ <node id='-56321' lat='42.84773' lon='-97.44314' />
+ <node id='-56323' lat='42.86736' lon='-97.40125' />
+ <node id='-56325' lat='42.85729' lon='-97.25019' />
+ <node id='-56327' lat='42.76813' lon='-97.11836' />
+ <node id='-56329' lat='42.76561' lon='-97.00575' />
+ <node id='-56331' lat='42.71922' lon='-96.94875' />
+ <node id='-56333' lat='42.73536' lon='-96.88627' />
+ <node id='-56335' lat='42.64805' lon='-96.69264' />
+ <node id='-56337' lat='42.60561' lon='-96.71461' />
+ <node id='-56339' lat='42.50344' lon='-96.60475' />
+ <node id='-56341' lat='42.51963' lon='-96.55187' />
+ <node id='-56343' lat='45.94728' lon='-104.05691' />
+ <node id='-56345' lat='42.00031' lon='-114.04073' />
+ <node id='-56347' lat='42.72515' lon='-72.45969' />
+ <node id='-56349' lat='42.77368' lon='-72.49456' />
+ <node id='-56351' lat='42.7636' lon='-72.51722' />
+ <node id='-56353' lat='42.78174' lon='-72.51173' />
+ <node id='-56355' lat='42.81147' lon='-72.54331' />
+ <node id='-56357' lat='42.85427' lon='-72.55705' />
+ <node id='-56359' lat='42.88497' lon='-72.55361' />
+ <node id='-56361' lat='42.89553' lon='-72.53301' />
+ <node id='-56363' lat='42.93626' lon='-72.52546' />
+ <node id='-56365' lat='42.95134' lon='-72.53233' />
+ <node id='-56367' lat='42.98099' lon='-72.46504' />
+ <node id='-56369' lat='43.05479' lon='-72.46092' />
+ <node id='-56371' lat='43.08388' lon='-72.43688' />
+ <node id='-56373' lat='43.13702' lon='-72.441' />
+ <node id='-56375' lat='43.14654' lon='-72.45611' />
+ <node id='-56377' lat='43.35659' lon='-72.39362' />
+ <node id='-56379' lat='43.36557' lon='-72.41491' />
+ <node id='-56381' lat='43.49472' lon='-72.38127' />
+ <node id='-56383' lat='43.51265' lon='-72.40049' />
+ <node id='-56385' lat='43.63553' lon='-72.32702' />
+ <node id='-56387' lat='43.70754' lon='-72.30093' />
+ <node id='-56389' lat='43.77302' lon='-72.20617' />
+ <node id='-56391' lat='43.8919' lon='-72.16291' />
+ <node id='-56393' lat='43.9201' lon='-72.12309' />
+ <node id='-56395' lat='43.9977' lon='-72.11141' />
+ <node id='-56397' lat='44.08408' lon='-72.04' />
+ <node id='-56399' lat='44.27514' lon='-72.06335' />
+ <node id='-56401' lat='44.31741' lon='-72.0249' />
+ <node id='-56403' lat='44.33411' lon='-71.9782' />
+ <node id='-56405' lat='44.34688' lon='-71.90679' />
+ <node id='-56407' lat='44.33706' lon='-71.86834' />
+ <node id='-56409' lat='44.35866' lon='-71.81753' />
+ <node id='-56411' lat='44.39891' lon='-71.79693' />
+ <node id='-56413' lat='44.41558' lon='-71.7008' />
+ <node id='-56415' lat='44.47343' lon='-71.639' />
+ <node id='-56417' lat='44.49302' lon='-71.59368' />
+ <node id='-56419' lat='44.56351' lon='-71.59231' />
+ <node id='-56421' lat='44.56351' lon='-71.56347' />
+ <node id='-56423' lat='44.58601' lon='-71.54287' />
+ <node id='-56425' lat='44.74912' lon='-71.63351' />
+ <node id='-56427' lat='44.79592' lon='-71.57583' />
+ <node id='-56429' lat='44.86214' lon='-71.55386' />
+ <node id='-56431' lat='44.90788' lon='-71.49618' />
+ <node id='-56433' lat='44.98758' lon='-71.54287' />
+ <node id='-56435' lat='39.80165' lon='-75.41621' />
+ <node id='-56437' lat='39.84842' lon='-75.33745' />
+ <node id='-56439' lat='39.85014' lon='-75.26809' />
+ <node id='-56441' lat='39.88294' lon='-75.16905' />
+ <node id='-56443' lat='39.88716' lon='-75.13986' />
+ <node id='-56445' lat='39.91073' lon='-75.12785' />
+ <node id='-56447' lat='39.93627' lon='-75.13815' />
+ <node id='-56449' lat='39.95786' lon='-75.13334' />
+ <node id='-56451' lat='39.97443' lon='-75.09901' />
+ <node id='-56453' lat='39.97969' lon='-75.0712' />
+ <node id='-56455' lat='40.01099' lon='-75.04682' />
+ <node id='-56457' lat='40.0202' lon='-75.01352' />
+ <node id='-56459' lat='40.05279' lon='-74.97164' />
+ <node id='-56461' lat='40.07224' lon='-74.9246' />
+ <node id='-56463' lat='40.06987' lon='-74.91224' />
+ <node id='-56465' lat='40.08432' lon='-74.8628' />
+ <node id='-56467' lat='40.10244' lon='-74.83774' />
+ <node id='-56469' lat='40.12633' lon='-74.82641' />
+ <node id='-56471' lat='40.1287' lon='-74.81542' />
+ <node id='-56473' lat='40.12187' lon='-74.7907' />
+ <node id='-56475' lat='40.13447' lon='-74.75843' />
+ <node id='-56477' lat='40.13473' lon='-74.74127' />
+ <node id='-56479' lat='40.14864' lon='-74.72341' />
+ <node id='-56481' lat='40.16045' lon='-74.72273' />
+ <node id='-56483' lat='40.17855' lon='-74.73852' />
+ <node id='-56485' lat='40.18774' lon='-74.75843' />
+ <node id='-56487' lat='40.2095' lon='-74.76701' />
+ <node id='-56489' lat='40.2234' lon='-74.78349' />
+ <node id='-56491' lat='40.24069' lon='-74.82504' />
+ <node id='-56493' lat='40.25013' lon='-74.84426' />
+ <node id='-56495' lat='40.28837' lon='-74.86315' />
+ <node id='-56497' lat='40.31246' lon='-74.89198' />
+ <node id='-56499' lat='40.3177' lon='-74.91396' />
+ <node id='-56501' lat='40.34152' lon='-74.94451' />
+ <node id='-56503' lat='40.36611' lon='-74.94966' />
+ <node id='-56505' lat='40.39592' lon='-74.96477' />
+ <node id='-56507' lat='40.40664' lon='-74.98743' />
+ <node id='-56509' lat='40.40534' lon='-75.03137' />
+ <node id='-56511' lat='40.4218' lon='-75.06124' />
+ <node id='-56513' lat='40.45525' lon='-75.07017' />
+ <node id='-56515' lat='40.48581' lon='-75.06365' />
+ <node id='-56517' lat='40.5388' lon='-75.06708' />
+ <node id='-56519' lat='40.56984' lon='-75.10347' />
+ <node id='-56521' lat='40.57453' lon='-75.12682' />
+ <node id='-56523' lat='40.57453' lon='-75.14776' />
+ <node id='-56525' lat='40.56332' lon='-75.16458' />
+ <node id='-56527' lat='40.56619' lon='-75.18106' />
+ <node id='-56529' lat='40.57844' lon='-75.1948' />
+ <node id='-56531' lat='40.59435' lon='-75.19068' />
+ <node id='-56533' lat='40.61259' lon='-75.19994' />
+ <node id='-56535' lat='40.62093' lon='-75.19102' />
+ <node id='-56537' lat='40.63865' lon='-75.19068' />
+ <node id='-56539' lat='40.64881' lon='-75.20029' />
+ <node id='-56541' lat='40.66939' lon='-75.18003' />
+ <node id='-56543' lat='39.66512' lon='-73.81773' />
+ <node id='-56545' lat='40.514' lon='-73.9166' />
+ <node id='-56547' lat='40.47954' lon='-74.23109' />
+ <node id='-56549' lat='40.49625' lon='-74.2613' />
+ <node id='-56551' lat='40.51427' lon='-74.25615' />
+ <node id='-56553' lat='40.52236' lon='-74.24722' />
+ <node id='-56555' lat='40.54532' lon='-74.25134' />
+ <node id='-56557' lat='40.55914' lon='-74.23418' />
+ <node id='-56559' lat='40.55836' lon='-74.21839' />
+ <node id='-56561' lat='40.59956' lon='-74.19985' />
+ <node id='-56563' lat='40.63162' lon='-74.20397' />
+ <node id='-56565' lat='40.64647' lon='-74.18577' />
+ <node id='-56567' lat='40.6436' lon='-74.12775' />
+ <node id='-56569' lat='40.65402' lon='-74.05668' />
+ <node id='-56571' lat='40.69959' lon='-74.02612' />
+ <node id='-56573' lat='40.7589' lon='-74.01445' />
+ <node id='-56575' lat='40.8509' lon='-73.95197' />
+ <node id='-56577' lat='40.91268' lon='-73.92072' />
+ <node id='-56579' lat='40.99461' lon='-73.89463' />
+ <node id='-56581' lat='41.18583' lon='-74.32825' />
+ <node id='-56583' lat='41.35872' lon='-74.6956' />
+ <node id='-56585' lat='41.33913' lon='-74.76152' />
+ <node id='-56587' lat='41.28136' lon='-74.83431' />
+ <node id='-56589' lat='41.1848' lon='-74.88237' />
+ <node id='-56591' lat='40.691' lon='-75.20372' />
+ <node id='-56593' lat='40.73107' lon='-75.18175' />
+ <node id='-56595' lat='40.75084' lon='-75.19617' />
+ <node id='-56597' lat='40.77893' lon='-75.17076' />
+ <node id='-56599' lat='40.77373' lon='-75.133' />
+ <node id='-56601' lat='40.82726' lon='-75.08219' />
+ <node id='-56603' lat='40.84804' lon='-75.09935' />
+ <node id='-56605' lat='40.84804' lon='-75.06777' />
+ <node id='-56607' lat='40.8657' lon='-75.05266' />
+ <node id='-56609' lat='40.98347' lon='-75.13849' />
+ <node id='-56611' lat='41.03995' lon='-75.02931' />
+ <node id='-56613' lat='31.99986' lon='-103.06402' />
+ <node id='-56615' lat='36.49992' lon='-103.04239' />
+ <node id='-56617' lat='36.50047' lon='-103.00325' />
+ <node id='-56619' lat='36.99417' lon='-103.00462' />
+ <node id='-56621' lat='31.80546' lon='-106.5436' />
+ <node id='-56623' lat='31.82938' lon='-106.60333' />
+ <node id='-56625' lat='31.89178' lon='-106.64522' />
+ <node id='-56627' lat='31.92151' lon='-106.62187' />
+ <node id='-56629' lat='32.00074' lon='-106.61981' />
+ <node id='-56631' lat='42.55308' lon='-79.77073' />
+ <node id='-56633' lat='42.00107' lon='-79.76349' />
+ <node id='-56635' lat='42.00515' lon='-75.3772' />
+ <node id='-56637' lat='41.80278' lon='-75.08057' />
+ <node id='-56639' lat='41.59155' lon='-75.0531' />
+ <node id='-56641' lat='41.48258' lon='-74.98718' />
+ <node id='-56643' lat='41.42288' lon='-74.74274' />
+ <node id='-56645' lat='43.57117' lon='-73.25409' />
+ <node id='-56647' lat='43.62686' lon='-73.33649' />
+ <node id='-56649' lat='43.57117' lon='-73.43811' />
+ <node id='-56651' lat='43.77182' lon='-73.35571' />
+ <node id='-56653' lat='44.07055' lon='-73.4436' />
+ <node id='-56655' lat='44.25969' lon='-73.3255' />
+ <node id='-56657' lat='45.00942' lon='-73.35025' />
+ <node id='-56659' lat='34.99393' lon='-84.32551' />
+ <node id='-56661' lat='35.224' lon='-84.28711' />
+ <node id='-56663' lat='35.27335' lon='-84.22943' />
+ <node id='-56665' lat='35.24419' lon='-84.1333' />
+ <node id='-56667' lat='35.29129' lon='-84.03717' />
+ <node id='-56669' lat='35.4324' lon='-84.0097' />
+ <node id='-56671' lat='35.56209' lon='-83.74603' />
+ <node id='-56673' lat='35.56433' lon='-83.50159' />
+ <node id='-56675' lat='35.76961' lon='-83.13904' />
+ <node id='-56677' lat='35.78744' lon='-82.97424' />
+ <node id='-56679' lat='36.06989' lon='-82.64191' />
+ <node id='-56681' lat='35.96103' lon='-82.57324' />
+ <node id='-56683' lat='36.16086' lon='-82.22992' />
+ <node id='-56685' lat='36.11872' lon='-82.06238' />
+ <node id='-56687' lat='36.36682' lon='-81.82617' />
+ <node id='-56689' lat='36.33806' lon='-81.72455' />
+ <node id='-56691' lat='36.58987' lon='-81.66962' />
+ <node id='-56693' lat='33.38485' lon='-77.99552' />
+ <node id='-56695' lat='34.81124' lon='-79.68109' />
+ <node id='-56697' lat='34.82252' lon='-80.78796' />
+ <node id='-56699' lat='34.94193' lon='-80.79346' />
+ <node id='-56701' lat='35.08815' lon='-80.9198' />
+ <node id='-56703' lat='35.04993' lon='-81.04889' />
+ <node id='-56705' lat='35.15105' lon='-81.04889' />
+ <node id='-56707' lat='35.20044' lon='-82.39746' />
+ <node id='-56709' lat='42.29896' lon='-80.53581' />
+ <node id='-56711' lat='39.72222' lon='-80.52292' />
+ <node id='-56713' lat='46.00052' lon='-118.98743' />
+ <node id='-56715' lat='45.92797' lon='-119.1378' />
+ <node id='-56717' lat='45.94086' lon='-119.26826' />
+ <node id='-56719' lat='45.90647' lon='-119.4928' />
+ <node id='-56721' lat='45.92654' lon='-119.6109' />
+ <node id='-56723' lat='45.85772' lon='-119.67064' />
+ <node id='-56725' lat='45.82375' lon='-119.96658' />
+ <node id='-56727' lat='45.7663' lon='-120.16502' />
+ <node id='-56729' lat='45.72701' lon='-120.21103' />
+ <node id='-56731' lat='45.69537' lon='-120.50079' />
+ <node id='-56733' lat='45.74043' lon='-120.56053' />
+ <node id='-56735' lat='45.74714' lon='-120.63538' />
+ <node id='-56737' lat='45.65219' lon='-120.89493' />
+ <node id='-56739' lat='45.65075' lon='-121.08307' />
+ <node id='-56741' lat='45.60609' lon='-121.14899' />
+ <node id='-56743' lat='45.61282' lon='-121.19156' />
+ <node id='-56745' lat='45.66802' lon='-121.21284' />
+ <node id='-56747' lat='45.70592' lon='-121.34674' />
+ <node id='-56749' lat='45.69489' lon='-121.41266' />
+ <node id='-56751' lat='45.7227' lon='-121.53008' />
+ <node id='-56753' lat='45.69489' lon='-121.71478' />
+ <node id='-56755' lat='45.71215' lon='-121.81366' />
+ <node id='-56757' lat='45.55275' lon='-122.23595' />
+ <node id='-56759' lat='45.54697' lon='-122.32384' />
+ <node id='-56761' lat='45.5739' lon='-122.38014' />
+ <node id='-56763' lat='45.5638' lon='-122.43919' />
+ <node id='-56765' lat='45.57942' lon='-122.47456' />
+ <node id='-56767' lat='45.61786' lon='-122.67609' />
+ <node id='-56769' lat='45.65747' lon='-122.76501' />
+ <node id='-56771' lat='45.68745' lon='-122.77668' />
+ <node id='-56773' lat='45.7378' lon='-122.76157' />
+ <node id='-56775' lat='45.76654' lon='-122.76501' />
+ <node id='-56777' lat='45.81203' lon='-122.79591' />
+ <node id='-56779' lat='45.86704' lon='-122.78492' />
+ <node id='-56781' lat='45.91627' lon='-122.81445' />
+ <node id='-56783' lat='45.96068' lon='-122.81033' />
+ <node id='-56785' lat='46.03414' lon='-122.87762' />
+ <node id='-56787' lat='46.07797' lon='-122.8941' />
+ <node id='-56789' lat='46.10654' lon='-122.96688' />
+ <node id='-56791' lat='46.13605' lon='-123.00945' />
+ <node id='-56793' lat='46.18647' lon='-123.13442' />
+ <node id='-56795' lat='46.18694' lon='-123.17837' />
+ <node id='-56797' lat='46.14367' lon='-123.28754' />
+ <node id='-56799' lat='46.14842' lon='-123.38093' />
+ <node id='-56801' lat='46.18219' lon='-123.43243' />
+ <node id='-56803' lat='46.23351' lon='-123.42968' />
+ <node id='-56805' lat='46.26864' lon='-123.47431' />
+ <node id='-56807' lat='46.25583' lon='-123.58349' />
+ <node id='-56809' lat='46.23588' lon='-123.87806' />
+ <node id='-56811' lat='46.23968' lon='-123.92818' />
+ <node id='-56813' lat='46.30281' lon='-124.02981' />
+ <node id='-56815' lat='46.26295' lon='-124.03873' />
+ <node id='-56817' lat='46.26295' lon='-124.14997' />
+ <node id='-56819' lat='45.67502' lon='-121.90097' />
+ <node id='-56821' lat='45.58514' lon='-122.14899' />
+ <node id='-56823' lat='45.62074' lon='-121.9891' />
+ <node id='-56825' lat='46.2631' lon='-125.2772' />
+ <node id='-56827' lat='36.50078' lon='-100.00134' />
+ <node id='-56829' lat='34.56197' lon='-99.99928' />
+ <node id='-56831' lat='34.56197' lon='-99.9725' />
+ <node id='-56833' lat='34.5778' lon='-99.95464' />
+ <node id='-56835' lat='34.57836' lon='-99.92443' />
+ <node id='-56837' lat='34.42841' lon='-99.76444' />
+ <node id='-56839' lat='34.40462' lon='-99.71638' />
+ <node id='-56841' lat='34.38932' lon='-99.71226' />
+ <node id='-56843' lat='34.37515' lon='-99.66557' />
+ <node id='-56845' lat='34.37629' lon='-99.59965' />
+ <node id='-56847' lat='34.38989' lon='-99.58523' />
+ <node id='-56849' lat='34.41821' lon='-99.58111' />
+ <node id='-56851' lat='34.41198' lon='-99.50489' />
+ <node id='-56853' lat='34.37515' lon='-99.43554' />
+ <node id='-56855' lat='34.37799' lon='-99.39915' />
+ <node id='-56857' lat='34.44257' lon='-99.39434' />
+ <node id='-56859' lat='34.45899' lon='-99.37717' />
+ <node id='-56861' lat='34.36439' lon='-99.23916' />
+ <node id='-56863' lat='34.22029' lon='-99.18354' />
+ <node id='-56865' lat='34.20042' lon='-99.04415' />
+ <node id='-56867' lat='34.22313' lon='-98.98579' />
+ <node id='-56869' lat='34.1277' lon='-98.75164' />
+ <node id='-56871' lat='34.1635' lon='-98.64452' />
+ <node id='-56873' lat='34.15384' lon='-98.58616' />
+ <node id='-56875' lat='34.06572' lon='-98.49277' />
+ <node id='-56877' lat='34.09074' lon='-98.409' />
+ <node id='-56879' lat='34.15384' lon='-98.37879' />
+ <node id='-56881' lat='34.11462' lon='-98.16662' />
+ <node id='-56883' lat='34.15725' lon='-98.12061' />
+ <node id='-56885' lat='34.13111' lon='-98.08834' />
+ <node id='-56887' lat='34.07653' lon='-98.12061' />
+ <node id='-56889' lat='34.00483' lon='-98.08697' />
+ <node id='-56891' lat='33.99459' lon='-97.95033' />
+ <node id='-56893' lat='33.89547' lon='-97.98191' />
+ <node id='-56895' lat='33.85043' lon='-97.87067' />
+ <node id='-56897' lat='33.87552' lon='-97.81368' />
+ <node id='-56899' lat='33.99117' lon='-97.68116' />
+ <node id='-56901' lat='33.95701' lon='-97.59258' />
+ <node id='-56903' lat='33.90687' lon='-97.59327' />
+ <node id='-56905' lat='33.89832' lon='-97.55138' />
+ <node id='-56907' lat='33.92169' lon='-97.49783' />
+ <node id='-56909' lat='33.89718' lon='-97.45251' />
+ <node id='-56911' lat='33.83218' lon='-97.45731' />
+ <node id='-56913' lat='33.82135' lon='-97.40513' />
+ <node id='-56915' lat='33.82648' lon='-97.3605' />
+ <node id='-56917' lat='33.88521' lon='-97.30762' />
+ <node id='-56919' lat='33.85899' lon='-97.26849' />
+ <node id='-56921' lat='33.91713' lon='-97.23553' />
+ <node id='-56923' lat='33.90402' lon='-97.1854' />
+ <node id='-56925' lat='33.84473' lon='-97.16686' />
+ <node id='-56927' lat='33.81735' lon='-97.20394' />
+ <node id='-56929' lat='33.75115' lon='-97.18334' />
+ <node id='-56931' lat='33.72317' lon='-97.15038' />
+ <node id='-56933' lat='33.72603' lon='-97.09888' />
+ <node id='-56935' lat='33.75857' lon='-97.08515' />
+ <node id='-56937' lat='33.80252' lon='-97.09614' />
+ <node id='-56939' lat='33.89376' lon='-96.98215' />
+ <node id='-56941' lat='33.93365' lon='-96.99245' />
+ <node id='-56943' lat='33.95871' lon='-96.93958' />
+ <node id='-56945' lat='33.94163' lon='-96.90113' />
+ <node id='-56947' lat='33.85386' lon='-96.86954' />
+ <node id='-56949' lat='33.87267' lon='-96.81118' />
+ <node id='-56951' lat='33.82648' lon='-96.75762' />
+ <node id='-56953' lat='33.8396' lon='-96.70887' />
+ <node id='-56955' lat='33.91599' lon='-96.6663' />
+ <node id='-56957' lat='33.89262' lon='-96.58733' />
+ <node id='-56959' lat='33.85157' lon='-96.62441' />
+ <node id='-56961' lat='33.82021' lon='-96.57497' />
+ <node id='-56963' lat='33.82252' lon='-97.05221' />
+ <node id='-56965' lat='33.84657' lon='-97.02691' />
+ <node id='-56967' lat='33.85614' lon='-97.08515' />
+ <node id='-56969' lat='33.76657' lon='-94.88651' />
+ <node id='-56971' lat='33.92397' lon='-95.10349' />
+ <node id='-56973' lat='33.96726' lon='-95.2216' />
+ <node id='-56975' lat='33.88521' lon='-95.28477' />
+ <node id='-56977' lat='33.87381' lon='-95.43034' />
+ <node id='-56979' lat='33.89661' lon='-95.54295' />
+ <node id='-56981' lat='33.93992' lon='-95.57041' />
+ <node id='-56983' lat='33.84416' lon='-95.84232' />
+ <node id='-56985' lat='33.88749' lon='-95.93296' />
+ <node id='-56987' lat='33.82135' lon='-96.16367' />
+ <node id='-56989' lat='33.75743' lon='-96.18565' />
+ <node id='-56991' lat='33.75743' lon='-96.22959' />
+ <node id='-56993' lat='33.7757' lon='-96.29002' />
+ <node id='-56995' lat='33.7049' lon='-96.32023' />
+ <node id='-56997' lat='33.68661' lon='-96.35044' />
+ <node id='-56999' lat='33.78026' lon='-96.42735' />
+ <node id='-57001' lat='33.77342' lon='-96.507' />
+ <node id='-57003' lat='33.82591' lon='-96.52622' />
+ <node id='-57005' lat='28.25639' lon='-88.93054' />
+ <node id='-57007' lat='30.00457' lon='-88.37952' />
+ <node id='-57009' lat='29.43998' lon='-93.77551' />
+ <node id='-57011' lat='40.63803' lon='-80.51902' />
+ <node id='-57013' lat='40.6125' lon='-80.57837' />
+ <node id='-57015' lat='40.6237' lon='-80.59948' />
+ <node id='-57017' lat='40.61458' lon='-80.6345' />
+ <node id='-57019' lat='40.58043' lon='-80.66608' />
+ <node id='-57021' lat='40.53452' lon='-80.62935' />
+ <node id='-57023' lat='40.49485' lon='-80.61287' />
+ <node id='-57025' lat='40.47971' lon='-80.59639' />
+ <node id='-57027' lat='40.46195' lon='-80.59776' />
+ <node id='-57029' lat='40.43216' lon='-80.61424' />
+ <node id='-57031' lat='40.40655' lon='-80.61356' />
+ <node id='-57033' lat='40.39243' lon='-80.63313' />
+ <node id='-57035' lat='40.37491' lon='-80.60944' />
+ <node id='-57037' lat='40.3409' lon='-80.61253' />
+ <node id='-57039' lat='40.31708' lon='-80.60017' />
+ <node id='-57041' lat='40.28828' lon='-80.61733' />
+ <node id='-57043' lat='40.26627' lon='-80.61871' />
+ <node id='-57045' lat='40.24374' lon='-80.65475' />
+ <node id='-57047' lat='40.19918' lon='-80.66917' />
+ <node id='-57049' lat='40.14645' lon='-80.70763' />
+ <node id='-57051' lat='40.10445' lon='-80.70591' />
+ <node id='-57053' lat='40.07792' lon='-80.73681' />
+ <node id='-57055' lat='40.03824' lon='-80.73097' />
+ <node id='-57057' lat='40.00564' lon='-80.74265' />
+ <node id='-57059' lat='39.97749' lon='-80.73818' />
+ <node id='-57061' lat='39.95539' lon='-80.7605' />
+ <node id='-57063' lat='39.91222' lon='-80.75329' />
+ <node id='-57065' lat='39.90853' lon='-80.76702' />
+ <node id='-57067' lat='39.91933' lon='-80.79655' />
+ <node id='-57069' lat='39.90985' lon='-80.8065' />
+ <node id='-57071' lat='39.87323' lon='-80.78899' />
+ <node id='-57073' lat='39.84477' lon='-80.82436' />
+ <node id='-57075' lat='39.80891' lon='-80.82092' />
+ <node id='-57077' lat='39.77013' lon='-80.86555' />
+ <node id='-57079' lat='39.71337' lon='-80.82813' />
+ <node id='-57081' lat='39.68801' lon='-80.86384' />
+ <node id='-57083' lat='39.62854' lon='-80.87139' />
+ <node id='-57085' lat='39.61796' lon='-80.91534' />
+ <node id='-57087' lat='39.53116' lon='-81.05541' />
+ <node id='-57089' lat='39.4485' lon='-81.13232' />
+ <node id='-57091' lat='39.43153' lon='-81.1845' />
+ <node id='-57093' lat='39.38909' lon='-81.22021' />
+ <node id='-57095' lat='39.39121' lon='-81.26141' />
+ <node id='-57097' lat='39.34025' lon='-81.36303' />
+ <node id='-57099' lat='39.35087' lon='-81.39874' />
+ <node id='-57101' lat='39.39758' lon='-81.41796' />
+ <node id='-57103' lat='39.41243' lon='-81.4674' />
+ <node id='-57105' lat='39.36573' lon='-81.5086' />
+ <node id='-57107' lat='39.35724' lon='-81.55529' />
+ <node id='-57109' lat='39.27649' lon='-81.56902' />
+ <node id='-57111' lat='38.39937' lon='-82.54406' />
+ <node id='-57113' lat='38.45101' lon='-82.31884' />
+ <node id='-57115' lat='38.59283' lon='-82.28588' />
+ <node id='-57117' lat='38.59713' lon='-82.17876' />
+ <node id='-57119' lat='38.80933' lon='-82.21722' />
+ <node id='-57121' lat='38.83714' lon='-82.14306' />
+ <node id='-57123' lat='38.89488' lon='-82.1513' />
+ <node id='-57125' lat='38.9782' lon='-82.08813' />
+ <node id='-57127' lat='39.02943' lon='-82.02496' />
+ <node id='-57129' lat='38.98888' lon='-81.93707' />
+ <node id='-57131' lat='38.92694' lon='-81.90136' />
+ <node id='-57133' lat='38.89702' lon='-81.93157' />
+ <node id='-57135' lat='38.8735' lon='-81.89587' />
+ <node id='-57137' lat='38.9013' lon='-81.84368' />
+ <node id='-57139' lat='38.94831' lon='-81.83544' />
+ <node id='-57141' lat='38.91839' lon='-81.76403' />
+ <node id='-57143' lat='38.93762' lon='-81.74755' />
+ <node id='-57145' lat='38.96966' lon='-81.786' />
+ <node id='-57147' lat='39.01876' lon='-81.76128' />
+ <node id='-57149' lat='39.05716' lon='-81.81622' />
+ <node id='-57151' lat='39.08915' lon='-81.81622' />
+ <node id='-57153' lat='39.07635' lon='-81.76952' />
+ <node id='-57155' lat='39.1062' lon='-81.74206' />
+ <node id='-57157' lat='39.1914' lon='-81.7503' />
+ <node id='-57159' lat='39.2297' lon='-81.68987' />
+ <node id='-57161' lat='39.26161' lon='-81.69537' />
+ <node id='-57163' lat='39.28287' lon='-81.65417' />
+ <node id='-57165' lat='40.94332' lon='-71.6391' />
+ <node id='-57167' lat='41.52748' lon='-69.42513' />
+ <node id='-57169' lat='42.81005' lon='-70.04999' />
+ <node id='-57171' lat='36.55091' lon='-75.79776' />
+ <node id='-57173' lat='35.41538' lon='-74.86753' />
+ <node id='-57175' lat='30.71298' lon='-81.34929' />
+ <node id='-57177' lat='36.60056' lon='-83.67455' />
+ <node id='-57179' lat='36.66798' lon='-83.42125' />
+ <node id='-57181' lat='36.66716' lon='-83.5239' />
+ <node id='-57183' lat='36.61206' lon='-81.64833' />
+ <node id='-57185' lat='36.61647' lon='-81.92299' />
+ <node id='-57187' lat='36.5947' lon='-81.93466' />
+ <node id='-57189' lat='36.54837' lon='-80.30148' />
+ <node id='-57191' lat='39.13337' lon='-77.82818' />
+ <node id='-57193' lat='39.46705' lon='-78.34728' />
+ <node id='-57195' lat='39.42676' lon='-78.34934' />
+ <node id='-57197' lat='39.40872' lon='-78.3617' />
+ <node id='-57199' lat='39.38909' lon='-78.34385' />
+ <node id='-57201' lat='39.35883' lon='-78.3672' />
+ <node id='-57203' lat='39.35352' lon='-78.33973' />
+ <node id='-57205' lat='39.25736' lon='-78.42075' />
+ <node id='-57207' lat='39.24566' lon='-78.40084' />
+ <node id='-57209' lat='39.19725' lon='-78.43792' />
+ <node id='-57211' lat='39.16851' lon='-78.40496' />
+ <node id='-57213' lat='39.03156' lon='-78.5725' />
+ <node id='-57215' lat='39.01716' lon='-78.55396' />
+ <node id='-57217' lat='38.96539' lon='-78.6034' />
+ <node id='-57219' lat='38.98408' lon='-78.62743' />
+ <node id='-57221' lat='38.91519' lon='-78.69198' />
+ <node id='-57223' lat='38.90557' lon='-78.71944' />
+ <node id='-57225' lat='38.93602' lon='-78.71807' />
+ <node id='-57227' lat='38.92748' lon='-78.7421' />
+ <node id='-57229' lat='38.90183' lon='-78.75858' />
+ <node id='-57231' lat='38.88794' lon='-78.78742' />
+ <node id='-57233' lat='38.7633' lon='-78.86982' />
+ <node id='-57235' lat='38.84998' lon='-78.99479' />
+ <node id='-57237' lat='38.7092' lon='-79.09504' />
+ <node id='-57239' lat='38.68133' lon='-79.08543' />
+ <node id='-57241' lat='38.65345' lon='-79.10191' />
+ <node id='-57243' lat='38.66418' lon='-79.12663' />
+ <node id='-57245' lat='38.48918' lon='-79.21864' />
+ <node id='-57247' lat='38.41282' lon='-79.30515' />
+ <node id='-57249' lat='38.458' lon='-79.47681' />
+ <node id='-57251' lat='38.55257' lon='-79.53587' />
+ <node id='-57253' lat='38.59015' lon='-79.6471' />
+ <node id='-57255' lat='38.53646' lon='-79.67319' />
+ <node id='-57257' lat='38.51175' lon='-79.66221' />
+ <node id='-57259' lat='38.49133' lon='-79.70066' />
+ <node id='-57261' lat='38.45693' lon='-79.68967' />
+ <node id='-57263' lat='38.42358' lon='-79.69517' />
+ <node id='-57265' lat='38.37838' lon='-79.73362' />
+ <node id='-57267' lat='38.36115' lon='-79.72538' />
+ <node id='-57269' lat='38.35146' lon='-79.73911' />
+ <node id='-57271' lat='38.35792' lon='-79.76383' />
+ <node id='-57273' lat='38.30837' lon='-79.80915' />
+ <node id='-57275' lat='38.26849' lon='-79.7858' />
+ <node id='-57277' lat='38.18326' lon='-79.91901' />
+ <node id='-57279' lat='38.10334' lon='-79.93412' />
+ <node id='-57281' lat='37.99519' lon='-80.00278' />
+ <node id='-57283' lat='37.85762' lon='-80.17994' />
+ <node id='-57285' lat='37.68719' lon='-80.29667' />
+ <node id='-57287' lat='37.62522' lon='-80.22251' />
+ <node id='-57289' lat='37.56646' lon='-80.32413' />
+ <node id='-57291' lat='37.51746' lon='-80.2953' />
+ <node id='-57293' lat='37.42373' lon='-80.47245' />
+ <node id='-57295' lat='37.48042' lon='-80.51228' />
+ <node id='-57297' lat='37.37573' lon='-80.76633' />
+ <node id='-57299' lat='37.39973' lon='-80.79243' />
+ <node id='-57301' lat='37.43136' lon='-80.85835' />
+ <node id='-57303' lat='37.38337' lon='-80.88306' />
+ <node id='-57305' lat='37.34735' lon='-80.84873' />
+ <node id='-57307' lat='37.30913' lon='-80.91602' />
+ <node id='-57309' lat='37.29056' lon='-80.97782' />
+ <node id='-57311' lat='37.30148' lon='-80.98606' />
+ <node id='-57313' lat='37.27526' lon='-81.12339' />
+ <node id='-57315' lat='37.26214' lon='-81.17695' />
+ <node id='-57317' lat='37.23591' lon='-81.22776' />
+ <node id='-57319' lat='37.33643' lon='-81.36372' />
+ <node id='-57321' lat='37.27089' lon='-81.42002' />
+ <node id='-57323' lat='37.2534' lon='-81.50242' />
+ <node id='-57325' lat='37.20966' lon='-81.55735' />
+ <node id='-57327' lat='37.20201' lon='-81.6782' />
+ <node id='-57329' lat='37.27744' lon='-81.76334' />
+ <node id='-57331' lat='37.28509' lon='-81.8581' />
+ <node id='-57333' lat='37.32988' lon='-81.87595' />
+ <node id='-57335' lat='37.36154' lon='-81.92814' />
+ <node id='-57337' lat='37.43791' lon='-81.93775' />
+ <node id='-57339' lat='37.4608' lon='-81.99268' />
+ <node id='-57341' lat='37.4826' lon='-81.99543' />
+ <node id='-57343' lat='37.50766' lon='-81.9405' />
+ <node id='-57345' lat='40.36999' lon='18.83516' />
+ <node id='-57347' lat='39.7532' lon='19.20409' />
+ <node id='-57349' lat='71.28681' lon='18.46509' />
+ <node id='-57351' lat='67.52551' lon='-12.20873' />
+ <node id='-57353' lat='72.01005' lon='32.07813' />
+ <node id='-57355' lat='49.47231' lon='-3.06097' />
+ <node id='-57357' lat='44.89556' lon='36.61884' />
+ <node id='-57359' lat='45.20215' lon='36.52546' />
+ <node id='-57361' lat='45.40306' lon='36.68476' />
+ <node id='-57363' lat='45.63016' lon='36.66828' />
+ <node id='-57365' lat='44.38918' lon='33.76171' />
+ <node id='-57367' lat='44.41886' lon='33.85784' />
+ <node id='-57369' lat='44.42082' lon='33.92616' />
+ <node id='-57371' lat='44.6125' lon='33.77853' />
+ <node id='-57373' lat='44.60199' lon='33.73528' />
+ <node id='-57375' lat='44.62081' lon='33.71502' />
+ <node id='-57377' lat='44.68968' lon='33.7751' />
+ <node id='-57379' lat='44.71579' lon='33.72772' />
+ <node id='-57381' lat='44.71237' lon='33.61649' />
+ <node id='-57383' lat='44.75018' lon='33.61305' />
+ <node id='-57385' lat='44.77017' lon='33.68172' />
+ <node id='-57387' lat='44.78577' lon='33.6776' />
+ <node id='-57389' lat='44.81086' lon='33.60275' />
+ <node id='-57391' lat='44.80794' lon='33.5849' />
+ <node id='-57393' lat='44.84057' lon='33.5643' />
+ <node id='-57395' lat='44.94345' lon='33.28621' />
+ <node id='-57397' lat='44.48323' lon='32.99857' />
+ <node id='-57399' lat='17.32592' lon='-63.22932' />
+ <node id='-57401' lat='17.61311' lon='-63.58819' />
+ <node id='-57403' lat='73.61229' lon='16.4353' />
+ <node id='-57405' lat='72.73731' lon='-9.68082' />
+ <node id='-57407' lat='70.76368' lon='-5.93364' />
+ <node id='-57409' lat='-50.68404' lon='164.49803' />
+ <way id='-57411'>
+ <nd ref='-42337' />
+ <nd ref='-36363' />
+ <nd ref='-36361' />
+ <nd ref='-42339' />
+ <nd ref='-42337' />
+ <tag k='ISO3166-1:alpha2' v='TT' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Trinidad and Tobago' />
+ </way>
+ <way id='-57413'>
+ <nd ref='-53551' />
+ <nd ref='-36373' />
+ <nd ref='-36371' />
+ <nd ref='-39627' />
+ <nd ref='-36393' />
+ <nd ref='-36391' />
+ <nd ref='-53549' />
+ <nd ref='-53551' />
+ <tag k='ISO3166-1:alpha2' v='AI' />
+ <tag k='name:en' v='Anguilla' />
+ </way>
+ <way id='-57415'>
+ <nd ref='-36395' />
+ <nd ref='-36389' />
+ <nd ref='-36387' />
+ <nd ref='-36381' />
+ <nd ref='-36379' />
+ <nd ref='-36377' />
+ <nd ref='-36375' />
+ <nd ref='-36385' />
+ <nd ref='-36383' />
+ <nd ref='-39625' />
+ <nd ref='-36395' />
+ <tag k='ISO3166-1:alpha2' v='SX' />
+ <tag k='ISO3166-2' v='NL-SX' />
+ <tag k='name:en' v='Sint Maarten' />
+ </way>
+ <way id='-57417'>
+ <nd ref='-36883' />
+ <nd ref='-36405' />
+ <nd ref='-40773' />
+ <nd ref='-36885' />
+ <nd ref='-36407' />
+ <nd ref='-36883' />
+ <tag k='ISO3166-1:alpha2' v='VC' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='St. Vincent and the Grenadines' />
+ </way>
+ <way id='-57419'>
+ <nd ref='-53565' />
+ <nd ref='-53561' />
+ <nd ref='-36417' />
+ <nd ref='-36415' />
+ <nd ref='-53563' />
+ <nd ref='-53565' />
+ <tag k='ISO3166-1:alpha2' v='CW' />
+ <tag k='ISO3166-2' v='NL-CW' />
+ <tag k='name:en' v='Curaçao' />
+ </way>
+ <way id='-57421'>
+ <nd ref='-39219' />
+ <nd ref='-35791' />
+ <nd ref='-35789' />
+ <nd ref='-35797' />
+ <nd ref='-35795' />
+ <nd ref='-35793' />
+ <nd ref='-35803' />
+ <nd ref='-35801' />
+ <nd ref='-35799' />
+ <nd ref='-39217' />
+ <nd ref='-36431' />
+ <nd ref='-42291' />
+ <nd ref='-42289' />
+ <nd ref='-36447' />
+ <nd ref='-42567' />
+ <nd ref='-42569' />
+ <nd ref='-39221' />
+ <nd ref='-36429' />
+ <nd ref='-35773' />
+ <nd ref='-35775' />
+ <nd ref='-35787' />
+ <nd ref='-35777' />
+ <nd ref='-35785' />
+ <nd ref='-35779' />
+ <nd ref='-35783' />
+ <nd ref='-35781' />
+ <nd ref='-39219' />
+ <tag k='ISO3166-1:alpha2' v='HT' />
+ <tag k='name:en' v='Haiti' />
+ </way>
+ <way id='-57423'>
+ <nd ref='-36439' />
+ <nd ref='-36437' />
+ <nd ref='-36435' />
+ <nd ref='-36433' />
+ <nd ref='-36439' />
+ <tag k='ISO3166-1:alpha2' v='KY' />
+ <tag k='name:en' v='Cayman Islands' />
+ </way>
+ <way id='-57425'>
+ <nd ref='-42567' />
+ <nd ref='-36447' />
+ <nd ref='-36445' />
+ <nd ref='-36443' />
+ <nd ref='-36441' />
+ <nd ref='-36449' />
+ <nd ref='-42467' />
+ <nd ref='-42565' />
+ <nd ref='-42567' />
+ <tag k='ISO3166-1:alpha2' v='CU' />
+ <tag k='name:en' v='Cuba' />
+ </way>
+ <way id='-57427'>
+ <nd ref='-42571' />
+ <nd ref='-36455' />
+ <nd ref='-36453' />
+ <nd ref='-42569' />
+ <nd ref='-42571' />
+ <tag k='ISO3166-1:alpha2' v='TC' />
+ <tag k='name:en' v='Turks and Caicos Islands' />
+ </way>
+ <way id='-57429'>
+ <nd ref='-36533' />
+ <nd ref='-36479' />
+ <nd ref='-36477' />
+ <nd ref='-36535' />
+ <nd ref='-36533' />
+ <tag k='ISO3166-1:alpha2' v='MT' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Malta' />
+ </way>
+ <way id='-57431'>
+ <nd ref='-36521' />
+ <nd ref='-36491' />
+ <nd ref='-36485' />
+ <nd ref='-36523' />
+ <nd ref='-36487' />
+ <nd ref='-36489' />
+ <nd ref='-36525' />
+ <nd ref='-36473' />
+ <nd ref='-42189' />
+ <nd ref='-36475' />
+ <nd ref='-36537' />
+ <nd ref='-36477' />
+ <nd ref='-36535' />
+ <nd ref='-36533' />
+ <nd ref='-36617' />
+ <nd ref='-57345' />
+ <nd ref='-36531' />
+ <nd ref='-36529' />
+ <nd ref='-36527' />
+ <nd ref='-41975' />
+ <nd ref='-36497' />
+ <nd ref='-41977' />
+ <nd ref='-41979' />
+ <nd ref='-40347' />
+ <nd ref='-41981' />
+ <nd ref='-34073' />
+ <nd ref='-34071' />
+ <nd ref='-40345' />
+ <nd ref='-34061' />
+ <nd ref='-34065' />
+ <nd ref='-34063' />
+ <nd ref='-34067' />
+ <nd ref='-34069' />
+ <nd ref='-41983' />
+ <nd ref='-34057' />
+ <nd ref='-34059' />
+ <nd ref='-34055' />
+ <nd ref='-40343' />
+ <nd ref='-34037' />
+ <nd ref='-34035' />
+ <nd ref='-34039' />
+ <nd ref='-34041' />
+ <nd ref='-34043' />
+ <nd ref='-34045' />
+ <nd ref='-34047' />
+ <nd ref='-34049' />
+ <nd ref='-34051' />
+ <nd ref='-34053' />
+ <nd ref='-40341' />
+ <nd ref='-34025' />
+ <nd ref='-34027' />
+ <nd ref='-34029' />
+ <nd ref='-34033' />
+ <nd ref='-34031' />
+ <nd ref='-40339' />
+ <nd ref='-33997' />
+ <nd ref='-33999' />
+ <nd ref='-34001' />
+ <nd ref='-34003' />
+ <nd ref='-34005' />
+ <nd ref='-34007' />
+ <nd ref='-34009' />
+ <nd ref='-34011' />
+ <nd ref='-34013' />
+ <nd ref='-34015' />
+ <nd ref='-34017' />
+ <nd ref='-34019' />
+ <nd ref='-34021' />
+ <nd ref='-34023' />
+ <nd ref='-40337' />
+ <nd ref='-33971' />
+ <nd ref='-33977' />
+ <nd ref='-33969' />
+ <nd ref='-33967' />
+ <nd ref='-33973' />
+ <nd ref='-33975' />
+ <nd ref='-33979' />
+ <nd ref='-33981' />
+ <nd ref='-33983' />
+ <nd ref='-33985' />
+ <nd ref='-33987' />
+ <nd ref='-33989' />
+ <nd ref='-33991' />
+ <nd ref='-33993' />
+ <nd ref='-33995' />
+ <nd ref='-37217' />
+ <nd ref='-44685' />
+ <nd ref='-44687' />
+ <nd ref='-44689' />
+ <nd ref='-40357' />
+ <nd ref='-44681' />
+ <nd ref='-44683' />
+ <nd ref='-38689' />
+ <nd ref='-40355' />
+ <nd ref='-44679' />
+ <nd ref='-44677' />
+ <nd ref='-44675' />
+ <nd ref='-44673' />
+ <nd ref='-44671' />
+ <nd ref='-40353' />
+ <nd ref='-44669' />
+ <nd ref='-44667' />
+ <nd ref='-44657' />
+ <nd ref='-44655' />
+ <nd ref='-44665' />
+ <nd ref='-44663' />
+ <nd ref='-44653' />
+ <nd ref='-44661' />
+ <nd ref='-44659' />
+ <nd ref='-44651' />
+ <nd ref='-44649' />
+ <nd ref='-44647' />
+ <nd ref='-44639' />
+ <nd ref='-44641' />
+ <nd ref='-44645' />
+ <nd ref='-44643' />
+ <nd ref='-44635' />
+ <nd ref='-44637' />
+ <nd ref='-44633' />
+ <nd ref='-44631' />
+ <nd ref='-44629' />
+ <nd ref='-44625' />
+ <nd ref='-44627' />
+ <nd ref='-44623' />
+ <nd ref='-44621' />
+ <nd ref='-44619' />
+ <nd ref='-44617' />
+ <nd ref='-44615' />
+ <nd ref='-44613' />
+ <nd ref='-44611' />
+ <nd ref='-40351' />
+ <nd ref='-44439' />
+ <nd ref='-44437' />
+ <nd ref='-44435' />
+ <nd ref='-38691' />
+ <nd ref='-40349' />
+ <nd ref='-44433' />
+ <nd ref='-44431' />
+ <nd ref='-44429' />
+ <nd ref='-44427' />
+ <nd ref='-44425' />
+ <nd ref='-44423' />
+ <nd ref='-44421' />
+ <nd ref='-44419' />
+ <nd ref='-44417' />
+ <nd ref='-44415' />
+ <nd ref='-44413' />
+ <nd ref='-44411' />
+ <nd ref='-44409' />
+ <nd ref='-39661' />
+ <nd ref='-44397' />
+ <nd ref='-44399' />
+ <nd ref='-44401' />
+ <nd ref='-44405' />
+ <nd ref='-44403' />
+ <nd ref='-44407' />
+ <nd ref='-44395' />
+ <nd ref='-44393' />
+ <nd ref='-44391' />
+ <nd ref='-44389' />
+ <nd ref='-39663' />
+ <nd ref='-39665' />
+ <nd ref='-39667' />
+ <nd ref='-44387' />
+ <nd ref='-44381' />
+ <nd ref='-44383' />
+ <nd ref='-44385' />
+ <nd ref='-44379' />
+ <nd ref='-44377' />
+ <nd ref='-44375' />
+ <nd ref='-44373' />
+ <nd ref='-44371' />
+ <nd ref='-44369' />
+ <nd ref='-44367' />
+ <nd ref='-44365' />
+ <nd ref='-39669' />
+ <nd ref='-39671' />
+ <nd ref='-39673' />
+ <nd ref='-39675' />
+ <nd ref='-39677' />
+ <nd ref='-39679' />
+ <nd ref='-39681' />
+ <nd ref='-39683' />
+ <nd ref='-36495' />
+ <nd ref='-36521' />
+ </way>
+ <way id='-57433'>
+ <nd ref='-42219' />
+ <nd ref='-36539' />
+ <nd ref='-36541' />
+ <nd ref='-36543' />
+ <nd ref='-36545' />
+ <nd ref='-36547' />
+ <nd ref='-36549' />
+ <nd ref='-36551' />
+ <nd ref='-36553' />
+ <nd ref='-36555' />
+ <nd ref='-36557' />
+ <nd ref='-36559' />
+ <nd ref='-36561' />
+ <nd ref='-36563' />
+ <nd ref='-36565' />
+ <nd ref='-36567' />
+ <nd ref='-36569' />
+ <nd ref='-36571' />
+ <nd ref='-36573' />
+ <nd ref='-36575' />
+ <nd ref='-36577' />
+ <nd ref='-36579' />
+ <nd ref='-36581' />
+ <nd ref='-36583' />
+ <nd ref='-36585' />
+ <nd ref='-36587' />
+ <nd ref='-36589' />
+ <nd ref='-36591' />
+ <nd ref='-36593' />
+ <nd ref='-36595' />
+ <nd ref='-36597' />
+ <nd ref='-36599' />
+ <nd ref='-36601' />
+ <nd ref='-36603' />
+ <nd ref='-36605' />
+ <nd ref='-42231' />
+ <nd ref='-36607' />
+ <nd ref='-36609' />
+ <nd ref='-36611' />
+ <nd ref='-42229' />
+ <nd ref='-36613' />
+ <nd ref='-42227' />
+ <nd ref='-42225' />
+ <nd ref='-42223' />
+ <nd ref='-42221' />
+ <nd ref='-42795' />
+ <nd ref='-36615' />
+ <nd ref='-57347' />
+ <nd ref='-36619' />
+ <nd ref='-37007' />
+ <nd ref='-37005' />
+ <nd ref='-37003' />
+ <nd ref='-37001' />
+ <nd ref='-39859' />
+ <nd ref='-36999' />
+ <nd ref='-46955' />
+ <nd ref='-46957' />
+ <nd ref='-46953' />
+ <nd ref='-46959' />
+ <nd ref='-46951' />
+ <nd ref='-46949' />
+ <nd ref='-46947' />
+ <nd ref='-46945' />
+ <nd ref='-46943' />
+ <nd ref='-46939' />
+ <nd ref='-46941' />
+ <nd ref='-46961' />
+ <nd ref='-46973' />
+ <nd ref='-46971' />
+ <nd ref='-46969' />
+ <nd ref='-46963' />
+ <nd ref='-46967' />
+ <nd ref='-46975' />
+ <nd ref='-46977' />
+ <nd ref='-46965' />
+ <nd ref='-46979' />
+ <nd ref='-46981' />
+ <nd ref='-46983' />
+ <nd ref='-46985' />
+ <nd ref='-46987' />
+ <nd ref='-46989' />
+ <nd ref='-36997' />
+ <nd ref='-46819' />
+ <nd ref='-46821' />
+ <nd ref='-46825' />
+ <nd ref='-46827' />
+ <nd ref='-46823' />
+ <nd ref='-46837' />
+ <nd ref='-46839' />
+ <nd ref='-46841' />
+ <nd ref='-46843' />
+ <nd ref='-46835' />
+ <nd ref='-46833' />
+ <nd ref='-46831' />
+ <nd ref='-46829' />
+ <nd ref='-46845' />
+ <nd ref='-46849' />
+ <nd ref='-46851' />
+ <nd ref='-46847' />
+ <nd ref='-46855' />
+ <nd ref='-46857' />
+ <nd ref='-46853' />
+ <nd ref='-46859' />
+ <nd ref='-46861' />
+ <nd ref='-46863' />
+ <nd ref='-46865' />
+ <nd ref='-39861' />
+ <nd ref='-47153' />
+ <nd ref='-47161' />
+ <nd ref='-47157' />
+ <nd ref='-47159' />
+ <nd ref='-47155' />
+ <nd ref='-47147' />
+ <nd ref='-47167' />
+ <nd ref='-47163' />
+ <nd ref='-47165' />
+ <nd ref='-47149' />
+ <nd ref='-47151' />
+ <nd ref='-47169' />
+ <nd ref='-47171' />
+ <nd ref='-47173' />
+ <nd ref='-47145' />
+ <nd ref='-47143' />
+ <nd ref='-47177' />
+ <nd ref='-47175' />
+ <nd ref='-47141' />
+ <nd ref='-47139' />
+ <nd ref='-47135' />
+ <nd ref='-47137' />
+ <nd ref='-47183' />
+ <nd ref='-47181' />
+ <nd ref='-47185' />
+ <nd ref='-47191' />
+ <nd ref='-47193' />
+ <nd ref='-47189' />
+ <nd ref='-47187' />
+ <nd ref='-47179' />
+ <nd ref='-47197' />
+ <nd ref='-47201' />
+ <nd ref='-47203' />
+ <nd ref='-47205' />
+ <nd ref='-47207' />
+ <nd ref='-47199' />
+ <nd ref='-47195' />
+ <nd ref='-47209' />
+ <nd ref='-47211' />
+ <nd ref='-47213' />
+ <nd ref='-47215' />
+ <nd ref='-47217' />
+ <nd ref='-47235' />
+ <nd ref='-47233' />
+ <nd ref='-47231' />
+ <nd ref='-47229' />
+ <nd ref='-47227' />
+ <nd ref='-47225' />
+ <nd ref='-47223' />
+ <nd ref='-47237' />
+ <nd ref='-47221' />
+ <nd ref='-47219' />
+ <nd ref='-39857' />
+ <nd ref='-47121' />
+ <nd ref='-47123' />
+ <nd ref='-47119' />
+ <nd ref='-47117' />
+ <nd ref='-47115' />
+ <nd ref='-47111' />
+ <nd ref='-47113' />
+ <nd ref='-47105' />
+ <nd ref='-47109' />
+ <nd ref='-47125' />
+ <nd ref='-47127' />
+ <nd ref='-47107' />
+ <nd ref='-47103' />
+ <nd ref='-47133' />
+ <nd ref='-47131' />
+ <nd ref='-47129' />
+ <nd ref='-47101' />
+ <nd ref='-47099' />
+ <nd ref='-47097' />
+ <nd ref='-47095' />
+ <nd ref='-42219' />
+ <tag k='ISO3166-1:alpha2' v='GR' />
+ <tag k='name:en' v='Greece' />
+ </way>
+ <way id='-57435'>
+ <nd ref='-36657' />
+ <nd ref='-36623' />
+ <nd ref='-36621' />
+ <nd ref='-36657' />
+ <tag k='ISO3166-1:alpha2' v='PN' />
+ <tag k='name:en' v='Pitcairn Islands' />
+ </way>
+ <way id='-57437'>
+ <nd ref='-36649' />
+ <nd ref='-36631' />
+ <nd ref='-36627' />
+ <nd ref='-36643' />
+ <nd ref='-36637' />
+ <nd ref='-36649' />
+ </way>
+ <way id='-57439'>
+ <nd ref='-36643' />
+ <nd ref='-36627' />
+ <nd ref='-36629' />
+ <nd ref='-36641' />
+ <nd ref='-53707' />
+ <nd ref='-36639' />
+ <nd ref='-36647' />
+ <nd ref='-36637' />
+ <nd ref='-36643' />
+ <tag k='ISO3166-1:alpha2' v='TO' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Tonga' />
+ </way>
+ <way id='-57441'>
+ <nd ref='-36647' />
+ <nd ref='-36639' />
+ <nd ref='-36651' />
+ <nd ref='-36653' />
+ <nd ref='-36645' />
+ <nd ref='-36647' />
+ <tag k='ISO3166-1:alpha2' v='WS' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Samoa' />
+ </way>
+ <way id='-57443'>
+ <nd ref='-36649' />
+ <nd ref='-36637' />
+ <nd ref='-36647' />
+ <nd ref='-36645' />
+ <nd ref='-36665' />
+ <nd ref='-36649' />
+ <tag k='ISO3166-1:alpha2' v='WF' />
+ <tag k='ISO3166-2' v='FR-WF' />
+ <tag k='name:en' v='Wallis and Futuna' />
+ </way>
+ <way id='-57445'>
+ <nd ref='-36661' />
+ <nd ref='-36659' />
+ <nd ref='-36621' />
+ <nd ref='-36657' />
+ <nd ref='-36655' />
+ <nd ref='-53587' />
+ <nd ref='-36683' />
+ <nd ref='-36681' />
+ <nd ref='-36661' />
+ <tag k='ISO3166-1:alpha2' v='PF' />
+ <tag k='ISO3166-2' v='FR-PF' />
+ <tag k='name:en' v='French Polynesia' />
+ </way>
+ <way id='-57447'>
+ <nd ref='-36685' />
+ <nd ref='-36693' />
+ <nd ref='-36691' />
+ <nd ref='-36695' />
+ <nd ref='-36679' />
+ <nd ref='-36661' />
+ <nd ref='-36681' />
+ <nd ref='-36683' />
+ <nd ref='-36675' />
+ <nd ref='-53583' />
+ <nd ref='-36677' />
+ <nd ref='-36671' />
+ <nd ref='-36669' />
+ <nd ref='-53663' />
+ <nd ref='-36685' />
+ </way>
+ <way id='-57449'>
+ <nd ref='-36645' />
+ <nd ref='-36653' />
+ <nd ref='-36651' />
+ <nd ref='-36633' />
+ <nd ref='-36673' />
+ <nd ref='-36663' />
+ <nd ref='-36645' />
+ <tag k='ISO3166-1:alpha2' v='AS' />
+ <tag k='ISO3166-2' v='US-AS' />
+ <tag k='name:en' v='American Samoa' />
+ </way>
+ <way id='-57451'>
+ <nd ref='-53645' />
+ <nd ref='-53647' />
+ <nd ref='-53649' />
+ <nd ref='-53651' />
+ <nd ref='-36701' />
+ <nd ref='-36699' />
+ <nd ref='-36697' />
+ <nd ref='-36703' />
+ <nd ref='-53645' />
+ <tag k='ISO3166-2' v='US-HI' />
+ <tag k='name:en' v='Hawaii' />
+ </way>
+ <way id='-57453'>
+ <nd ref='-36711' />
+ <nd ref='-36709' />
+ <nd ref='-36707' />
+ <nd ref='-36705' />
+ <nd ref='-36711' />
+ <tag k='ISO3166-1:alpha2' v='CV' />
+ <tag k='name:en' v='Cape Verde' />
+ </way>
+ <way id='-57455'>
+ <nd ref='-36729' />
+ <nd ref='-53849' />
+ <nd ref='-36727' />
+ <nd ref='-36725' />
+ <nd ref='-36723' />
+ <nd ref='-53885' />
+ <nd ref='-53879' />
+ <nd ref='-53847' />
+ <nd ref='-36729' />
+ <tag k='ISO3166-1:alpha2' v='SH' />
+ <tag k='name:en' v='Saint Helena, Ascension and Tristan da Cunha' />
+ </way>
+ <way id='-57457'>
+ <nd ref='-36815' />
+ <nd ref='-36813' />
+ <nd ref='-36811' />
+ <nd ref='-36809' />
+ <nd ref='-36815' />
+ <tag k='ISO3166-1:alpha2' v='CP' />
+ <tag k='ISO3166-2' v='FR-CP' />
+ <tag k='name:en' v='Clipperton Island' />
+ </way>
+ <way id='-57459'>
+ <nd ref='-41079' />
+ <nd ref='-42435' />
+ <nd ref='-36825' />
+ <nd ref='-41077' />
+ <nd ref='-41075' />
+ <nd ref='-43453' />
+ <nd ref='-43451' />
+ <nd ref='-43455' />
+ <nd ref='-43449' />
+ <nd ref='-41073' />
+ <nd ref='-41071' />
+ <nd ref='-39869' />
+ <nd ref='-39871' />
+ <nd ref='-43457' />
+ <nd ref='-41069' />
+ <nd ref='-41067' />
+ <nd ref='-43459' />
+ <nd ref='-41065' />
+ <nd ref='-41063' />
+ <nd ref='-41061' />
+ <nd ref='-39863' />
+ <nd ref='-43461' />
+ <nd ref='-43463' />
+ <nd ref='-43465' />
+ <nd ref='-43469' />
+ <nd ref='-43467' />
+ <nd ref='-37849' />
+ <nd ref='-37851' />
+ <nd ref='-41059' />
+ <nd ref='-37853' />
+ <nd ref='-37855' />
+ <nd ref='-41057' />
+ <nd ref='-41055' />
+ <nd ref='-41053' />
+ <nd ref='-41051' />
+ <nd ref='-41049' />
+ <nd ref='-41047' />
+ <nd ref='-36449' />
+ <nd ref='-36451' />
+ <nd ref='-41045' />
+ <nd ref='-43445' />
+ <nd ref='-43447' />
+ <nd ref='-43443' />
+ <nd ref='-43441' />
+ <nd ref='-43437' />
+ <nd ref='-43435' />
+ <nd ref='-43433' />
+ <nd ref='-43439' />
+ <nd ref='-43431' />
+ <nd ref='-43429' />
+ <nd ref='-41043' />
+ <nd ref='-43427' />
+ <nd ref='-41041' />
+ <nd ref='-43423' />
+ <nd ref='-43425' />
+ <nd ref='-43421' />
+ <nd ref='-43419' />
+ <nd ref='-43417' />
+ <nd ref='-41039' />
+ <nd ref='-41037' />
+ <nd ref='-41035' />
+ <nd ref='-41033' />
+ <nd ref='-41031' />
+ <nd ref='-41029' />
+ <nd ref='-43415' />
+ <nd ref='-41027' />
+ <nd ref='-41025' />
+ <nd ref='-41023' />
+ <nd ref='-41021' />
+ <nd ref='-43413' />
+ <nd ref='-41019' />
+ <nd ref='-43411' />
+ <nd ref='-43409' />
+ <nd ref='-41017' />
+ <nd ref='-43407' />
+ <nd ref='-41015' />
+ <nd ref='-41013' />
+ <nd ref='-41011' />
+ <nd ref='-43405' />
+ <nd ref='-41009' />
+ <nd ref='-41007' />
+ <nd ref='-41005' />
+ <nd ref='-54625' />
+ <nd ref='-41003' />
+ <nd ref='-41083' />
+ <nd ref='-36821' />
+ <nd ref='-36819' />
+ <nd ref='-36823' />
+ <nd ref='-36817' />
+ <nd ref='-41081' />
+ <nd ref='-41079' />
+ <tag k='ISO3166-1:alpha2' v='MX' />
+ <tag k='name:en' v='Mexico' />
+ </way>
+ <way id='-57461'>
+ <nd ref='-40197' />
+ <nd ref='-42663' />
+ <nd ref='-42661' />
+ <nd ref='-42659' />
+ <nd ref='-36827' />
+ <nd ref='-36829' />
+ <nd ref='-36831' />
+ <nd ref='-39763' />
+ <nd ref='-42679' />
+ <nd ref='-42681' />
+ <nd ref='-39757' />
+ <nd ref='-43849' />
+ <nd ref='-43851' />
+ <nd ref='-43847' />
+ <nd ref='-43853' />
+ <nd ref='-43855' />
+ <nd ref='-43845' />
+ <nd ref='-43859' />
+ <nd ref='-43857' />
+ <nd ref='-43865' />
+ <nd ref='-43863' />
+ <nd ref='-43867' />
+ <nd ref='-43869' />
+ <nd ref='-43871' />
+ <nd ref='-43873' />
+ <nd ref='-43875' />
+ <nd ref='-43877' />
+ <nd ref='-43879' />
+ <nd ref='-43881' />
+ <nd ref='-43883' />
+ <nd ref='-43885' />
+ <nd ref='-43887' />
+ <nd ref='-43889' />
+ <nd ref='-43891' />
+ <nd ref='-43893' />
+ <nd ref='-43895' />
+ <nd ref='-43897' />
+ <nd ref='-43909' />
+ <nd ref='-43911' />
+ <nd ref='-43913' />
+ <nd ref='-43915' />
+ <nd ref='-43917' />
+ <nd ref='-43907' />
+ <nd ref='-43899' />
+ <nd ref='-43901' />
+ <nd ref='-43903' />
+ <nd ref='-43905' />
+ <nd ref='-43861' />
+ <nd ref='-43919' />
+ <nd ref='-43921' />
+ <nd ref='-43923' />
+ <nd ref='-43925' />
+ <nd ref='-43927' />
+ <nd ref='-43929' />
+ <nd ref='-43931' />
+ <nd ref='-43935' />
+ <nd ref='-43933' />
+ <nd ref='-43937' />
+ <nd ref='-43939' />
+ <nd ref='-43941' />
+ <nd ref='-40197' />
+ <tag k='ISO3166-1:alpha2' v='IE' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Ireland' />
+ </way>
+ <way id='-57463'>
+ <nd ref='-36833' />
+ <nd ref='-39519' />
+ <nd ref='-53855' />
+ <nd ref='-36463' />
+ <nd ref='-40903' />
+ <nd ref='-36471' />
+ <nd ref='-36837' />
+ <nd ref='-36835' />
+ <nd ref='-39511' />
+ <nd ref='-39509' />
+ <nd ref='-39507' />
+ <nd ref='-39505' />
+ <nd ref='-39503' />
+ <nd ref='-39501' />
+ <nd ref='-39499' />
+ <nd ref='-39497' />
+ <nd ref='-39495' />
+ <nd ref='-39493' />
+ <nd ref='-39491' />
+ <nd ref='-39489' />
+ <nd ref='-39487' />
+ <nd ref='-39485' />
+ <nd ref='-39483' />
+ <nd ref='-39481' />
+ <nd ref='-39479' />
+ <nd ref='-39477' />
+ <nd ref='-39475' />
+ <nd ref='-39473' />
+ <nd ref='-39471' />
+ <nd ref='-39469' />
+ <nd ref='-39467' />
+ <nd ref='-39465' />
+ <nd ref='-39463' />
+ <nd ref='-39461' />
+ <nd ref='-39459' />
+ <nd ref='-39457' />
+ <nd ref='-39455' />
+ <nd ref='-39453' />
+ <nd ref='-39451' />
+ <nd ref='-39449' />
+ <nd ref='-39447' />
+ <nd ref='-39445' />
+ <nd ref='-39443' />
+ <nd ref='-39441' />
+ <nd ref='-39439' />
+ <nd ref='-39437' />
+ <nd ref='-39435' />
+ <nd ref='-39433' />
+ <nd ref='-44225' />
+ <nd ref='-44223' />
+ <nd ref='-44221' />
+ <nd ref='-44231' />
+ <nd ref='-44229' />
+ <nd ref='-44227' />
+ <nd ref='-44219' />
+ <nd ref='-44233' />
+ <nd ref='-44207' />
+ <nd ref='-44217' />
+ <nd ref='-44215' />
+ <nd ref='-44209' />
+ <nd ref='-44213' />
+ <nd ref='-44211' />
+ <nd ref='-44235' />
+ <nd ref='-44237' />
+ <nd ref='-44239' />
+ <nd ref='-37013' />
+ <nd ref='-39431' />
+ <nd ref='-39429' />
+ <nd ref='-39427' />
+ <nd ref='-39425' />
+ <nd ref='-39423' />
+ <nd ref='-39421' />
+ <nd ref='-39419' />
+ <nd ref='-39417' />
+ <nd ref='-44253' />
+ <nd ref='-39415' />
+ <nd ref='-39413' />
+ <nd ref='-44257' />
+ <nd ref='-44255' />
+ <nd ref='-39411' />
+ <nd ref='-39409' />
+ <nd ref='-39407' />
+ <nd ref='-44259' />
+ <nd ref='-39405' />
+ <nd ref='-39403' />
+ <nd ref='-39401' />
+ <nd ref='-39399' />
+ <nd ref='-44263' />
+ <nd ref='-44261' />
+ <nd ref='-39397' />
+ <nd ref='-44265' />
+ <nd ref='-44269' />
+ <nd ref='-44273' />
+ <nd ref='-44275' />
+ <nd ref='-44271' />
+ <nd ref='-44267' />
+ <nd ref='-39395' />
+ <nd ref='-44283' />
+ <nd ref='-44281' />
+ <nd ref='-44279' />
+ <nd ref='-44285' />
+ <nd ref='-44277' />
+ <nd ref='-44287' />
+ <nd ref='-39393' />
+ <nd ref='-44291' />
+ <nd ref='-44289' />
+ <nd ref='-39391' />
+ <nd ref='-39389' />
+ <nd ref='-39387' />
+ <nd ref='-44293' />
+ <nd ref='-39385' />
+ <nd ref='-39383' />
+ <nd ref='-39381' />
+ <nd ref='-39379' />
+ <nd ref='-44313' />
+ <nd ref='-44311' />
+ <nd ref='-44309' />
+ <nd ref='-44307' />
+ <nd ref='-44303' />
+ <nd ref='-44305' />
+ <nd ref='-44301' />
+ <nd ref='-44299' />
+ <nd ref='-44295' />
+ <nd ref='-44297' />
+ <nd ref='-39377' />
+ <nd ref='-39375' />
+ <nd ref='-39373' />
+ <nd ref='-39371' />
+ <nd ref='-39369' />
+ <nd ref='-39367' />
+ <nd ref='-39365' />
+ <nd ref='-39363' />
+ <nd ref='-39539' />
+ <nd ref='-39537' />
+ <nd ref='-39535' />
+ <nd ref='-43943' />
+ <nd ref='-43945' />
+ <nd ref='-43947' />
+ <nd ref='-43949' />
+ <nd ref='-43951' />
+ <nd ref='-43953' />
+ <nd ref='-43955' />
+ <nd ref='-43957' />
+ <nd ref='-43959' />
+ <nd ref='-43961' />
+ <nd ref='-43965' />
+ <nd ref='-43963' />
+ <nd ref='-43967' />
+ <nd ref='-43969' />
+ <nd ref='-43973' />
+ <nd ref='-43971' />
+ <nd ref='-43977' />
+ <nd ref='-43975' />
+ <nd ref='-43981' />
+ <nd ref='-43979' />
+ <nd ref='-43983' />
+ <nd ref='-43985' />
+ <nd ref='-43987' />
+ <nd ref='-43989' />
+ <nd ref='-43991' />
+ <nd ref='-43993' />
+ <nd ref='-43995' />
+ <nd ref='-43997' />
+ <nd ref='-44007' />
+ <nd ref='-44009' />
+ <nd ref='-44173' />
+ <nd ref='-44011' />
+ <nd ref='-44175' />
+ <nd ref='-44177' />
+ <nd ref='-44179' />
+ <nd ref='-44181' />
+ <nd ref='-44183' />
+ <nd ref='-44185' />
+ <nd ref='-44171' />
+ <nd ref='-44169' />
+ <nd ref='-44167' />
+ <nd ref='-44005' />
+ <nd ref='-44165' />
+ <nd ref='-44163' />
+ <nd ref='-44153' />
+ <nd ref='-44161' />
+ <nd ref='-44159' />
+ <nd ref='-44157' />
+ <nd ref='-44155' />
+ <nd ref='-44003' />
+ <nd ref='-44147' />
+ <nd ref='-44149' />
+ <nd ref='-44151' />
+ <nd ref='-44001' />
+ <nd ref='-44143' />
+ <nd ref='-44145' />
+ <nd ref='-43999' />
+ <nd ref='-44135' />
+ <nd ref='-44137' />
+ <nd ref='-44139' />
+ <nd ref='-44141' />
+ <nd ref='-44133' />
+ <nd ref='-39533' />
+ <nd ref='-44131' />
+ <nd ref='-44129' />
+ <nd ref='-44127' />
+ <nd ref='-44117' />
+ <nd ref='-44123' />
+ <nd ref='-44125' />
+ <nd ref='-44121' />
+ <nd ref='-44119' />
+ <nd ref='-39531' />
+ <nd ref='-44111' />
+ <nd ref='-44109' />
+ <nd ref='-44107' />
+ <nd ref='-44105' />
+ <nd ref='-44103' />
+ <nd ref='-44113' />
+ <nd ref='-44115' />
+ <nd ref='-44083' />
+ <nd ref='-44097' />
+ <nd ref='-44101' />
+ <nd ref='-44099' />
+ <nd ref='-44091' />
+ <nd ref='-44089' />
+ <nd ref='-44095' />
+ <nd ref='-44093' />
+ <nd ref='-44085' />
+ <nd ref='-44087' />
+ <nd ref='-44071' />
+ <nd ref='-44077' />
+ <nd ref='-44075' />
+ <nd ref='-44073' />
+ <nd ref='-44081' />
+ <nd ref='-44079' />
+ <nd ref='-39529' />
+ <nd ref='-44069' />
+ <nd ref='-44067' />
+ <nd ref='-39527' />
+ <nd ref='-44065' />
+ <nd ref='-44061' />
+ <nd ref='-44063' />
+ <nd ref='-44047' />
+ <nd ref='-44051' />
+ <nd ref='-44049' />
+ <nd ref='-44053' />
+ <nd ref='-44059' />
+ <nd ref='-44055' />
+ <nd ref='-44057' />
+ <nd ref='-44013' />
+ <nd ref='-44045' />
+ <nd ref='-44043' />
+ <nd ref='-44039' />
+ <nd ref='-44041' />
+ <nd ref='-44035' />
+ <nd ref='-44037' />
+ <nd ref='-44017' />
+ <nd ref='-44015' />
+ <nd ref='-39525' />
+ <nd ref='-44025' />
+ <nd ref='-44023' />
+ <nd ref='-44021' />
+ <nd ref='-44019' />
+ <nd ref='-44027' />
+ <nd ref='-39523' />
+ <nd ref='-44033' />
+ <nd ref='-44029' />
+ <nd ref='-44031' />
+ <nd ref='-42689' />
+ <nd ref='-39521' />
+ <nd ref='-36833' />
+ </way>
+ <way id='-57465'>
+ <nd ref='-36879' />
+ <nd ref='-36877' />
+ <nd ref='-36875' />
+ <nd ref='-36873' />
+ <nd ref='-36879' />
+ <tag k='ISO3166-1:alpha2' v='ST' />
+ <tag k='name:en' v='São Tomé and Principe' />
+ </way>
+ <way id='-57467'>
+ <nd ref='-36889' />
+ <nd ref='-36887' />
+ <nd ref='-36885' />
+ <nd ref='-36407' />
+ <nd ref='-36883' />
+ <nd ref='-36889' />
+ <tag k='ISO3166-1:alpha2' v='GD' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Grenada' />
+ </way>
+ <way id='-57469'>
+ <nd ref='-36897' />
+ <nd ref='-36895' />
+ <nd ref='-36893' />
+ <nd ref='-36397' />
+ <nd ref='-39739' />
+ <nd ref='-36399' />
+ <nd ref='-36401' />
+ <nd ref='-36891' />
+ <nd ref='-36897' />
+ <tag k='ISO3166-1:alpha2' v='AG' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Antigua and Barbuda' />
+ </way>
+ <way id='-57471'>
+ <nd ref='-36957' />
+ <nd ref='-52535' />
+ <nd ref='-52537' />
+ <nd ref='-52539' />
+ <nd ref='-52541' />
+ <nd ref='-52533' />
+ <nd ref='-52543' />
+ <nd ref='-52545' />
+ <nd ref='-36899' />
+ <nd ref='-42135' />
+ <nd ref='-52525' />
+ <nd ref='-52527' />
+ <nd ref='-52529' />
+ <nd ref='-52531' />
+ <nd ref='-36901' />
+ <nd ref='-52523' />
+ <nd ref='-52521' />
+ <nd ref='-42133' />
+ <nd ref='-52517' />
+ <nd ref='-52519' />
+ <nd ref='-42131' />
+ <nd ref='-52515' />
+ <nd ref='-42129' />
+ <nd ref='-52511' />
+ <nd ref='-52513' />
+ <nd ref='-42127' />
+ <nd ref='-52501' />
+ <nd ref='-52503' />
+ <nd ref='-52505' />
+ <nd ref='-52507' />
+ <nd ref='-52509' />
+ <nd ref='-36903' />
+ <nd ref='-36905' />
+ <nd ref='-52495' />
+ <nd ref='-52497' />
+ <nd ref='-52499' />
+ <nd ref='-52493' />
+ <nd ref='-52491' />
+ <nd ref='-52489' />
+ <nd ref='-38535' />
+ <nd ref='-52367' />
+ <nd ref='-52369' />
+ <nd ref='-52373' />
+ <nd ref='-52375' />
+ <nd ref='-52371' />
+ <nd ref='-38533' />
+ <nd ref='-52719' />
+ <nd ref='-36907' />
+ <nd ref='-52717' />
+ <nd ref='-41593' />
+ <nd ref='-36909' />
+ <nd ref='-41591' />
+ <nd ref='-36911' />
+ <nd ref='-41589' />
+ <nd ref='-52713' />
+ <nd ref='-52711' />
+ <nd ref='-52709' />
+ <nd ref='-52715' />
+ <nd ref='-41587' />
+ <nd ref='-52701' />
+ <nd ref='-52707' />
+ <nd ref='-52703' />
+ <nd ref='-52705' />
+ <nd ref='-41585' />
+ <nd ref='-52687' />
+ <nd ref='-52699' />
+ <nd ref='-52689' />
+ <nd ref='-52685' />
+ <nd ref='-52693' />
+ <nd ref='-52695' />
+ <nd ref='-52697' />
+ <nd ref='-52691' />
+ <nd ref='-41583' />
+ <nd ref='-52669' />
+ <nd ref='-52671' />
+ <nd ref='-52673' />
+ <nd ref='-52675' />
+ <nd ref='-52677' />
+ <nd ref='-52679' />
+ <nd ref='-52683' />
+ <nd ref='-52681' />
+ <nd ref='-36913' />
+ <nd ref='-41581' />
+ <nd ref='-52659' />
+ <nd ref='-52657' />
+ <nd ref='-52655' />
+ <nd ref='-52653' />
+ <nd ref='-52651' />
+ <nd ref='-52649' />
+ <nd ref='-52667' />
+ <nd ref='-52665' />
+ <nd ref='-52663' />
+ <nd ref='-52661' />
+ <nd ref='-52647' />
+ <nd ref='-36915' />
+ <nd ref='-52643' />
+ <nd ref='-52645' />
+ <nd ref='-52633' />
+ <nd ref='-52635' />
+ <nd ref='-52639' />
+ <nd ref='-52637' />
+ <nd ref='-52641' />
+ <nd ref='-52631' />
+ <nd ref='-52629' />
+ <nd ref='-41579' />
+ <nd ref='-52613' />
+ <nd ref='-52627' />
+ <nd ref='-52625' />
+ <nd ref='-52619' />
+ <nd ref='-52623' />
+ <nd ref='-52621' />
+ <nd ref='-52617' />
+ <nd ref='-52615' />
+ <nd ref='-41577' />
+ <nd ref='-52603' />
+ <nd ref='-52601' />
+ <nd ref='-52609' />
+ <nd ref='-52611' />
+ <nd ref='-52607' />
+ <nd ref='-52605' />
+ <nd ref='-41575' />
+ <nd ref='-52323' />
+ <nd ref='-52327' />
+ <nd ref='-52325' />
+ <nd ref='-52343' />
+ <nd ref='-52347' />
+ <nd ref='-52345' />
+ <nd ref='-52341' />
+ <nd ref='-52339' />
+ <nd ref='-52337' />
+ <nd ref='-52335' />
+ <nd ref='-52333' />
+ <nd ref='-52331' />
+ <nd ref='-52329' />
+ <nd ref='-52353' />
+ <nd ref='-52355' />
+ <nd ref='-52357' />
+ <nd ref='-52359' />
+ <nd ref='-52361' />
+ <nd ref='-52363' />
+ <nd ref='-52365' />
+ <nd ref='-52351' />
+ <nd ref='-52349' />
+ <nd ref='-36917' />
+ <nd ref='-36919' />
+ <nd ref='-36921' />
+ <nd ref='-36923' />
+ <nd ref='-41573' />
+ <nd ref='-36925' />
+ <nd ref='-41571' />
+ <nd ref='-36927' />
+ <nd ref='-34639' />
+ <nd ref='-34641' />
+ <nd ref='-36929' />
+ <nd ref='-36931' />
+ <nd ref='-36933' />
+ <nd ref='-36935' />
+ <nd ref='-40233' />
+ <nd ref='-50095' />
+ <nd ref='-50097' />
+ <nd ref='-50093' />
+ <nd ref='-50091' />
+ <nd ref='-50089' />
+ <nd ref='-36937' />
+ <nd ref='-36939' />
+ <nd ref='-40231' />
+ <nd ref='-36941' />
+ <nd ref='-40229' />
+ <nd ref='-40227' />
+ <nd ref='-50103' />
+ <nd ref='-50101' />
+ <nd ref='-50099' />
+ <nd ref='-40225' />
+ <nd ref='-50107' />
+ <nd ref='-50105' />
+ <nd ref='-36943' />
+ <nd ref='-36945' />
+ <nd ref='-40223' />
+ <nd ref='-50109' />
+ <nd ref='-50111' />
+ <nd ref='-50113' />
+ <nd ref='-50115' />
+ <nd ref='-40221' />
+ <nd ref='-50117' />
+ <nd ref='-36947' />
+ <nd ref='-51893' />
+ <nd ref='-51897' />
+ <nd ref='-51895' />
+ <nd ref='-51899' />
+ <nd ref='-51901' />
+ <nd ref='-51903' />
+ <nd ref='-51905' />
+ <nd ref='-51907' />
+ <nd ref='-51909' />
+ <nd ref='-51911' />
+ <nd ref='-51913' />
+ <nd ref='-51915' />
+ <nd ref='-51919' />
+ <nd ref='-51917' />
+ <nd ref='-51925' />
+ <nd ref='-51923' />
+ <nd ref='-51921' />
+ <nd ref='-51927' />
+ <nd ref='-51879' />
+ <nd ref='-51881' />
+ <nd ref='-51883' />
+ <nd ref='-51885' />
+ <nd ref='-51887' />
+ <nd ref='-51889' />
+ <nd ref='-51891' />
+ <nd ref='-51929' />
+ <nd ref='-51937' />
+ <nd ref='-51935' />
+ <nd ref='-51931' />
+ <nd ref='-51933' />
+ <nd ref='-36949' />
+ <nd ref='-51943' />
+ <nd ref='-51939' />
+ <nd ref='-51941' />
+ <nd ref='-42171' />
+ <nd ref='-51947' />
+ <nd ref='-51945' />
+ <nd ref='-36951' />
+ <nd ref='-42169' />
+ <nd ref='-52253' />
+ <nd ref='-52255' />
+ <nd ref='-52261' />
+ <nd ref='-52259' />
+ <nd ref='-52257' />
+ <nd ref='-52249' />
+ <nd ref='-52251' />
+ <nd ref='-36953' />
+ <nd ref='-52597' />
+ <nd ref='-52599' />
+ <nd ref='-42141' />
+ <nd ref='-52587' />
+ <nd ref='-52593' />
+ <nd ref='-52591' />
+ <nd ref='-52595' />
+ <nd ref='-52589' />
+ <nd ref='-52571' />
+ <nd ref='-52575' />
+ <nd ref='-52579' />
+ <nd ref='-52581' />
+ <nd ref='-52583' />
+ <nd ref='-52585' />
+ <nd ref='-52577' />
+ <nd ref='-52573' />
+ <nd ref='-42139' />
+ <nd ref='-52555' />
+ <nd ref='-52557' />
+ <nd ref='-52559' />
+ <nd ref='-52561' />
+ <nd ref='-52563' />
+ <nd ref='-52567' />
+ <nd ref='-52569' />
+ <nd ref='-52565' />
+ <nd ref='-36955' />
+ <nd ref='-52553' />
+ <nd ref='-52551' />
+ <nd ref='-52549' />
+ <nd ref='-42137' />
+ <nd ref='-52547' />
+ <nd ref='-36957' />
+ <tag k='ISO3166-1:alpha2' v='AF' />
+ <tag k='name:en' v='Afghanistan' />
+ </way>
+ <way id='-57473'>
+ <nd ref='-36959' />
+ <nd ref='-34869' />
+ <nd ref='-36961' />
+ <nd ref='-34867' />
+ <nd ref='-36963' />
+ <nd ref='-36965' />
+ <nd ref='-34865' />
+ <nd ref='-34859' />
+ <nd ref='-34861' />
+ <nd ref='-34863' />
+ <nd ref='-36967' />
+ <nd ref='-34857' />
+ <nd ref='-34851' />
+ <nd ref='-34853' />
+ <nd ref='-34855' />
+ <nd ref='-36969' />
+ <nd ref='-34845' />
+ <nd ref='-34843' />
+ <nd ref='-34841' />
+ <nd ref='-34839' />
+ <nd ref='-36971' />
+ <nd ref='-34831' />
+ <nd ref='-34833' />
+ <nd ref='-34835' />
+ <nd ref='-34837' />
+ <nd ref='-36973' />
+ <nd ref='-36975' />
+ <nd ref='-42393' />
+ <nd ref='-34829' />
+ <nd ref='-34827' />
+ <nd ref='-42391' />
+ <nd ref='-36977' />
+ <nd ref='-34811' />
+ <nd ref='-34813' />
+ <nd ref='-36979' />
+ <nd ref='-36981' />
+ <nd ref='-34817' />
+ <nd ref='-34819' />
+ <nd ref='-34821' />
+ <nd ref='-34823' />
+ <nd ref='-34815' />
+ <nd ref='-34825' />
+ <nd ref='-36983' />
+ <nd ref='-38821' />
+ <nd ref='-38819' />
+ <nd ref='-30633' />
+ <nd ref='-30631' />
+ <nd ref='-30627' />
+ <nd ref='-30629' />
+ <nd ref='-30625' />
+ <nd ref='-30623' />
+ <nd ref='-30621' />
+ <nd ref='-30619' />
+ <nd ref='-30617' />
+ <nd ref='-38817' />
+ <nd ref='-30603' />
+ <nd ref='-30601' />
+ <nd ref='-30599' />
+ <nd ref='-30595' />
+ <nd ref='-30597' />
+ <nd ref='-30613' />
+ <nd ref='-30609' />
+ <nd ref='-30607' />
+ <nd ref='-30605' />
+ <nd ref='-30611' />
+ <nd ref='-30615' />
+ <nd ref='-36985' />
+ <nd ref='-36987' />
+ <nd ref='-36989' />
+ <nd ref='-36991' />
+ <nd ref='-34849' />
+ <nd ref='-34847' />
+ <nd ref='-36959' />
+ <tag k='ISO3166-1:alpha2' v='AO' />
+ <tag k='name:en' v='Angola' />
+ </way>
+ <way id='-57475'>
+ <nd ref='-36993' />
+ <nd ref='-46753' />
+ <nd ref='-46751' />
+ <nd ref='-46755' />
+ <nd ref='-46757' />
+ <nd ref='-46759' />
+ <nd ref='-46761' />
+ <nd ref='-46763' />
+ <nd ref='-46765' />
+ <nd ref='-46749' />
+ <nd ref='-36995' />
+ <nd ref='-46875' />
+ <nd ref='-46873' />
+ <nd ref='-46877' />
+ <nd ref='-46879' />
+ <nd ref='-46881' />
+ <nd ref='-46871' />
+ <nd ref='-46869' />
+ <nd ref='-46867' />
+ <nd ref='-46891' />
+ <nd ref='-46889' />
+ <nd ref='-46887' />
+ <nd ref='-46885' />
+ <nd ref='-46883' />
+ <nd ref='-46899' />
+ <nd ref='-46895' />
+ <nd ref='-46897' />
+ <nd ref='-46893' />
+ <nd ref='-46903' />
+ <nd ref='-46905' />
+ <nd ref='-46901' />
+ <nd ref='-46907' />
+ <nd ref='-46909' />
+ <nd ref='-46913' />
+ <nd ref='-46911' />
+ <nd ref='-36997' />
+ <nd ref='-46989' />
+ <nd ref='-46987' />
+ <nd ref='-46985' />
+ <nd ref='-46983' />
+ <nd ref='-46981' />
+ <nd ref='-46979' />
+ <nd ref='-46965' />
+ <nd ref='-46977' />
+ <nd ref='-46975' />
+ <nd ref='-46967' />
+ <nd ref='-46963' />
+ <nd ref='-46969' />
+ <nd ref='-46971' />
+ <nd ref='-46973' />
+ <nd ref='-46961' />
+ <nd ref='-46941' />
+ <nd ref='-46939' />
+ <nd ref='-46943' />
+ <nd ref='-46945' />
+ <nd ref='-46947' />
+ <nd ref='-46949' />
+ <nd ref='-46951' />
+ <nd ref='-46959' />
+ <nd ref='-46953' />
+ <nd ref='-46957' />
+ <nd ref='-46955' />
+ <nd ref='-36999' />
+ <nd ref='-39859' />
+ <nd ref='-37001' />
+ <nd ref='-37003' />
+ <nd ref='-37005' />
+ <nd ref='-37007' />
+ <nd ref='-36619' />
+ <nd ref='-37009' />
+ <nd ref='-37011' />
+ <nd ref='-46917' />
+ <nd ref='-46915' />
+ <nd ref='-46919' />
+ <nd ref='-46921' />
+ <nd ref='-46923' />
+ <nd ref='-46925' />
+ <nd ref='-46927' />
+ <nd ref='-46929' />
+ <nd ref='-46931' />
+ <nd ref='-46933' />
+ <nd ref='-46935' />
+ <nd ref='-46937' />
+ <nd ref='-36993' />
+ <tag k='ISO3166-1:alpha2' v='AL' />
+ <tag k='name:en' v='Albania' />
+ </way>
+ <way id='-57477'>
+ <nd ref='-39433' />
+ <nd ref='-44225' />
+ <nd ref='-44223' />
+ <nd ref='-44221' />
+ <nd ref='-44231' />
+ <nd ref='-44229' />
+ <nd ref='-44227' />
+ <nd ref='-44219' />
+ <nd ref='-44233' />
+ <nd ref='-44207' />
+ <nd ref='-44217' />
+ <nd ref='-44215' />
+ <nd ref='-44209' />
+ <nd ref='-44213' />
+ <nd ref='-44211' />
+ <nd ref='-44235' />
+ <nd ref='-44237' />
+ <nd ref='-44239' />
+ <nd ref='-37013' />
+ <nd ref='-44197' />
+ <nd ref='-44199' />
+ <nd ref='-44201' />
+ <nd ref='-44245' />
+ <nd ref='-44203' />
+ <nd ref='-44205' />
+ <nd ref='-44195' />
+ <nd ref='-44241' />
+ <nd ref='-44243' />
+ <nd ref='-44187' />
+ <nd ref='-44189' />
+ <nd ref='-44191' />
+ <nd ref='-44193' />
+ <nd ref='-39433' />
+ <tag k='ISO3166-1:alpha2' v='AD' />
+ <tag k='name:en' v='Andorra' />
+ </way>
+ <way id='-57479'>
+ <nd ref='-37015' />
+ <nd ref='-37017' />
+ <nd ref='-37019' />
+ <nd ref='-37021' />
+ <nd ref='-37023' />
+ <nd ref='-37015' />
+ </way>
+ <way id='-57481'>
+ <nd ref='-37025' />
+ <nd ref='-37027' />
+ <nd ref='-40257' />
+ <nd ref='-34417' />
+ <nd ref='-34411' />
+ <nd ref='-34409' />
+ <nd ref='-34413' />
+ <nd ref='-34415' />
+ <nd ref='-37029' />
+ <nd ref='-37031' />
+ <nd ref='-34419' />
+ <nd ref='-34421' />
+ <nd ref='-34423' />
+ <nd ref='-34425' />
+ <nd ref='-34427' />
+ <nd ref='-34429' />
+ <nd ref='-37033' />
+ <nd ref='-34431' />
+ <nd ref='-34433' />
+ <nd ref='-34435' />
+ <nd ref='-37035' />
+ <nd ref='-34437' />
+ <nd ref='-34439' />
+ <nd ref='-37037' />
+ <nd ref='-34441' />
+ <nd ref='-34443' />
+ <nd ref='-34445' />
+ <nd ref='-37039' />
+ <nd ref='-37041' />
+ <nd ref='-34447' />
+ <nd ref='-37043' />
+ <nd ref='-34453' />
+ <nd ref='-34451' />
+ <nd ref='-34449' />
+ <nd ref='-37045' />
+ <nd ref='-37047' />
+ <nd ref='-37049' />
+ <nd ref='-37051' />
+ <nd ref='-34469' />
+ <nd ref='-34471' />
+ <nd ref='-41679' />
+ <nd ref='-34461' />
+ <nd ref='-34473' />
+ <nd ref='-34475' />
+ <nd ref='-34481' />
+ <nd ref='-34479' />
+ <nd ref='-34477' />
+ <nd ref='-37053' />
+ <nd ref='-37055' />
+ <nd ref='-34407' />
+ <nd ref='-34405' />
+ <nd ref='-34403' />
+ <nd ref='-34401' />
+ <nd ref='-34399' />
+ <nd ref='-34397' />
+ <nd ref='-34395' />
+ <nd ref='-34393' />
+ <nd ref='-34391' />
+ <nd ref='-34389' />
+ <nd ref='-34387' />
+ <nd ref='-37025' />
+ </way>
+ <way id='-57483'>
+ <nd ref='-37057' />
+ <nd ref='-37059' />
+ <nd ref='-37061' />
+ <nd ref='-37063' />
+ <nd ref='-37065' />
+ <nd ref='-37067' />
+ <nd ref='-37069' />
+ <nd ref='-37071' />
+ <nd ref='-37073' />
+ <nd ref='-37075' />
+ <nd ref='-37077' />
+ <nd ref='-37079' />
+ <nd ref='-37057' />
+ </way>
+ <way id='-57485'>
+ <nd ref='-37097' />
+ <nd ref='-43525' />
+ <nd ref='-43527' />
+ <nd ref='-43523' />
+ <nd ref='-36299' />
+ <nd ref='-36297' />
+ <nd ref='-36291' />
+ <nd ref='-36293' />
+ <nd ref='-36295' />
+ <nd ref='-36289' />
+ <nd ref='-37099' />
+ <nd ref='-36277' />
+ <nd ref='-36279' />
+ <nd ref='-36287' />
+ <nd ref='-36285' />
+ <nd ref='-36283' />
+ <nd ref='-36281' />
+ <nd ref='-36275' />
+ <nd ref='-36273' />
+ <nd ref='-36271' />
+ <nd ref='-36269' />
+ <nd ref='-36267' />
+ <nd ref='-36265' />
+ <nd ref='-37101' />
+ <nd ref='-36263' />
+ <nd ref='-36261' />
+ <nd ref='-36259' />
+ <nd ref='-36257' />
+ <nd ref='-36255' />
+ <nd ref='-36251' />
+ <nd ref='-36253' />
+ <nd ref='-36249' />
+ <nd ref='-36245' />
+ <nd ref='-36247' />
+ <nd ref='-36229' />
+ <nd ref='-36235' />
+ <nd ref='-36227' />
+ <nd ref='-36233' />
+ <nd ref='-36231' />
+ <nd ref='-36243' />
+ <nd ref='-36241' />
+ <nd ref='-36237' />
+ <nd ref='-36239' />
+ <nd ref='-36225' />
+ <nd ref='-36217' />
+ <nd ref='-36219' />
+ <nd ref='-36223' />
+ <nd ref='-36221' />
+ <nd ref='-37103' />
+ <nd ref='-37105' />
+ <nd ref='-36073' />
+ <nd ref='-36071' />
+ <nd ref='-36069' />
+ <nd ref='-36075' />
+ <nd ref='-37881' />
+ <nd ref='-36079' />
+ <nd ref='-36081' />
+ <nd ref='-36077' />
+ <nd ref='-36083' />
+ <nd ref='-37081' />
+ <nd ref='-36085' />
+ <nd ref='-37879' />
+ <nd ref='-36095' />
+ <nd ref='-36093' />
+ <nd ref='-36091' />
+ <nd ref='-36089' />
+ <nd ref='-36087' />
+ <nd ref='-37083' />
+ <nd ref='-36101' />
+ <nd ref='-36099' />
+ <nd ref='-36097' />
+ <nd ref='-36103' />
+ <nd ref='-41671' />
+ <nd ref='-36105' />
+ <nd ref='-36107' />
+ <nd ref='-36109' />
+ <nd ref='-36111' />
+ <nd ref='-36113' />
+ <nd ref='-41669' />
+ <nd ref='-36117' />
+ <nd ref='-36115' />
+ <nd ref='-41667' />
+ <nd ref='-36129' />
+ <nd ref='-36123' />
+ <nd ref='-36121' />
+ <nd ref='-36119' />
+ <nd ref='-36125' />
+ <nd ref='-36127' />
+ <nd ref='-37085' />
+ <nd ref='-37087' />
+ <nd ref='-36151' />
+ <nd ref='-37089' />
+ <nd ref='-37091' />
+ <nd ref='-37905' />
+ <nd ref='-36167' />
+ <nd ref='-37093' />
+ <nd ref='-36173' />
+ <nd ref='-36171' />
+ <nd ref='-36169' />
+ <nd ref='-37095' />
+ <nd ref='-36743' />
+ <nd ref='-36737' />
+ <nd ref='-36745' />
+ <nd ref='-36755' />
+ <nd ref='-36753' />
+ <nd ref='-38731' />
+ <nd ref='-36751' />
+ <nd ref='-36749' />
+ <nd ref='-36747' />
+ <nd ref='-43519' />
+ <nd ref='-43517' />
+ <nd ref='-43515' />
+ <nd ref='-43521' />
+ <nd ref='-37097' />
+ <tag k='ISO3166-1:alpha2' v='AR' />
+ <tag k='name:en' v='Argentina' />
+ </way>
+ <way id='-57487'>
+ <nd ref='-37107' />
+ <nd ref='-37109' />
+ <nd ref='-47557' />
+ <nd ref='-37111' />
+ <nd ref='-37107' />
+ <tag k='name:en' v='Artsvashen' />
+ </way>
+ <way id='-57489'>
+ <nd ref='-37113' />
+ <nd ref='-37115' />
+ <nd ref='-37117' />
+ <nd ref='-37119' />
+ <nd ref='-37121' />
+ <nd ref='-37123' />
+ <nd ref='-37125' />
+ <nd ref='-37127' />
+ <nd ref='-37129' />
+ <nd ref='-37131' />
+ <nd ref='-37133' />
+ <nd ref='-37135' />
+ <nd ref='-37137' />
+ <nd ref='-37139' />
+ <nd ref='-37141' />
+ <nd ref='-47555' />
+ <nd ref='-37143' />
+ <nd ref='-47587' />
+ <nd ref='-47589' />
+ <nd ref='-47591' />
+ <nd ref='-47593' />
+ <nd ref='-47585' />
+ <nd ref='-47597' />
+ <nd ref='-47599' />
+ <nd ref='-47595' />
+ <nd ref='-47603' />
+ <nd ref='-47601' />
+ <nd ref='-47605' />
+ <nd ref='-47607' />
+ <nd ref='-47615' />
+ <nd ref='-47613' />
+ <nd ref='-47611' />
+ <nd ref='-47609' />
+ <nd ref='-47617' />
+ <nd ref='-47619' />
+ <nd ref='-47621' />
+ <nd ref='-47623' />
+ <nd ref='-47625' />
+ <nd ref='-47627' />
+ <nd ref='-47629' />
+ <nd ref='-47631' />
+ <nd ref='-47633' />
+ <nd ref='-47643' />
+ <nd ref='-47637' />
+ <nd ref='-47639' />
+ <nd ref='-47641' />
+ <nd ref='-47635' />
+ <nd ref='-47653' />
+ <nd ref='-47655' />
+ <nd ref='-47657' />
+ <nd ref='-47651' />
+ <nd ref='-47663' />
+ <nd ref='-47661' />
+ <nd ref='-47659' />
+ <nd ref='-47645' />
+ <nd ref='-47647' />
+ <nd ref='-47649' />
+ <nd ref='-37145' />
+ <nd ref='-47667' />
+ <nd ref='-47665' />
+ <nd ref='-37259' />
+ <nd ref='-47669' />
+ <nd ref='-47671' />
+ <nd ref='-37147' />
+ <nd ref='-37149' />
+ <nd ref='-47673' />
+ <nd ref='-37151' />
+ <nd ref='-47675' />
+ <nd ref='-37153' />
+ <nd ref='-47681' />
+ <nd ref='-47683' />
+ <nd ref='-47685' />
+ <nd ref='-47687' />
+ <nd ref='-47679' />
+ <nd ref='-47677' />
+ <nd ref='-37155' />
+ <nd ref='-47691' />
+ <nd ref='-47689' />
+ <nd ref='-37157' />
+ <nd ref='-47693' />
+ <nd ref='-37159' />
+ <nd ref='-47695' />
+ <nd ref='-47697' />
+ <nd ref='-47707' />
+ <nd ref='-47705' />
+ <nd ref='-47703' />
+ <nd ref='-47701' />
+ <nd ref='-47699' />
+ <nd ref='-47717' />
+ <nd ref='-47709' />
+ <nd ref='-47723' />
+ <nd ref='-47721' />
+ <nd ref='-47711' />
+ <nd ref='-47719' />
+ <nd ref='-47713' />
+ <nd ref='-47715' />
+ <nd ref='-37161' />
+ <nd ref='-47583' />
+ <nd ref='-47559' />
+ <nd ref='-47581' />
+ <nd ref='-47579' />
+ <nd ref='-47561' />
+ <nd ref='-47575' />
+ <nd ref='-47577' />
+ <nd ref='-47565' />
+ <nd ref='-47573' />
+ <nd ref='-47571' />
+ <nd ref='-47569' />
+ <nd ref='-47567' />
+ <nd ref='-47563' />
+ <nd ref='-37163' />
+ <nd ref='-37113' />
+ </way>
+ <way id='-57491'>
+ <nd ref='-37165' />
+ <nd ref='-37167' />
+ <nd ref='-37169' />
+ <nd ref='-37171' />
+ <nd ref='-37173' />
+ <nd ref='-47553' />
+ <nd ref='-37175' />
+ <nd ref='-37177' />
+ <nd ref='-37179' />
+ <nd ref='-37165' />
+ </way>
+ <way id='-57493' visible='true'>
+ <nd ref='-37181' />
+ <nd ref='-37183' />
+ <nd ref='-37185' />
+ <nd ref='-37187' />
+ <nd ref='-37189' />
+ <nd ref='-37191' />
+ <nd ref='-37193' />
+ <nd ref='-37195' />
+ <nd ref='-37181' />
+ </way>
+ <way id='-57495'>
+ <nd ref='-37197' />
+ <nd ref='-49581' />
+ <nd ref='-49583' />
+ <nd ref='-49585' />
+ <nd ref='-49587' />
+ <nd ref='-49589' />
+ <nd ref='-49593' />
+ <nd ref='-49591' />
+ <nd ref='-49597' />
+ <nd ref='-49595' />
+ <nd ref='-49603' />
+ <nd ref='-49601' />
+ <nd ref='-49599' />
+ <nd ref='-37199' />
+ <nd ref='-49609' />
+ <nd ref='-49607' />
+ <nd ref='-49605' />
+ <nd ref='-49619' />
+ <nd ref='-49621' />
+ <nd ref='-49617' />
+ <nd ref='-49615' />
+ <nd ref='-49611' />
+ <nd ref='-49613' />
+ <nd ref='-49623' />
+ <nd ref='-37201' />
+ <nd ref='-49625' />
+ <nd ref='-49631' />
+ <nd ref='-49629' />
+ <nd ref='-49627' />
+ <nd ref='-49647' />
+ <nd ref='-49645' />
+ <nd ref='-49637' />
+ <nd ref='-49641' />
+ <nd ref='-49643' />
+ <nd ref='-49639' />
+ <nd ref='-49635' />
+ <nd ref='-49633' />
+ <nd ref='-37203' />
+ <nd ref='-49653' />
+ <nd ref='-49651' />
+ <nd ref='-49649' />
+ <nd ref='-49655' />
+ <nd ref='-49657' />
+ <nd ref='-49659' />
+ <nd ref='-37205' />
+ <nd ref='-37207' />
+ <nd ref='-37209' />
+ <nd ref='-49661' />
+ <nd ref='-49665' />
+ <nd ref='-49663' />
+ <nd ref='-37211' />
+ <nd ref='-49679' />
+ <nd ref='-49681' />
+ <nd ref='-49677' />
+ <nd ref='-49675' />
+ <nd ref='-49673' />
+ <nd ref='-49671' />
+ <nd ref='-49669' />
+ <nd ref='-49667' />
+ <nd ref='-37213' />
+ <nd ref='-49685' />
+ <nd ref='-49683' />
+ <nd ref='-37215' />
+ <nd ref='-32653' />
+ <nd ref='-32655' />
+ <nd ref='-32657' />
+ <nd ref='-32661' />
+ <nd ref='-32659' />
+ <nd ref='-32663' />
+ <nd ref='-32665' />
+ <nd ref='-32667' />
+ <nd ref='-32669' />
+ <nd ref='-32671' />
+ <nd ref='-32673' />
+ <nd ref='-32675' />
+ <nd ref='-32677' />
+ <nd ref='-32679' />
+ <nd ref='-32681' />
+ <nd ref='-32687' />
+ <nd ref='-32683' />
+ <nd ref='-32685' />
+ <nd ref='-32689' />
+ <nd ref='-32691' />
+ <nd ref='-32693' />
+ <nd ref='-32697' />
+ <nd ref='-32695' />
+ <nd ref='-32701' />
+ <nd ref='-32699' />
+ <nd ref='-32707' />
+ <nd ref='-32705' />
+ <nd ref='-32703' />
+ <nd ref='-32709' />
+ <nd ref='-32715' />
+ <nd ref='-32713' />
+ <nd ref='-32711' />
+ <nd ref='-32719' />
+ <nd ref='-32717' />
+ <nd ref='-32721' />
+ <nd ref='-32723' />
+ <nd ref='-32725' />
+ <nd ref='-32727' />
+ <nd ref='-32729' />
+ <nd ref='-32731' />
+ <nd ref='-40337' />
+ <nd ref='-33971' />
+ <nd ref='-33977' />
+ <nd ref='-33969' />
+ <nd ref='-33967' />
+ <nd ref='-33973' />
+ <nd ref='-33975' />
+ <nd ref='-33979' />
+ <nd ref='-33981' />
+ <nd ref='-33983' />
+ <nd ref='-33985' />
+ <nd ref='-33987' />
+ <nd ref='-33989' />
+ <nd ref='-33991' />
+ <nd ref='-33993' />
+ <nd ref='-33995' />
+ <nd ref='-37217' />
+ <nd ref='-44699' />
+ <nd ref='-44695' />
+ <nd ref='-44697' />
+ <nd ref='-44693' />
+ <nd ref='-44691' />
+ <nd ref='-37219' />
+ <nd ref='-37221' />
+ <nd ref='-37223' />
+ <nd ref='-37225' />
+ <nd ref='-37227' />
+ <nd ref='-44705' />
+ <nd ref='-44707' />
+ <nd ref='-44703' />
+ <nd ref='-44701' />
+ <nd ref='-44713' />
+ <nd ref='-44715' />
+ <nd ref='-44709' />
+ <nd ref='-44711' />
+ <nd ref='-37229' />
+ <nd ref='-37231' />
+ <nd ref='-44739' />
+ <nd ref='-37233' />
+ <nd ref='-44741' />
+ <nd ref='-44743' />
+ <nd ref='-44745' />
+ <nd ref='-44769' />
+ <nd ref='-44771' />
+ <nd ref='-44767' />
+ <nd ref='-44765' />
+ <nd ref='-44763' />
+ <nd ref='-44761' />
+ <nd ref='-44759' />
+ <nd ref='-44757' />
+ <nd ref='-44755' />
+ <nd ref='-44753' />
+ <nd ref='-44751' />
+ <nd ref='-44749' />
+ <nd ref='-44747' />
+ <nd ref='-37235' />
+ <nd ref='-39007' />
+ <nd ref='-37237' />
+ <nd ref='-45783' />
+ <nd ref='-45785' />
+ <nd ref='-45787' />
+ <nd ref='-45789' />
+ <nd ref='-45791' />
+ <nd ref='-45793' />
+ <nd ref='-45797' />
+ <nd ref='-45795' />
+ <nd ref='-45799' />
+ <nd ref='-45801' />
+ <nd ref='-45803' />
+ <nd ref='-45805' />
+ <nd ref='-45807' />
+ <nd ref='-45809' />
+ <nd ref='-45811' />
+ <nd ref='-45813' />
+ <nd ref='-45815' />
+ <nd ref='-45817' />
+ <nd ref='-45819' />
+ <nd ref='-45845' />
+ <nd ref='-45847' />
+ <nd ref='-45843' />
+ <nd ref='-45841' />
+ <nd ref='-45839' />
+ <nd ref='-45837' />
+ <nd ref='-45835' />
+ <nd ref='-45827' />
+ <nd ref='-45829' />
+ <nd ref='-45831' />
+ <nd ref='-45833' />
+ <nd ref='-45823' />
+ <nd ref='-45825' />
+ <nd ref='-45821' />
+ <nd ref='-45781' />
+ <nd ref='-45779' />
+ <nd ref='-45777' />
+ <nd ref='-45775' />
+ <nd ref='-45773' />
+ <nd ref='-45771' />
+ <nd ref='-37239' />
+ <nd ref='-45865' />
+ <nd ref='-45867' />
+ <nd ref='-45869' />
+ <nd ref='-45871' />
+ <nd ref='-45863' />
+ <nd ref='-45861' />
+ <nd ref='-45873' />
+ <nd ref='-45875' />
+ <nd ref='-45877' />
+ <nd ref='-45879' />
+ <nd ref='-45881' />
+ <nd ref='-45883' />
+ <nd ref='-45885' />
+ <nd ref='-45891' />
+ <nd ref='-45889' />
+ <nd ref='-45887' />
+ <nd ref='-45893' />
+ <nd ref='-45895' />
+ <nd ref='-45897' />
+ <nd ref='-45899' />
+ <nd ref='-45901' />
+ <nd ref='-45903' />
+ <nd ref='-45905' />
+ <nd ref='-45907' />
+ <nd ref='-45859' />
+ <nd ref='-45855' />
+ <nd ref='-45857' />
+ <nd ref='-45853' />
+ <nd ref='-45851' />
+ <nd ref='-45849' />
+ <nd ref='-37241' />
+ <nd ref='-45911' />
+ <nd ref='-45927' />
+ <nd ref='-45925' />
+ <nd ref='-45929' />
+ <nd ref='-45935' />
+ <nd ref='-45933' />
+ <nd ref='-45931' />
+ <nd ref='-45957' />
+ <nd ref='-45955' />
+ <nd ref='-45959' />
+ <nd ref='-45913' />
+ <nd ref='-45963' />
+ <nd ref='-45961' />
+ <nd ref='-45967' />
+ <nd ref='-45965' />
+ <nd ref='-45969' />
+ <nd ref='-45937' />
+ <nd ref='-45971' />
+ <nd ref='-45941' />
+ <nd ref='-45939' />
+ <nd ref='-45945' />
+ <nd ref='-45947' />
+ <nd ref='-45943' />
+ <nd ref='-45949' />
+ <nd ref='-45951' />
+ <nd ref='-45953' />
+ <nd ref='-45915' />
+ <nd ref='-45923' />
+ <nd ref='-45919' />
+ <nd ref='-45921' />
+ <nd ref='-45917' />
+ <nd ref='-45909' />
+ <nd ref='-45973' />
+ <nd ref='-45977' />
+ <nd ref='-45979' />
+ <nd ref='-45975' />
+ <nd ref='-45981' />
+ <nd ref='-45983' />
+ <nd ref='-45985' />
+ <nd ref='-45989' />
+ <nd ref='-45995' />
+ <nd ref='-45993' />
+ <nd ref='-45987' />
+ <nd ref='-45991' />
+ <nd ref='-46005' />
+ <nd ref='-46007' />
+ <nd ref='-46003' />
+ <nd ref='-46009' />
+ <nd ref='-46011' />
+ <nd ref='-46001' />
+ <nd ref='-45999' />
+ <nd ref='-45997' />
+ <nd ref='-46021' />
+ <nd ref='-46019' />
+ <nd ref='-46015' />
+ <nd ref='-46017' />
+ <nd ref='-46013' />
+ <nd ref='-37243' />
+ <nd ref='-46023' />
+ <nd ref='-46025' />
+ <nd ref='-46027' />
+ <nd ref='-46029' />
+ <nd ref='-46031' />
+ <nd ref='-46053' />
+ <nd ref='-46051' />
+ <nd ref='-46049' />
+ <nd ref='-46047' />
+ <nd ref='-46039' />
+ <nd ref='-46037' />
+ <nd ref='-46041' />
+ <nd ref='-46045' />
+ <nd ref='-46043' />
+ <nd ref='-46035' />
+ <nd ref='-46033' />
+ <nd ref='-37245' />
+ <nd ref='-46055' />
+ <nd ref='-46079' />
+ <nd ref='-46081' />
+ <nd ref='-46083' />
+ <nd ref='-46085' />
+ <nd ref='-46087' />
+ <nd ref='-46089' />
+ <nd ref='-46073' />
+ <nd ref='-46075' />
+ <nd ref='-46077' />
+ <nd ref='-46059' />
+ <nd ref='-46065' />
+ <nd ref='-46069' />
+ <nd ref='-46071' />
+ <nd ref='-46067' />
+ <nd ref='-46061' />
+ <nd ref='-46063' />
+ <nd ref='-46057' />
+ <nd ref='-39005' />
+ <nd ref='-49545' />
+ <nd ref='-49547' />
+ <nd ref='-49549' />
+ <nd ref='-37247' />
+ <nd ref='-37249' />
+ <nd ref='-37251' />
+ <nd ref='-37253' />
+ <nd ref='-49551' />
+ <nd ref='-49553' />
+ <nd ref='-37255' />
+ <nd ref='-49555' />
+ <nd ref='-49557' />
+ <nd ref='-49559' />
+ <nd ref='-49561' />
+ <nd ref='-37257' />
+ <nd ref='-49563' />
+ <nd ref='-49565' />
+ <nd ref='-49579' />
+ <nd ref='-49577' />
+ <nd ref='-49567' />
+ <nd ref='-49569' />
+ <nd ref='-49571' />
+ <nd ref='-49573' />
+ <nd ref='-49575' />
+ <nd ref='-37197' />
+ <tag k='ISO3166-1:alpha2' v='AT' />
+ <tag k='maxspeed:motorway' v='130' />
+ <tag k='maxspeed:rural' v='100' />
+ <tag k='maxspeed:source' v='http://ec.europa.eu/transport/road_safety/going_abroad/austria/speed_limits_en.htm' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Austria' />
+ </way>
+ <way id='-57497'>
+ <nd ref='-37153' />
+ <nd ref='-47675' />
+ <nd ref='-37151' />
+ <nd ref='-47673' />
+ <nd ref='-37149' />
+ <nd ref='-37147' />
+ <nd ref='-47671' />
+ <nd ref='-47669' />
+ <nd ref='-37259' />
+ <nd ref='-47737' />
+ <nd ref='-47747' />
+ <nd ref='-47745' />
+ <nd ref='-47743' />
+ <nd ref='-47741' />
+ <nd ref='-47739' />
+ <nd ref='-47751' />
+ <nd ref='-47749' />
+ <nd ref='-47735' />
+ <nd ref='-47733' />
+ <nd ref='-47731' />
+ <nd ref='-47729' />
+ <nd ref='-37261' />
+ <nd ref='-47727' />
+ <nd ref='-37263' />
+ <nd ref='-47725' />
+ <nd ref='-37157' />
+ <nd ref='-47689' />
+ <nd ref='-47691' />
+ <nd ref='-37155' />
+ <nd ref='-47677' />
+ <nd ref='-47679' />
+ <nd ref='-47687' />
+ <nd ref='-47685' />
+ <nd ref='-47683' />
+ <nd ref='-47681' />
+ <nd ref='-37153' />
+ <tag k='ISO3166-2' v='AZ-NX' />
+ <tag k='name:en' v='Nakhchivan' />
+ </way>
+ <way id='-57499'>
+ <nd ref='-37299' />
+ <nd ref='-47817' />
+ <nd ref='-47801' />
+ <nd ref='-47803' />
+ <nd ref='-47809' />
+ <nd ref='-47811' />
+ <nd ref='-47813' />
+ <nd ref='-47815' />
+ <nd ref='-47807' />
+ <nd ref='-47805' />
+ <nd ref='-37265' />
+ <nd ref='-47795' />
+ <nd ref='-47797' />
+ <nd ref='-47799' />
+ <nd ref='-47793' />
+ <nd ref='-47787' />
+ <nd ref='-47789' />
+ <nd ref='-47791' />
+ <nd ref='-47785' />
+ <nd ref='-37267' />
+ <nd ref='-41723' />
+ <nd ref='-42173' />
+ <nd ref='-37269' />
+ <nd ref='-37271' />
+ <nd ref='-47783' />
+ <nd ref='-47781' />
+ <nd ref='-47779' />
+ <nd ref='-47777' />
+ <nd ref='-37273' />
+ <nd ref='-37275' />
+ <nd ref='-37277' />
+ <nd ref='-37279' />
+ <nd ref='-37281' />
+ <nd ref='-47775' />
+ <nd ref='-37283' />
+ <nd ref='-47773' />
+ <nd ref='-37285' />
+ <nd ref='-47771' />
+ <nd ref='-47769' />
+ <nd ref='-47767' />
+ <nd ref='-47765' />
+ <nd ref='-37287' />
+ <nd ref='-37289' />
+ <nd ref='-37291' />
+ <nd ref='-47763' />
+ <nd ref='-47761' />
+ <nd ref='-47759' />
+ <nd ref='-47757' />
+ <nd ref='-47755' />
+ <nd ref='-47753' />
+ <nd ref='-37145' />
+ <nd ref='-47649' />
+ <nd ref='-47647' />
+ <nd ref='-47645' />
+ <nd ref='-47659' />
+ <nd ref='-47661' />
+ <nd ref='-47663' />
+ <nd ref='-47651' />
+ <nd ref='-47657' />
+ <nd ref='-47655' />
+ <nd ref='-47653' />
+ <nd ref='-47635' />
+ <nd ref='-47641' />
+ <nd ref='-47639' />
+ <nd ref='-47637' />
+ <nd ref='-47643' />
+ <nd ref='-47633' />
+ <nd ref='-47631' />
+ <nd ref='-47629' />
+ <nd ref='-47627' />
+ <nd ref='-47625' />
+ <nd ref='-47623' />
+ <nd ref='-47621' />
+ <nd ref='-47619' />
+ <nd ref='-47617' />
+ <nd ref='-47609' />
+ <nd ref='-47611' />
+ <nd ref='-47613' />
+ <nd ref='-47615' />
+ <nd ref='-47607' />
+ <nd ref='-47605' />
+ <nd ref='-47601' />
+ <nd ref='-47603' />
+ <nd ref='-47595' />
+ <nd ref='-47599' />
+ <nd ref='-47597' />
+ <nd ref='-47585' />
+ <nd ref='-47593' />
+ <nd ref='-47591' />
+ <nd ref='-47589' />
+ <nd ref='-47587' />
+ <nd ref='-37143' />
+ <nd ref='-47555' />
+ <nd ref='-37141' />
+ <nd ref='-37139' />
+ <nd ref='-37137' />
+ <nd ref='-37135' />
+ <nd ref='-37133' />
+ <nd ref='-37131' />
+ <nd ref='-37129' />
+ <nd ref='-37127' />
+ <nd ref='-37125' />
+ <nd ref='-37123' />
+ <nd ref='-37121' />
+ <nd ref='-37119' />
+ <nd ref='-37117' />
+ <nd ref='-37115' />
+ <nd ref='-37113' />
+ <nd ref='-37293' />
+ <nd ref='-37295' />
+ <nd ref='-37297' />
+ <nd ref='-47819' />
+ <nd ref='-47821' />
+ <nd ref='-47823' />
+ <nd ref='-47825' />
+ <nd ref='-47827' />
+ <nd ref='-47829' />
+ <nd ref='-47835' />
+ <nd ref='-47833' />
+ <nd ref='-47831' />
+ <nd ref='-47849' />
+ <nd ref='-47851' />
+ <nd ref='-47853' />
+ <nd ref='-47855' />
+ <nd ref='-47857' />
+ <nd ref='-47861' />
+ <nd ref='-47859' />
+ <nd ref='-47863' />
+ <nd ref='-47865' />
+ <nd ref='-47867' />
+ <nd ref='-47869' />
+ <nd ref='-47871' />
+ <nd ref='-47875' />
+ <nd ref='-47879' />
+ <nd ref='-47877' />
+ <nd ref='-47873' />
+ <nd ref='-47847' />
+ <nd ref='-47843' />
+ <nd ref='-47845' />
+ <nd ref='-47841' />
+ <nd ref='-47839' />
+ <nd ref='-47837' />
+ <nd ref='-37299' />
+ </way>
+ <way id='-57501'>
+ <nd ref='-42241' />
+ <nd ref='-37301' />
+ <nd ref='-34663' />
+ <nd ref='-34665' />
+ <nd ref='-34667' />
+ <nd ref='-34669' />
+ <nd ref='-34671' />
+ <nd ref='-34673' />
+ <nd ref='-37303' />
+ <nd ref='-34675' />
+ <nd ref='-34677' />
+ <nd ref='-34679' />
+ <nd ref='-34681' />
+ <nd ref='-42239' />
+ <nd ref='-37305' />
+ <nd ref='-37307' />
+ <nd ref='-34697' />
+ <nd ref='-37309' />
+ <nd ref='-34691' />
+ <nd ref='-34689' />
+ <nd ref='-34693' />
+ <nd ref='-34687' />
+ <nd ref='-34685' />
+ <nd ref='-34683' />
+ <nd ref='-34695' />
+ <nd ref='-38803' />
+ <nd ref='-34341' />
+ <nd ref='-34339' />
+ <nd ref='-34337' />
+ <nd ref='-34347' />
+ <nd ref='-34345' />
+ <nd ref='-34343' />
+ <nd ref='-34349' />
+ <nd ref='-42241' />
+ <tag k='ISO3166-1:alpha2' v='BI' />
+ <tag k='name:en' v='Burundi' />
+ </way>
+ <way id='-57503'>
+ <nd ref='-37311' />
+ <nd ref='-37313' />
+ <nd ref='-37315' />
+ <nd ref='-37317' />
+ <nd ref='-37319' />
+ <nd ref='-37321' />
+ <nd ref='-37323' />
+ <nd ref='-37325' />
+ <nd ref='-37327' />
+ <nd ref='-34627' />
+ <nd ref='-37329' />
+ <nd ref='-37331' />
+ <nd ref='-37333' />
+ <nd ref='-37335' />
+ <nd ref='-37337' />
+ <nd ref='-37339' />
+ <nd ref='-37341' />
+ <nd ref='-37343' />
+ <nd ref='-37345' />
+ <nd ref='-37347' />
+ <nd ref='-37349' />
+ <nd ref='-37351' />
+ <nd ref='-37353' />
+ <nd ref='-37355' />
+ <nd ref='-34625' />
+ <nd ref='-34623' />
+ <nd ref='-37357' />
+ <nd ref='-37359' />
+ <nd ref='-37361' />
+ <nd ref='-37363' />
+ <nd ref='-37365' />
+ <nd ref='-37367' />
+ <nd ref='-37369' />
+ <nd ref='-37371' />
+ <nd ref='-37373' />
+ <nd ref='-37375' />
+ <nd ref='-37377' />
+ <nd ref='-37379' />
+ <nd ref='-37381' />
+ <nd ref='-37383' />
+ <nd ref='-37385' />
+ <nd ref='-37387' />
+ <nd ref='-34611' />
+ <nd ref='-34613' />
+ <nd ref='-34617' />
+ <nd ref='-34619' />
+ <nd ref='-34615' />
+ <nd ref='-34621' />
+ <nd ref='-37389' />
+ <nd ref='-37391' />
+ <nd ref='-37393' />
+ <nd ref='-37395' />
+ <nd ref='-37397' />
+ <nd ref='-37399' />
+ <nd ref='-37401' />
+ <nd ref='-37403' />
+ <nd ref='-37405' />
+ <nd ref='-37407' />
+ <nd ref='-37409' />
+ <nd ref='-37411' />
+ <nd ref='-37413' />
+ <nd ref='-37415' />
+ <nd ref='-37417' />
+ <nd ref='-37419' />
+ <nd ref='-37421' />
+ <nd ref='-37423' />
+ <nd ref='-37425' />
+ <nd ref='-37427' />
+ <nd ref='-37429' />
+ <nd ref='-37431' />
+ <nd ref='-37433' />
+ <nd ref='-37435' />
+ <nd ref='-37437' />
+ <nd ref='-37439' />
+ <nd ref='-37441' />
+ <nd ref='-34607' />
+ <nd ref='-34605' />
+ <nd ref='-37443' />
+ <nd ref='-37445' />
+ <nd ref='-37447' />
+ <nd ref='-34609' />
+ <nd ref='-37449' />
+ <nd ref='-37451' />
+ <nd ref='-37453' />
+ <nd ref='-34577' />
+ <nd ref='-37455' />
+ <nd ref='-37457' />
+ <nd ref='-37459' />
+ <nd ref='-37461' />
+ <nd ref='-37463' />
+ <nd ref='-37465' />
+ <nd ref='-37467' />
+ <nd ref='-37469' />
+ <nd ref='-37471' />
+ <nd ref='-37473' />
+ <nd ref='-37475' />
+ <nd ref='-34579' />
+ <nd ref='-34581' />
+ <nd ref='-37477' />
+ <nd ref='-37479' />
+ <nd ref='-34583' />
+ <nd ref='-34585' />
+ <nd ref='-37481' />
+ <nd ref='-34587' />
+ <nd ref='-34589' />
+ <nd ref='-37483' />
+ <nd ref='-37485' />
+ <nd ref='-37487' />
+ <nd ref='-34591' />
+ <nd ref='-34597' />
+ <nd ref='-34599' />
+ <nd ref='-34601' />
+ <nd ref='-34593' />
+ <nd ref='-34595' />
+ <nd ref='-37489' />
+ <nd ref='-37491' />
+ <nd ref='-37493' />
+ <nd ref='-37495' />
+ <nd ref='-37497' />
+ <nd ref='-37499' />
+ <nd ref='-37501' />
+ <nd ref='-34603' />
+ <nd ref='-37503' />
+ <nd ref='-40797' />
+ <nd ref='-44953' />
+ <nd ref='-44957' />
+ <nd ref='-44955' />
+ <nd ref='-37505' />
+ <nd ref='-40885' />
+ <nd ref='-37507' />
+ <nd ref='-40883' />
+ <nd ref='-37509' />
+ <nd ref='-37511' />
+ <nd ref='-40881' />
+ <nd ref='-40879' />
+ <nd ref='-37513' />
+ <nd ref='-44959' />
+ <nd ref='-40877' />
+ <nd ref='-44963' />
+ <nd ref='-37515' />
+ <nd ref='-44961' />
+ <nd ref='-40875' />
+ <nd ref='-44969' />
+ <nd ref='-44967' />
+ <nd ref='-44965' />
+ <nd ref='-40873' />
+ <nd ref='-40871' />
+ <nd ref='-40869' />
+ <nd ref='-44973' />
+ <nd ref='-44971' />
+ <nd ref='-44975' />
+ <nd ref='-44977' />
+ <nd ref='-44979' />
+ <nd ref='-40867' />
+ <nd ref='-40865' />
+ <nd ref='-37517' />
+ <nd ref='-37519' />
+ <nd ref='-44981' />
+ <nd ref='-40863' />
+ <nd ref='-40861' />
+ <nd ref='-37521' />
+ <nd ref='-44983' />
+ <nd ref='-37523' />
+ <nd ref='-44985' />
+ <nd ref='-40859' />
+ <nd ref='-40857' />
+ <nd ref='-37525' />
+ <nd ref='-37527' />
+ <nd ref='-40855' />
+ <nd ref='-44987' />
+ <nd ref='-40853' />
+ <nd ref='-44989' />
+ <nd ref='-44991' />
+ <nd ref='-40851' />
+ <nd ref='-37529' />
+ <nd ref='-40849' />
+ <nd ref='-40847' />
+ <nd ref='-44993' />
+ <nd ref='-40845' />
+ <nd ref='-37531' />
+ <nd ref='-40843' />
+ <nd ref='-40841' />
+ <nd ref='-37533' />
+ <nd ref='-37535' />
+ <nd ref='-37537' />
+ <nd ref='-37539' />
+ <nd ref='-45251' />
+ <nd ref='-45249' />
+ <nd ref='-45247' />
+ <nd ref='-45235' />
+ <nd ref='-45241' />
+ <nd ref='-45243' />
+ <nd ref='-45237' />
+ <nd ref='-45239' />
+ <nd ref='-45245' />
+ <nd ref='-45233' />
+ <nd ref='-45231' />
+ <nd ref='-37541' />
+ <nd ref='-37543' />
+ <nd ref='-37545' />
+ <nd ref='-45255' />
+ <nd ref='-45253' />
+ <nd ref='-37547' />
+ <nd ref='-37549' />
+ <nd ref='-45229' />
+ <nd ref='-45227' />
+ <nd ref='-45225' />
+ <nd ref='-45223' />
+ <nd ref='-45221' />
+ <nd ref='-45219' />
+ <nd ref='-45217' />
+ <nd ref='-45215' />
+ <nd ref='-45213' />
+ <nd ref='-45211' />
+ <nd ref='-45209' />
+ <nd ref='-45207' />
+ <nd ref='-45205' />
+ <nd ref='-45203' />
+ <nd ref='-45201' />
+ <nd ref='-45199' />
+ <nd ref='-45197' />
+ <nd ref='-45195' />
+ <nd ref='-45193' />
+ <nd ref='-45191' />
+ <nd ref='-45189' />
+ <nd ref='-45187' />
+ <nd ref='-45185' />
+ <nd ref='-45183' />
+ <nd ref='-45181' />
+ <nd ref='-45179' />
+ <nd ref='-45177' />
+ <nd ref='-45175' />
+ <nd ref='-45173' />
+ <nd ref='-45171' />
+ <nd ref='-45169' />
+ <nd ref='-45167' />
+ <nd ref='-45165' />
+ <nd ref='-45163' />
+ <nd ref='-45161' />
+ <nd ref='-45155' />
+ <nd ref='-45157' />
+ <nd ref='-45159' />
+ <nd ref='-45153' />
+ <nd ref='-45151' />
+ <nd ref='-45149' />
+ <nd ref='-45147' />
+ <nd ref='-45145' />
+ <nd ref='-45143' />
+ <nd ref='-45141' />
+ <nd ref='-45139' />
+ <nd ref='-45133' />
+ <nd ref='-45135' />
+ <nd ref='-45137' />
+ <nd ref='-45131' />
+ <nd ref='-37551' />
+ <nd ref='-37553' />
+ <nd ref='-37555' />
+ <nd ref='-42859' />
+ <nd ref='-34637' />
+ <nd ref='-34635' />
+ <nd ref='-34633' />
+ <nd ref='-37557' />
+ <nd ref='-37559' />
+ <nd ref='-37561' />
+ <nd ref='-37563' />
+ <nd ref='-37565' />
+ <nd ref='-37567' />
+ <nd ref='-37569' />
+ <nd ref='-37571' />
+ <nd ref='-37573' />
+ <nd ref='-37575' />
+ <nd ref='-37577' />
+ <nd ref='-37579' />
+ <nd ref='-37581' />
+ <nd ref='-37583' />
+ <nd ref='-37585' />
+ <nd ref='-37587' />
+ <nd ref='-37589' />
+ <nd ref='-34631' />
+ <nd ref='-37591' />
+ <nd ref='-37593' />
+ <nd ref='-37595' />
+ <nd ref='-37597' />
+ <nd ref='-37599' />
+ <nd ref='-37601' />
+ <nd ref='-37603' />
+ <nd ref='-37605' />
+ <nd ref='-37607' />
+ <nd ref='-37609' />
+ <nd ref='-34629' />
+ <nd ref='-37311' />
+ </way>
+ <way id='-57505'>
+ <nd ref='-41481' />
+ <nd ref='-48169' />
+ <nd ref='-48171' />
+ <nd ref='-48173' />
+ <nd ref='-48145' />
+ <nd ref='-48147' />
+ <nd ref='-48149' />
+ <nd ref='-48151' />
+ <nd ref='-48157' />
+ <nd ref='-48159' />
+ <nd ref='-48161' />
+ <nd ref='-48163' />
+ <nd ref='-48165' />
+ <nd ref='-48155' />
+ <nd ref='-48167' />
+ <nd ref='-48153' />
+ <nd ref='-48143' />
+ <nd ref='-48175' />
+ <nd ref='-48177' />
+ <nd ref='-48179' />
+ <nd ref='-48181' />
+ <nd ref='-48183' />
+ <nd ref='-48185' />
+ <nd ref='-48189' />
+ <nd ref='-48187' />
+ <nd ref='-48191' />
+ <nd ref='-48193' />
+ <nd ref='-48195' />
+ <nd ref='-48197' />
+ <nd ref='-48199' />
+ <nd ref='-48201' />
+ <nd ref='-48203' />
+ <nd ref='-41479' />
+ <nd ref='-37611' />
+ <nd ref='-37613' />
+ <nd ref='-37615' />
+ <nd ref='-37617' />
+ <nd ref='-48141' />
+ <nd ref='-48137' />
+ <nd ref='-48139' />
+ <nd ref='-48135' />
+ <nd ref='-48133' />
+ <nd ref='-48115' />
+ <nd ref='-48131' />
+ <nd ref='-48129' />
+ <nd ref='-48127' />
+ <nd ref='-48125' />
+ <nd ref='-48117' />
+ <nd ref='-48119' />
+ <nd ref='-48121' />
+ <nd ref='-48123' />
+ <nd ref='-37619' />
+ <nd ref='-31905' />
+ <nd ref='-31903' />
+ <nd ref='-31911' />
+ <nd ref='-31909' />
+ <nd ref='-31907' />
+ <nd ref='-37621' />
+ <nd ref='-31901' />
+ <nd ref='-31859' />
+ <nd ref='-37623' />
+ <nd ref='-31861' />
+ <nd ref='-31863' />
+ <nd ref='-31855' />
+ <nd ref='-31853' />
+ <nd ref='-31857' />
+ <nd ref='-41481' />
+ <tag k='ISO3166-1:alpha2' v='BJ' />
+ <tag k='name:en' v='Benin' />
+ </way>
+ <way id='-57507'>
+ <nd ref='-37625' />
+ <nd ref='-37627' />
+ <nd ref='-31897' />
+ <nd ref='-31899' />
+ <nd ref='-31891' />
+ <nd ref='-31887' />
+ <nd ref='-31885' />
+ <nd ref='-31889' />
+ <nd ref='-31881' />
+ <nd ref='-31879' />
+ <nd ref='-31877' />
+ <nd ref='-31873' />
+ <nd ref='-31875' />
+ <nd ref='-31883' />
+ <nd ref='-31893' />
+ <nd ref='-31895' />
+ <nd ref='-37629' />
+ <nd ref='-37631' />
+ <nd ref='-37621' />
+ <nd ref='-31907' />
+ <nd ref='-31909' />
+ <nd ref='-31911' />
+ <nd ref='-31903' />
+ <nd ref='-31905' />
+ <nd ref='-37619' />
+ <nd ref='-37633' />
+ <nd ref='-37635' />
+ <nd ref='-48113' />
+ <nd ref='-48111' />
+ <nd ref='-37637' />
+ <nd ref='-39769' />
+ <nd ref='-47971' />
+ <nd ref='-47975' />
+ <nd ref='-47981' />
+ <nd ref='-47979' />
+ <nd ref='-47977' />
+ <nd ref='-47983' />
+ <nd ref='-47973' />
+ <nd ref='-47969' />
+ <nd ref='-37639' />
+ <nd ref='-47961' />
+ <nd ref='-47963' />
+ <nd ref='-47967' />
+ <nd ref='-47965' />
+ <nd ref='-38741' />
+ <nd ref='-47891' />
+ <nd ref='-47893' />
+ <nd ref='-47889' />
+ <nd ref='-47897' />
+ <nd ref='-47895' />
+ <nd ref='-47899' />
+ <nd ref='-47887' />
+ <nd ref='-47885' />
+ <nd ref='-47883' />
+ <nd ref='-47881' />
+ <nd ref='-47903' />
+ <nd ref='-47901' />
+ <nd ref='-47907' />
+ <nd ref='-47905' />
+ <nd ref='-47909' />
+ <nd ref='-38739' />
+ <nd ref='-32029' />
+ <nd ref='-32027' />
+ <nd ref='-32025' />
+ <nd ref='-32043' />
+ <nd ref='-32041' />
+ <nd ref='-32039' />
+ <nd ref='-32037' />
+ <nd ref='-32033' />
+ <nd ref='-32031' />
+ <nd ref='-32035' />
+ <nd ref='-32045' />
+ <nd ref='-32049' />
+ <nd ref='-32051' />
+ <nd ref='-32047' />
+ <nd ref='-32053' />
+ <nd ref='-32055' />
+ <nd ref='-32067' />
+ <nd ref='-32065' />
+ <nd ref='-32063' />
+ <nd ref='-32061' />
+ <nd ref='-32059' />
+ <nd ref='-32057' />
+ <nd ref='-32071' />
+ <nd ref='-32069' />
+ <nd ref='-32073' />
+ <nd ref='-37641' />
+ <nd ref='-37643' />
+ <nd ref='-32079' />
+ <nd ref='-32077' />
+ <nd ref='-32081' />
+ <nd ref='-32075' />
+ <nd ref='-37645' />
+ <nd ref='-37647' />
+ <nd ref='-37649' />
+ <nd ref='-37651' />
+ <nd ref='-37653' />
+ <nd ref='-32089' />
+ <nd ref='-32085' />
+ <nd ref='-32087' />
+ <nd ref='-32083' />
+ <nd ref='-37655' />
+ <nd ref='-37657' />
+ <nd ref='-37659' />
+ <nd ref='-37661' />
+ <nd ref='-37663' />
+ <nd ref='-37665' />
+ <nd ref='-37667' />
+ <nd ref='-32095' />
+ <nd ref='-32093' />
+ <nd ref='-32091' />
+ <nd ref='-37625' />
+ <tag k='ISO3166-1:alpha2' v='BF' />
+ <tag k='name:en' v='Burkina Faso' />
+ </way>
+ <way id='-57509'>
+ <nd ref='-37669' />
+ <nd ref='-50401' />
+ <nd ref='-50403' />
+ <nd ref='-50405' />
+ <nd ref='-50407' />
+ <nd ref='-50411' />
+ <nd ref='-50409' />
+ <nd ref='-37671' />
+ <nd ref='-50413' />
+ <nd ref='-37673' />
+ <nd ref='-50415' />
+ <nd ref='-50419' />
+ <nd ref='-50417' />
+ <nd ref='-37675' />
+ <nd ref='-50421' />
+ <nd ref='-50423' />
+ <nd ref='-50429' />
+ <nd ref='-50427' />
+ <nd ref='-50425' />
+ <nd ref='-37677' />
+ <nd ref='-50431' />
+ <nd ref='-37679' />
+ <nd ref='-50441' />
+ <nd ref='-50443' />
+ <nd ref='-50445' />
+ <nd ref='-50439' />
+ <nd ref='-50437' />
+ <nd ref='-50435' />
+ <nd ref='-50433' />
+ <nd ref='-37681' />
+ <nd ref='-50453' />
+ <nd ref='-50451' />
+ <nd ref='-50449' />
+ <nd ref='-50447' />
+ <nd ref='-37683' />
+ <nd ref='-50455' />
+ <nd ref='-50457' />
+ <nd ref='-50459' />
+ <nd ref='-50461' />
+ <nd ref='-50463' />
+ <nd ref='-37685' />
+ <nd ref='-50465' />
+ <nd ref='-37687' />
+ <nd ref='-37689' />
+ <nd ref='-50469' />
+ <nd ref='-50467' />
+ <nd ref='-50475' />
+ <nd ref='-50477' />
+ <nd ref='-50473' />
+ <nd ref='-50471' />
+ <nd ref='-50479' />
+ <nd ref='-50481' />
+ <nd ref='-37691' />
+ <nd ref='-50483' />
+ <nd ref='-37693' />
+ <nd ref='-37695' />
+ <nd ref='-50503' />
+ <nd ref='-50501' />
+ <nd ref='-50499' />
+ <nd ref='-50507' />
+ <nd ref='-50505' />
+ <nd ref='-50495' />
+ <nd ref='-50497' />
+ <nd ref='-50493' />
+ <nd ref='-50485' />
+ <nd ref='-50487' />
+ <nd ref='-50489' />
+ <nd ref='-50491' />
+ <nd ref='-37697' />
+ <nd ref='-40009' />
+ <nd ref='-37699' />
+ <nd ref='-40007' />
+ <nd ref='-50317' />
+ <nd ref='-37701' />
+ <nd ref='-37703' />
+ <nd ref='-50325' />
+ <nd ref='-50323' />
+ <nd ref='-50319' />
+ <nd ref='-50321' />
+ <nd ref='-37705' />
+ <nd ref='-50327' />
+ <nd ref='-37707' />
+ <nd ref='-50329' />
+ <nd ref='-50337' />
+ <nd ref='-50333' />
+ <nd ref='-50335' />
+ <nd ref='-50331' />
+ <nd ref='-37709' />
+ <nd ref='-37711' />
+ <nd ref='-37713' />
+ <nd ref='-50345' />
+ <nd ref='-50343' />
+ <nd ref='-50347' />
+ <nd ref='-50349' />
+ <nd ref='-50351' />
+ <nd ref='-50353' />
+ <nd ref='-50339' />
+ <nd ref='-50341' />
+ <nd ref='-50355' />
+ <nd ref='-50357' />
+ <nd ref='-50359' />
+ <nd ref='-50361' />
+ <nd ref='-50363' />
+ <nd ref='-50365' />
+ <nd ref='-50367' />
+ <nd ref='-37715' />
+ <nd ref='-37717' />
+ <nd ref='-37719' />
+ <nd ref='-37721' />
+ <nd ref='-37723' />
+ <nd ref='-37725' />
+ <nd ref='-50381' />
+ <nd ref='-50379' />
+ <nd ref='-50377' />
+ <nd ref='-50375' />
+ <nd ref='-50373' />
+ <nd ref='-50371' />
+ <nd ref='-50369' />
+ <nd ref='-50383' />
+ <nd ref='-50385' />
+ <nd ref='-50387' />
+ <nd ref='-50397' />
+ <nd ref='-50399' />
+ <nd ref='-50389' />
+ <nd ref='-50391' />
+ <nd ref='-50393' />
+ <nd ref='-50395' />
+ <nd ref='-37669' />
+ <tag k='ISO3166-1:alpha2' v='BD' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Bangladesh' />
+ </way>
+ <way id='-57511'>
+ <nd ref='-37727' />
+ <nd ref='-37729' />
+ <nd ref='-49941' />
+ <nd ref='-49943' />
+ <nd ref='-49945' />
+ <nd ref='-37731' />
+ <nd ref='-49949' />
+ <nd ref='-49947' />
+ <nd ref='-49955' />
+ <nd ref='-49951' />
+ <nd ref='-49953' />
+ <nd ref='-37733' />
+ <nd ref='-49959' />
+ <nd ref='-49957' />
+ <nd ref='-37735' />
+ <nd ref='-37737' />
+ <nd ref='-49961' />
+ <nd ref='-49963' />
+ <nd ref='-37739' />
+ <nd ref='-49965' />
+ <nd ref='-37741' />
+ <nd ref='-49967' />
+ <nd ref='-37743' />
+ <nd ref='-49973' />
+ <nd ref='-49975' />
+ <nd ref='-49971' />
+ <nd ref='-49969' />
+ <nd ref='-37745' />
+ <nd ref='-37747' />
+ <nd ref='-41693' />
+ <nd ref='-42217' />
+ <nd ref='-37749' />
+ <nd ref='-31689' />
+ <nd ref='-31683' />
+ <nd ref='-31685' />
+ <nd ref='-31687' />
+ <nd ref='-31691' />
+ <nd ref='-31681' />
+ <nd ref='-31675' />
+ <nd ref='-31679' />
+ <nd ref='-31677' />
+ <nd ref='-31693' />
+ <nd ref='-31697' />
+ <nd ref='-31695' />
+ <nd ref='-31703' />
+ <nd ref='-31701' />
+ <nd ref='-31699' />
+ <nd ref='-31705' />
+ <nd ref='-31707' />
+ <nd ref='-47239' />
+ <nd ref='-39857' />
+ <nd ref='-47219' />
+ <nd ref='-47221' />
+ <nd ref='-47237' />
+ <nd ref='-47223' />
+ <nd ref='-47225' />
+ <nd ref='-47227' />
+ <nd ref='-47229' />
+ <nd ref='-47231' />
+ <nd ref='-47233' />
+ <nd ref='-47235' />
+ <nd ref='-47217' />
+ <nd ref='-47215' />
+ <nd ref='-47213' />
+ <nd ref='-47211' />
+ <nd ref='-47209' />
+ <nd ref='-47195' />
+ <nd ref='-47199' />
+ <nd ref='-47207' />
+ <nd ref='-47205' />
+ <nd ref='-47203' />
+ <nd ref='-47201' />
+ <nd ref='-47197' />
+ <nd ref='-47179' />
+ <nd ref='-47187' />
+ <nd ref='-47189' />
+ <nd ref='-47193' />
+ <nd ref='-47191' />
+ <nd ref='-47185' />
+ <nd ref='-47181' />
+ <nd ref='-47183' />
+ <nd ref='-47137' />
+ <nd ref='-47135' />
+ <nd ref='-47139' />
+ <nd ref='-47141' />
+ <nd ref='-47175' />
+ <nd ref='-47177' />
+ <nd ref='-47143' />
+ <nd ref='-47145' />
+ <nd ref='-47173' />
+ <nd ref='-47171' />
+ <nd ref='-47169' />
+ <nd ref='-47151' />
+ <nd ref='-47149' />
+ <nd ref='-47165' />
+ <nd ref='-47163' />
+ <nd ref='-47167' />
+ <nd ref='-47147' />
+ <nd ref='-47155' />
+ <nd ref='-47159' />
+ <nd ref='-47157' />
+ <nd ref='-47161' />
+ <nd ref='-47153' />
+ <nd ref='-39861' />
+ <nd ref='-46817' />
+ <nd ref='-46815' />
+ <nd ref='-46813' />
+ <nd ref='-46811' />
+ <nd ref='-46809' />
+ <nd ref='-46807' />
+ <nd ref='-46795' />
+ <nd ref='-46805' />
+ <nd ref='-46803' />
+ <nd ref='-46801' />
+ <nd ref='-46797' />
+ <nd ref='-46799' />
+ <nd ref='-37751' />
+ <nd ref='-49907' />
+ <nd ref='-49913' />
+ <nd ref='-49911' />
+ <nd ref='-49909' />
+ <nd ref='-41953' />
+ <nd ref='-49915' />
+ <nd ref='-49917' />
+ <nd ref='-37753' />
+ <nd ref='-49921' />
+ <nd ref='-49919' />
+ <nd ref='-49923' />
+ <nd ref='-49925' />
+ <nd ref='-41951' />
+ <nd ref='-49929' />
+ <nd ref='-49927' />
+ <nd ref='-41949' />
+ <nd ref='-37755' />
+ <nd ref='-49931' />
+ <nd ref='-37757' />
+ <nd ref='-37759' />
+ <nd ref='-37761' />
+ <nd ref='-49933' />
+ <nd ref='-41947' />
+ <nd ref='-37763' />
+ <nd ref='-49939' />
+ <nd ref='-49935' />
+ <nd ref='-49937' />
+ <nd ref='-37765' />
+ <nd ref='-37727' />
+ <tag k='ISO3166-1:alpha2' v='BG' />
+ <tag k='maxspeed:motorway' v='140' />
+ <tag k='maxspeed:rural' v='90' />
+ <tag k='maxspeed:source' v='http://ec.europa.eu/transport/road_safety/going_abroad/bulgaria/speed_limits_en.htm' />
+ <tag k='maxspeed:trunk' v='120' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Bulgaria' />
+ </way>
+ <way id='-57513'>
+ <nd ref='-37767' />
+ <nd ref='-34459' />
+ <nd ref='-34457' />
+ <nd ref='-34455' />
+ <nd ref='-37769' />
+ <nd ref='-41675' />
+ <nd ref='-41825' />
+ <nd ref='-37771' />
+ <nd ref='-41823' />
+ <nd ref='-34385' />
+ <nd ref='-37767' />
+ <tag k='ISO3166-1:alpha2' v='BH' />
+ <tag k='name:en' v='Bahrain' />
+ </way>
+ <way id='-57515'>
+ <nd ref='-37773' />
+ <nd ref='-49783' />
+ <nd ref='-37775' />
+ <nd ref='-49791' />
+ <nd ref='-49789' />
+ <nd ref='-49787' />
+ <nd ref='-49785' />
+ <nd ref='-49793' />
+ <nd ref='-49795' />
+ <nd ref='-37777' />
+ <nd ref='-37779' />
+ <nd ref='-37781' />
+ <nd ref='-49797' />
+ <nd ref='-49863' />
+ <nd ref='-37783' />
+ <nd ref='-49865' />
+ <nd ref='-49869' />
+ <nd ref='-49871' />
+ <nd ref='-49867' />
+ <nd ref='-49873' />
+ <nd ref='-49875' />
+ <nd ref='-49879' />
+ <nd ref='-49881' />
+ <nd ref='-49885' />
+ <nd ref='-49883' />
+ <nd ref='-49877' />
+ <nd ref='-49887' />
+ <nd ref='-49889' />
+ <nd ref='-37785' />
+ <nd ref='-37787' />
+ <nd ref='-49893' />
+ <nd ref='-49895' />
+ <nd ref='-49897' />
+ <nd ref='-49903' />
+ <nd ref='-49901' />
+ <nd ref='-49899' />
+ <nd ref='-49891' />
+ <nd ref='-49905' />
+ <nd ref='-41959' />
+ <nd ref='-47083' />
+ <nd ref='-47085' />
+ <nd ref='-47087' />
+ <nd ref='-47089' />
+ <nd ref='-47093' />
+ <nd ref='-47091' />
+ <nd ref='-47081' />
+ <nd ref='-47079' />
+ <nd ref='-47077' />
+ <nd ref='-47075' />
+ <nd ref='-47073' />
+ <nd ref='-47071' />
+ <nd ref='-47069' />
+ <nd ref='-47067' />
+ <nd ref='-47065' />
+ <nd ref='-47063' />
+ <nd ref='-47061' />
+ <nd ref='-47059' />
+ <nd ref='-47057' />
+ <nd ref='-47055' />
+ <nd ref='-47053' />
+ <nd ref='-47041' />
+ <nd ref='-47043' />
+ <nd ref='-47051' />
+ <nd ref='-47049' />
+ <nd ref='-47047' />
+ <nd ref='-47045' />
+ <nd ref='-47027' />
+ <nd ref='-47037' />
+ <nd ref='-47035' />
+ <nd ref='-47033' />
+ <nd ref='-47039' />
+ <nd ref='-47031' />
+ <nd ref='-47029' />
+ <nd ref='-37789' />
+ <nd ref='-49687' />
+ <nd ref='-49689' />
+ <nd ref='-49697' />
+ <nd ref='-49693' />
+ <nd ref='-49695' />
+ <nd ref='-49691' />
+ <nd ref='-39925' />
+ <nd ref='-39923' />
+ <nd ref='-37791' />
+ <nd ref='-37793' />
+ <nd ref='-37795' />
+ <nd ref='-49699' />
+ <nd ref='-49703' />
+ <nd ref='-49707' />
+ <nd ref='-49705' />
+ <nd ref='-49701' />
+ <nd ref='-49709' />
+ <nd ref='-37797' />
+ <nd ref='-49713' />
+ <nd ref='-49717' />
+ <nd ref='-49715' />
+ <nd ref='-49711' />
+ <nd ref='-37799' />
+ <nd ref='-49719' />
+ <nd ref='-49721' />
+ <nd ref='-37801' />
+ <nd ref='-49727' />
+ <nd ref='-49729' />
+ <nd ref='-49731' />
+ <nd ref='-49725' />
+ <nd ref='-49723' />
+ <nd ref='-49737' />
+ <nd ref='-49739' />
+ <nd ref='-49735' />
+ <nd ref='-49733' />
+ <nd ref='-37803' />
+ <nd ref='-37805' />
+ <nd ref='-49741' />
+ <nd ref='-49745' />
+ <nd ref='-49747' />
+ <nd ref='-49743' />
+ <nd ref='-49749' />
+ <nd ref='-49751' />
+ <nd ref='-49753' />
+ <nd ref='-49755' />
+ <nd ref='-37807' />
+ <nd ref='-49757' />
+ <nd ref='-49759' />
+ <nd ref='-49761' />
+ <nd ref='-49767' />
+ <nd ref='-49769' />
+ <nd ref='-49765' />
+ <nd ref='-49763' />
+ <nd ref='-49771' />
+ <nd ref='-49773' />
+ <nd ref='-49777' />
+ <nd ref='-49779' />
+ <nd ref='-49781' />
+ <nd ref='-49775' />
+ <nd ref='-37773' />
+ <tag k='ISO3166-1:alpha2' v='BA' />
+ <tag k='name:en' v='Bosnia and Herzegovina' />
+ </way>
+ <way id='-57517'>
+ <nd ref='-37809' />
+ <nd ref='-51543' />
+ <nd ref='-51557' />
+ <nd ref='-51559' />
+ <nd ref='-51555' />
+ <nd ref='-51551' />
+ <nd ref='-51553' />
+ <nd ref='-51549' />
+ <nd ref='-51545' />
+ <nd ref='-51547' />
+ <nd ref='-37811' />
+ <nd ref='-51541' />
+ <nd ref='-51531' />
+ <nd ref='-51533' />
+ <nd ref='-51537' />
+ <nd ref='-51539' />
+ <nd ref='-51535' />
+ <nd ref='-37813' />
+ <nd ref='-51519' />
+ <nd ref='-51529' />
+ <nd ref='-51527' />
+ <nd ref='-51525' />
+ <nd ref='-51521' />
+ <nd ref='-51523' />
+ <nd ref='-51509' />
+ <nd ref='-51517' />
+ <nd ref='-51515' />
+ <nd ref='-51513' />
+ <nd ref='-51511' />
+ <nd ref='-41773' />
+ <nd ref='-41771' />
+ <nd ref='-51497' />
+ <nd ref='-51505' />
+ <nd ref='-51507' />
+ <nd ref='-51503' />
+ <nd ref='-51501' />
+ <nd ref='-51499' />
+ <nd ref='-41769' />
+ <nd ref='-41767' />
+ <nd ref='-51483' />
+ <nd ref='-51495' />
+ <nd ref='-51493' />
+ <nd ref='-51491' />
+ <nd ref='-51485' />
+ <nd ref='-51487' />
+ <nd ref='-51489' />
+ <nd ref='-37815' />
+ <nd ref='-51481' />
+ <nd ref='-41765' />
+ <nd ref='-51479' />
+ <nd ref='-37817' />
+ <nd ref='-37819' />
+ <nd ref='-51477' />
+ <nd ref='-51475' />
+ <nd ref='-37821' />
+ <nd ref='-51465' />
+ <nd ref='-51467' />
+ <nd ref='-51469' />
+ <nd ref='-51471' />
+ <nd ref='-51473' />
+ <nd ref='-41763' />
+ <nd ref='-51463' />
+ <nd ref='-51461' />
+ <nd ref='-37823' />
+ <nd ref='-51459' />
+ <nd ref='-51457' />
+ <nd ref='-51455' />
+ <nd ref='-51453' />
+ <nd ref='-51443' />
+ <nd ref='-51451' />
+ <nd ref='-51449' />
+ <nd ref='-51447' />
+ <nd ref='-51445' />
+ <nd ref='-41761' />
+ <nd ref='-51439' />
+ <nd ref='-51441' />
+ <nd ref='-41759' />
+ <nd ref='-51431' />
+ <nd ref='-51435' />
+ <nd ref='-51437' />
+ <nd ref='-51433' />
+ <nd ref='-41757' />
+ <nd ref='-51419' />
+ <nd ref='-51417' />
+ <nd ref='-51421' />
+ <nd ref='-41755' />
+ <nd ref='-51415' />
+ <nd ref='-51413' />
+ <nd ref='-51411' />
+ <nd ref='-37825' />
+ <nd ref='-51409' />
+ <nd ref='-51403' />
+ <nd ref='-51401' />
+ <nd ref='-51407' />
+ <nd ref='-51405' />
+ <nd ref='-51399' />
+ <nd ref='-51397' />
+ <nd ref='-51395' />
+ <nd ref='-37827' />
+ <nd ref='-51361' />
+ <nd ref='-51365' />
+ <nd ref='-51363' />
+ <nd ref='-51371' />
+ <nd ref='-51375' />
+ <nd ref='-51373' />
+ <nd ref='-51369' />
+ <nd ref='-51367' />
+ <nd ref='-51393' />
+ <nd ref='-51391' />
+ <nd ref='-51387' />
+ <nd ref='-51389' />
+ <nd ref='-51385' />
+ <nd ref='-51377' />
+ <nd ref='-51383' />
+ <nd ref='-51381' />
+ <nd ref='-37829' />
+ <nd ref='-51379' />
+ <nd ref='-42287' />
+ <nd ref='-42285' />
+ <nd ref='-51351' />
+ <nd ref='-51349' />
+ <nd ref='-51353' />
+ <nd ref='-51347' />
+ <nd ref='-51345' />
+ <nd ref='-51343' />
+ <nd ref='-51341' />
+ <nd ref='-51357' />
+ <nd ref='-51359' />
+ <nd ref='-51355' />
+ <nd ref='-51337' />
+ <nd ref='-51339' />
+ <nd ref='-37831' />
+ <nd ref='-42283' />
+ <nd ref='-51329' />
+ <nd ref='-51335' />
+ <nd ref='-51331' />
+ <nd ref='-51333' />
+ <nd ref='-37833' />
+ <nd ref='-51327' />
+ <nd ref='-51325' />
+ <nd ref='-51323' />
+ <nd ref='-42281' />
+ <nd ref='-51321' />
+ <nd ref='-51319' />
+ <nd ref='-51317' />
+ <nd ref='-51315' />
+ <nd ref='-37835' />
+ <nd ref='-51273' />
+ <nd ref='-51283' />
+ <nd ref='-51281' />
+ <nd ref='-51279' />
+ <nd ref='-51277' />
+ <nd ref='-51275' />
+ <nd ref='-42279' />
+ <nd ref='-51267' />
+ <nd ref='-51265' />
+ <nd ref='-51269' />
+ <nd ref='-51271' />
+ <nd ref='-51263' />
+ <nd ref='-37837' />
+ <nd ref='-51261' />
+ <nd ref='-51259' />
+ <nd ref='-37839' />
+ <nd ref='-51253' />
+ <nd ref='-51255' />
+ <nd ref='-51257' />
+ <nd ref='-37841' />
+ <nd ref='-37843' />
+ <nd ref='-51245' />
+ <nd ref='-51251' />
+ <nd ref='-51247' />
+ <nd ref='-51249' />
+ <nd ref='-37845' />
+ <nd ref='-51243' />
+ <nd ref='-40783' />
+ <nd ref='-46505' />
+ <nd ref='-46519' />
+ <nd ref='-46517' />
+ <nd ref='-46521' />
+ <nd ref='-46515' />
+ <nd ref='-46513' />
+ <nd ref='-46509' />
+ <nd ref='-46511' />
+ <nd ref='-46507' />
+ <nd ref='-46523' />
+ <nd ref='-46525' />
+ <nd ref='-46527' />
+ <nd ref='-46529' />
+ <nd ref='-46503' />
+ <nd ref='-46533' />
+ <nd ref='-46535' />
+ <nd ref='-46537' />
+ <nd ref='-46539' />
+ <nd ref='-46541' />
+ <nd ref='-46545' />
+ <nd ref='-46543' />
+ <nd ref='-46547' />
+ <nd ref='-46549' />
+ <nd ref='-46551' />
+ <nd ref='-46553' />
+ <nd ref='-46555' />
+ <nd ref='-46557' />
+ <nd ref='-46559' />
+ <nd ref='-46561' />
+ <nd ref='-46563' />
+ <nd ref='-46565' />
+ <nd ref='-46567' />
+ <nd ref='-46569' />
+ <nd ref='-46573' />
+ <nd ref='-46571' />
+ <nd ref='-46575' />
+ <nd ref='-46531' />
+ <nd ref='-46577' />
+ <nd ref='-46579' />
+ <nd ref='-46581' />
+ <nd ref='-46583' />
+ <nd ref='-46585' />
+ <nd ref='-46587' />
+ <nd ref='-46589' />
+ <nd ref='-46591' />
+ <nd ref='-46593' />
+ <nd ref='-46617' />
+ <nd ref='-46621' />
+ <nd ref='-46619' />
+ <nd ref='-46615' />
+ <nd ref='-46613' />
+ <nd ref='-46611' />
+ <nd ref='-46609' />
+ <nd ref='-46607' />
+ <nd ref='-46605' />
+ <nd ref='-46603' />
+ <nd ref='-46601' />
+ <nd ref='-46599' />
+ <nd ref='-46597' />
+ <nd ref='-46595' />
+ <nd ref='-37847' />
+ <nd ref='-34923' />
+ <nd ref='-34921' />
+ <nd ref='-34919' />
+ <nd ref='-34917' />
+ <nd ref='-34915' />
+ <nd ref='-34913' />
+ <nd ref='-34909' />
+ <nd ref='-34911' />
+ <nd ref='-34907' />
+ <nd ref='-34905' />
+ <nd ref='-37809' />
+ <tag k='ISO3166-1:alpha2' v='BY' />
+ <tag k='name:en' v='Belarus' />
+ </way>
+ <way id='-57519'>
+ <nd ref='-37849' />
+ <nd ref='-37851' />
+ <nd ref='-41059' />
+ <nd ref='-37853' />
+ <nd ref='-37855' />
+ <nd ref='-41057' />
+ <nd ref='-41055' />
+ <nd ref='-41053' />
+ <nd ref='-41051' />
+ <nd ref='-41049' />
+ <nd ref='-41047' />
+ <nd ref='-36769' />
+ <nd ref='-36773' />
+ <nd ref='-36771' />
+ <nd ref='-36783' />
+ <nd ref='-36785' />
+ <nd ref='-39865' />
+ <nd ref='-36781' />
+ <nd ref='-39863' />
+ <nd ref='-43461' />
+ <nd ref='-43463' />
+ <nd ref='-43465' />
+ <nd ref='-43469' />
+ <nd ref='-43467' />
+ <nd ref='-37849' />
+ <tag k='ISO3166-1:alpha2' v='BZ' />
+ <tag k='name:en' v='Belize' />
+ </way>
+ <way id='-57521'>
+ <nd ref='-37913' />
+ <nd ref='-35999' />
+ <nd ref='-35997' />
+ <nd ref='-36001' />
+ <nd ref='-36005' />
+ <nd ref='-36003' />
+ <nd ref='-36007' />
+ <nd ref='-37857' />
+ <nd ref='-37911' />
+ <nd ref='-37859' />
+ <nd ref='-37909' />
+ <nd ref='-36039' />
+ <nd ref='-36037' />
+ <nd ref='-36035' />
+ <nd ref='-36033' />
+ <nd ref='-36031' />
+ <nd ref='-36029' />
+ <nd ref='-36027' />
+ <nd ref='-36025' />
+ <nd ref='-37861' />
+ <nd ref='-36019' />
+ <nd ref='-36021' />
+ <nd ref='-36017' />
+ <nd ref='-36013' />
+ <nd ref='-36011' />
+ <nd ref='-36009' />
+ <nd ref='-36015' />
+ <nd ref='-36023' />
+ <nd ref='-37863' />
+ <nd ref='-37865' />
+ <nd ref='-37907' />
+ <nd ref='-37867' />
+ <nd ref='-37869' />
+ <nd ref='-37871' />
+ <nd ref='-37873' />
+ <nd ref='-36131' />
+ <nd ref='-37875' />
+ <nd ref='-37877' />
+ <nd ref='-37879' />
+ <nd ref='-36085' />
+ <nd ref='-37081' />
+ <nd ref='-36083' />
+ <nd ref='-36077' />
+ <nd ref='-36081' />
+ <nd ref='-36079' />
+ <nd ref='-37881' />
+ <nd ref='-36075' />
+ <nd ref='-36069' />
+ <nd ref='-36071' />
+ <nd ref='-36073' />
+ <nd ref='-37105' />
+ <nd ref='-36215' />
+ <nd ref='-38735' />
+ <nd ref='-36203' />
+ <nd ref='-36201' />
+ <nd ref='-36197' />
+ <nd ref='-36199' />
+ <nd ref='-36213' />
+ <nd ref='-36211' />
+ <nd ref='-36209' />
+ <nd ref='-36207' />
+ <nd ref='-36205' />
+ <nd ref='-37883' />
+ <nd ref='-38733' />
+ <nd ref='-37885' />
+ <nd ref='-36175' />
+ <nd ref='-36177' />
+ <nd ref='-36179' />
+ <nd ref='-41601' />
+ <nd ref='-36067' />
+ <nd ref='-36065' />
+ <nd ref='-36063' />
+ <nd ref='-36061' />
+ <nd ref='-36051' />
+ <nd ref='-36053' />
+ <nd ref='-36055' />
+ <nd ref='-36059' />
+ <nd ref='-36057' />
+ <nd ref='-37887' />
+ <nd ref='-41599' />
+ <nd ref='-36047' />
+ <nd ref='-36049' />
+ <nd ref='-36045' />
+ <nd ref='-37889' />
+ <nd ref='-36041' />
+ <nd ref='-36043' />
+ <nd ref='-41597' />
+ <nd ref='-37891' />
+ <nd ref='-37917' />
+ <nd ref='-35981' />
+ <nd ref='-37915' />
+ <nd ref='-35989' />
+ <nd ref='-35987' />
+ <nd ref='-35985' />
+ <nd ref='-35983' />
+ <nd ref='-37893' />
+ <nd ref='-35995' />
+ <nd ref='-35993' />
+ <nd ref='-35991' />
+ <nd ref='-37913' />
+ <tag k='ISO3166-1:alpha2' v='BO' />
+ <tag k='name:en' v='Bolivia' />
+ </way>
+ <way id='-57523'>
+ <nd ref='-37895' />
+ <nd ref='-35521' />
+ <nd ref='-35523' />
+ <nd ref='-35519' />
+ <nd ref='-35517' />
+ <nd ref='-35515' />
+ <nd ref='-35513' />
+ <nd ref='-35511' />
+ <nd ref='-35509' />
+ <nd ref='-35507' />
+ <nd ref='-35505' />
+ <nd ref='-35503' />
+ <nd ref='-35501' />
+ <nd ref='-35499' />
+ <nd ref='-35483' />
+ <nd ref='-35481' />
+ <nd ref='-35479' />
+ <nd ref='-35497' />
+ <nd ref='-35491' />
+ <nd ref='-35489' />
+ <nd ref='-35485' />
+ <nd ref='-35487' />
+ <nd ref='-35493' />
+ <nd ref='-35495' />
+ <nd ref='-37897' />
+ <nd ref='-37899' />
+ <nd ref='-43503' />
+ <nd ref='-43511' />
+ <nd ref='-43505' />
+ <nd ref='-43507' />
+ <nd ref='-43509' />
+ <nd ref='-43513' />
+ <nd ref='-41963' />
+ <nd ref='-43487' />
+ <nd ref='-43489' />
+ <nd ref='-43485' />
+ <nd ref='-37901' />
+ <nd ref='-43483' />
+ <nd ref='-43481' />
+ <nd ref='-36409' />
+ <nd ref='-43493' />
+ <nd ref='-36733' />
+ <nd ref='-36735' />
+ <nd ref='-37903' />
+ <nd ref='-36153' />
+ <nd ref='-36155' />
+ <nd ref='-36161' />
+ <nd ref='-36159' />
+ <nd ref='-36157' />
+ <nd ref='-36163' />
+ <nd ref='-36165' />
+ <nd ref='-37905' />
+ <nd ref='-37091' />
+ <nd ref='-37089' />
+ <nd ref='-36151' />
+ <nd ref='-37087' />
+ <nd ref='-37085' />
+ <nd ref='-36149' />
+ <nd ref='-36147' />
+ <nd ref='-41665' />
+ <nd ref='-36145' />
+ <nd ref='-36143' />
+ <nd ref='-41663' />
+ <nd ref='-36141' />
+ <nd ref='-41661' />
+ <nd ref='-36135' />
+ <nd ref='-36137' />
+ <nd ref='-36139' />
+ <nd ref='-41659' />
+ <nd ref='-36133' />
+ <nd ref='-37907' />
+ <nd ref='-37865' />
+ <nd ref='-37863' />
+ <nd ref='-36023' />
+ <nd ref='-36015' />
+ <nd ref='-36009' />
+ <nd ref='-36011' />
+ <nd ref='-36013' />
+ <nd ref='-36017' />
+ <nd ref='-36021' />
+ <nd ref='-36019' />
+ <nd ref='-37861' />
+ <nd ref='-36025' />
+ <nd ref='-36027' />
+ <nd ref='-36029' />
+ <nd ref='-36031' />
+ <nd ref='-36033' />
+ <nd ref='-36035' />
+ <nd ref='-36037' />
+ <nd ref='-36039' />
+ <nd ref='-37909' />
+ <nd ref='-37859' />
+ <nd ref='-37911' />
+ <nd ref='-37857' />
+ <nd ref='-36007' />
+ <nd ref='-36003' />
+ <nd ref='-36005' />
+ <nd ref='-36001' />
+ <nd ref='-35997' />
+ <nd ref='-35999' />
+ <nd ref='-37913' />
+ <nd ref='-35991' />
+ <nd ref='-35993' />
+ <nd ref='-35995' />
+ <nd ref='-37893' />
+ <nd ref='-35983' />
+ <nd ref='-35985' />
+ <nd ref='-35987' />
+ <nd ref='-35989' />
+ <nd ref='-37915' />
+ <nd ref='-35981' />
+ <nd ref='-37917' />
+ <nd ref='-37891' />
+ <nd ref='-35949' />
+ <nd ref='-35951' />
+ <nd ref='-35953' />
+ <nd ref='-37919' />
+ <nd ref='-35947' />
+ <nd ref='-35943' />
+ <nd ref='-35941' />
+ <nd ref='-35945' />
+ <nd ref='-37921' />
+ <nd ref='-35935' />
+ <nd ref='-35937' />
+ <nd ref='-35939' />
+ <nd ref='-37923' />
+ <nd ref='-35933' />
+ <nd ref='-35931' />
+ <nd ref='-35929' />
+ <nd ref='-37925' />
+ <nd ref='-35955' />
+ <nd ref='-35957' />
+ <nd ref='-35959' />
+ <nd ref='-35961' />
+ <nd ref='-37927' />
+ <nd ref='-35965' />
+ <nd ref='-35963' />
+ <nd ref='-37929' />
+ <nd ref='-35975' />
+ <nd ref='-35973' />
+ <nd ref='-35971' />
+ <nd ref='-35967' />
+ <nd ref='-35969' />
+ <nd ref='-37931' />
+ <nd ref='-37933' />
+ <nd ref='-35465' />
+ <nd ref='-35467' />
+ <nd ref='-35469' />
+ <nd ref='-35477' />
+ <nd ref='-35475' />
+ <nd ref='-35473' />
+ <nd ref='-35471' />
+ <nd ref='-35459' />
+ <nd ref='-35461' />
+ <nd ref='-35463' />
+ <nd ref='-35457' />
+ <nd ref='-35453' />
+ <nd ref='-35455' />
+ <nd ref='-35451' />
+ <nd ref='-35449' />
+ <nd ref='-35447' />
+ <nd ref='-35445' />
+ <nd ref='-35443' />
+ <nd ref='-35441' />
+ <nd ref='-35439' />
+ <nd ref='-35437' />
+ <nd ref='-37935' />
+ <nd ref='-37937' />
+ <nd ref='-35545' />
+ <nd ref='-35543' />
+ <nd ref='-35541' />
+ <nd ref='-35539' />
+ <nd ref='-35537' />
+ <nd ref='-35535' />
+ <nd ref='-35533' />
+ <nd ref='-35531' />
+ <nd ref='-35529' />
+ <nd ref='-35525' />
+ <nd ref='-35527' />
+ <nd ref='-37939' />
+ <nd ref='-35567' />
+ <nd ref='-35569' />
+ <nd ref='-35563' />
+ <nd ref='-35565' />
+ <nd ref='-35561' />
+ <nd ref='-35559' />
+ <nd ref='-35551' />
+ <nd ref='-35549' />
+ <nd ref='-35557' />
+ <nd ref='-35553' />
+ <nd ref='-35547' />
+ <nd ref='-35555' />
+ <nd ref='-35579' />
+ <nd ref='-35577' />
+ <nd ref='-35573' />
+ <nd ref='-35575' />
+ <nd ref='-35571' />
+ <nd ref='-35589' />
+ <nd ref='-35587' />
+ <nd ref='-35585' />
+ <nd ref='-35583' />
+ <nd ref='-35581' />
+ <nd ref='-35591' />
+ <nd ref='-35593' />
+ <nd ref='-35595' />
+ <nd ref='-35597' />
+ <nd ref='-35599' />
+ <nd ref='-37941' />
+ <nd ref='-35611' />
+ <nd ref='-35609' />
+ <nd ref='-35607' />
+ <nd ref='-35605' />
+ <nd ref='-35603' />
+ <nd ref='-35601' />
+ <nd ref='-37895' />
+ <tag k='ISO3166-1:alpha2' v='BR' />
+ <tag k='name:en' v='Brazil' />
+ </way>
+ <way id='-57525'>
+ <nd ref='-37943' />
+ <nd ref='-37945' />
+ <nd ref='-37947' />
+ <nd ref='-37949' />
+ <nd ref='-37943' />
+ <tag k='ISO3166-1:alpha2' v='BB' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Barbados' />
+ </way>
+ <way id='-57527'>
+ <nd ref='-37951' />
+ <nd ref='-37953' />
+ <nd ref='-37955' />
+ <nd ref='-43597' />
+ <nd ref='-43595' />
+ <nd ref='-43593' />
+ <nd ref='-43591' />
+ <nd ref='-37957' />
+ <nd ref='-37959' />
+ <nd ref='-37961' />
+ <nd ref='-37963' />
+ <nd ref='-41413' />
+ <nd ref='-37975' />
+ <nd ref='-43071' />
+ <nd ref='-37965' />
+ <nd ref='-43075' />
+ <nd ref='-43077' />
+ <nd ref='-43073' />
+ <nd ref='-37967' />
+ <nd ref='-37969' />
+ <nd ref='-43079' />
+ <nd ref='-43589' />
+ <nd ref='-43587' />
+ <nd ref='-43585' />
+ <nd ref='-43583' />
+ <nd ref='-43581' />
+ <nd ref='-43579' />
+ <nd ref='-43577' />
+ <nd ref='-37971' />
+ <nd ref='-37973' />
+ <nd ref='-41415' />
+ <nd ref='-37951' />
+ <tag k='ISO3166-1:alpha2' v='BN' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Brunei' />
+ </way>
+ <way id='-57529'>
+ <nd ref='-37977' />
+ <nd ref='-37979' />
+ <nd ref='-32757' />
+ <nd ref='-37981' />
+ <nd ref='-32755' />
+ <nd ref='-32753' />
+ <nd ref='-32749' />
+ <nd ref='-32751' />
+ <nd ref='-32747' />
+ <nd ref='-37983' />
+ <nd ref='-32745' />
+ <nd ref='-32735' />
+ <nd ref='-32737' />
+ <nd ref='-32733' />
+ <nd ref='-32743' />
+ <nd ref='-32741' />
+ <nd ref='-32739' />
+ <nd ref='-37985' />
+ <nd ref='-32797' />
+ <nd ref='-32795' />
+ <nd ref='-32793' />
+ <nd ref='-32791' />
+ <nd ref='-32789' />
+ <nd ref='-32787' />
+ <nd ref='-32785' />
+ <nd ref='-32783' />
+ <nd ref='-32779' />
+ <nd ref='-32781' />
+ <nd ref='-32771' />
+ <nd ref='-32769' />
+ <nd ref='-32773' />
+ <nd ref='-32775' />
+ <nd ref='-32777' />
+ <nd ref='-32767' />
+ <nd ref='-32765' />
+ <nd ref='-32759' />
+ <nd ref='-32761' />
+ <nd ref='-32763' />
+ <nd ref='-37977' />
+ <tag k='ISO3166-1:alpha2' v='BT' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Bhutan' />
+ </way>
+ <way id='-57531'>
+ <nd ref='-41419' />
+ <nd ref='-34801' />
+ <nd ref='-48391' />
+ <nd ref='-48389' />
+ <nd ref='-48387' />
+ <nd ref='-48393' />
+ <nd ref='-48371' />
+ <nd ref='-48373' />
+ <nd ref='-48375' />
+ <nd ref='-48377' />
+ <nd ref='-48379' />
+ <nd ref='-48369' />
+ <nd ref='-48383' />
+ <nd ref='-48381' />
+ <nd ref='-48385' />
+ <nd ref='-48367' />
+ <nd ref='-48395' />
+ <nd ref='-48397' />
+ <nd ref='-48399' />
+ <nd ref='-48403' />
+ <nd ref='-48401' />
+ <nd ref='-48409' />
+ <nd ref='-48411' />
+ <nd ref='-48407' />
+ <nd ref='-48405' />
+ <nd ref='-48427' />
+ <nd ref='-48417' />
+ <nd ref='-48425' />
+ <nd ref='-48415' />
+ <nd ref='-48423' />
+ <nd ref='-48419' />
+ <nd ref='-48421' />
+ <nd ref='-48413' />
+ <nd ref='-48429' />
+ <nd ref='-42371' />
+ <nd ref='-48431' />
+ <nd ref='-48435' />
+ <nd ref='-48433' />
+ <nd ref='-48437' />
+ <nd ref='-48205' />
+ <nd ref='-48207' />
+ <nd ref='-48313' />
+ <nd ref='-48209' />
+ <nd ref='-48311' />
+ <nd ref='-48309' />
+ <nd ref='-48307' />
+ <nd ref='-48305' />
+ <nd ref='-48303' />
+ <nd ref='-48301' />
+ <nd ref='-48211' />
+ <nd ref='-48215' />
+ <nd ref='-48213' />
+ <nd ref='-48217' />
+ <nd ref='-48221' />
+ <nd ref='-48219' />
+ <nd ref='-48299' />
+ <nd ref='-48223' />
+ <nd ref='-48297' />
+ <nd ref='-48275' />
+ <nd ref='-48295' />
+ <nd ref='-48291' />
+ <nd ref='-48293' />
+ <nd ref='-48273' />
+ <nd ref='-48271' />
+ <nd ref='-48289' />
+ <nd ref='-48269' />
+ <nd ref='-48287' />
+ <nd ref='-48267' />
+ <nd ref='-48265' />
+ <nd ref='-48263' />
+ <nd ref='-48261' />
+ <nd ref='-48257' />
+ <nd ref='-48259' />
+ <nd ref='-48237' />
+ <nd ref='-48245' />
+ <nd ref='-48247' />
+ <nd ref='-48243' />
+ <nd ref='-48249' />
+ <nd ref='-48253' />
+ <nd ref='-48251' />
+ <nd ref='-48283' />
+ <nd ref='-48285' />
+ <nd ref='-48255' />
+ <nd ref='-48281' />
+ <nd ref='-48239' />
+ <nd ref='-48279' />
+ <nd ref='-48277' />
+ <nd ref='-48241' />
+ <nd ref='-48225' />
+ <nd ref='-48231' />
+ <nd ref='-48229' />
+ <nd ref='-48227' />
+ <nd ref='-48235' />
+ <nd ref='-48233' />
+ <nd ref='-42369' />
+ <nd ref='-37987' />
+ <nd ref='-37989' />
+ <nd ref='-37991' />
+ <nd ref='-37993' />
+ <nd ref='-37995' />
+ <nd ref='-37997' />
+ <nd ref='-37999' />
+ <nd ref='-34789' />
+ <nd ref='-34791' />
+ <nd ref='-34787' />
+ <nd ref='-34785' />
+ <nd ref='-34783' />
+ <nd ref='-38001' />
+ <nd ref='-34805' />
+ <nd ref='-34803' />
+ <nd ref='-34807' />
+ <nd ref='-41419' />
+ <tag k='ISO3166-1:alpha2' v='BW' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Botswana' />
+ </way>
+ <way id='-57533'>
+ <nd ref='-38003' />
+ <nd ref='-48849' />
+ <nd ref='-48847' />
+ <nd ref='-48845' />
+ <nd ref='-38005' />
+ <nd ref='-48957' />
+ <nd ref='-48959' />
+ <nd ref='-48953' />
+ <nd ref='-48955' />
+ <nd ref='-48951' />
+ <nd ref='-48949' />
+ <nd ref='-48947' />
+ <nd ref='-48945' />
+ <nd ref='-48943' />
+ <nd ref='-48961' />
+ <nd ref='-48965' />
+ <nd ref='-48963' />
+ <nd ref='-48967' />
+ <nd ref='-48969' />
+ <nd ref='-48941' />
+ <nd ref='-48977' />
+ <nd ref='-48979' />
+ <nd ref='-48981' />
+ <nd ref='-48975' />
+ <nd ref='-48973' />
+ <nd ref='-48971' />
+ <nd ref='-48983' />
+ <nd ref='-48985' />
+ <nd ref='-48987' />
+ <nd ref='-48989' />
+ <nd ref='-48993' />
+ <nd ref='-48995' />
+ <nd ref='-48991' />
+ <nd ref='-48997' />
+ <nd ref='-48999' />
+ <nd ref='-41861' />
+ <nd ref='-38801' />
+ <nd ref='-49327' />
+ <nd ref='-49325' />
+ <nd ref='-49323' />
+ <nd ref='-49321' />
+ <nd ref='-49319' />
+ <nd ref='-49317' />
+ <nd ref='-49315' />
+ <nd ref='-49313' />
+ <nd ref='-49311' />
+ <nd ref='-49309' />
+ <nd ref='-49307' />
+ <nd ref='-49305' />
+ <nd ref='-49285' />
+ <nd ref='-49287' />
+ <nd ref='-49289' />
+ <nd ref='-49303' />
+ <nd ref='-49301' />
+ <nd ref='-49299' />
+ <nd ref='-49297' />
+ <nd ref='-49293' />
+ <nd ref='-49295' />
+ <nd ref='-49291' />
+ <nd ref='-49265' />
+ <nd ref='-49281' />
+ <nd ref='-49279' />
+ <nd ref='-49277' />
+ <nd ref='-49283' />
+ <nd ref='-49271' />
+ <nd ref='-49273' />
+ <nd ref='-49275' />
+ <nd ref='-49269' />
+ <nd ref='-49267' />
+ <nd ref='-38815' />
+ <nd ref='-49203' />
+ <nd ref='-49201' />
+ <nd ref='-49211' />
+ <nd ref='-49209' />
+ <nd ref='-49207' />
+ <nd ref='-49205' />
+ <nd ref='-49199' />
+ <nd ref='-49217' />
+ <nd ref='-49215' />
+ <nd ref='-49213' />
+ <nd ref='-49219' />
+ <nd ref='-49191' />
+ <nd ref='-49193' />
+ <nd ref='-49197' />
+ <nd ref='-49195' />
+ <nd ref='-49187' />
+ <nd ref='-49189' />
+ <nd ref='-49185' />
+ <nd ref='-38783' />
+ <nd ref='-49183' />
+ <nd ref='-49181' />
+ <nd ref='-49221' />
+ <nd ref='-49223' />
+ <nd ref='-38007' />
+ <nd ref='-49225' />
+ <nd ref='-38009' />
+ <nd ref='-49227' />
+ <nd ref='-49229' />
+ <nd ref='-38011' />
+ <nd ref='-49263' />
+ <nd ref='-49261' />
+ <nd ref='-49251' />
+ <nd ref='-49253' />
+ <nd ref='-49255' />
+ <nd ref='-49257' />
+ <nd ref='-49259' />
+ <nd ref='-49249' />
+ <nd ref='-49247' />
+ <nd ref='-49243' />
+ <nd ref='-49245' />
+ <nd ref='-49241' />
+ <nd ref='-49239' />
+ <nd ref='-49231' />
+ <nd ref='-49233' />
+ <nd ref='-49235' />
+ <nd ref='-49237' />
+ <nd ref='-38013' />
+ <nd ref='-49155' />
+ <nd ref='-49157' />
+ <nd ref='-49153' />
+ <nd ref='-49151' />
+ <nd ref='-49143' />
+ <nd ref='-49147' />
+ <nd ref='-49149' />
+ <nd ref='-49145' />
+ <nd ref='-49141' />
+ <nd ref='-49123' />
+ <nd ref='-49125' />
+ <nd ref='-49127' />
+ <nd ref='-49129' />
+ <nd ref='-49135' />
+ <nd ref='-49137' />
+ <nd ref='-49139' />
+ <nd ref='-49133' />
+ <nd ref='-49131' />
+ <nd ref='-49101' />
+ <nd ref='-49121' />
+ <nd ref='-49117' />
+ <nd ref='-49119' />
+ <nd ref='-49103' />
+ <nd ref='-49111' />
+ <nd ref='-49113' />
+ <nd ref='-49115' />
+ <nd ref='-49109' />
+ <nd ref='-49107' />
+ <nd ref='-49105' />
+ <nd ref='-38003' />
+ <tag k='ISO3166-1:alpha2' v='CF' />
+ <tag k='name:en' v='Central African Republic' />
+ </way>
+ <way id='-57535'>
+ <nd ref='-38027' />
+ <nd ref='-38029' />
+ <nd ref='-36301' />
+ <nd ref='-38031' />
+ <nd ref='-38033' />
+ <nd ref='-38035' />
+ <nd ref='-38037' />
+ <nd ref='-38039' />
+ <nd ref='-38041' />
+ <nd ref='-38043' />
+ <nd ref='-38045' />
+ <nd ref='-36303' />
+ <nd ref='-38047' />
+ <nd ref='-38049' />
+ <nd ref='-38051' />
+ <nd ref='-38053' />
+ <nd ref='-36305' />
+ <nd ref='-38055' />
+ <nd ref='-38057' />
+ <nd ref='-43399' />
+ <nd ref='-38059' />
+ <nd ref='-38061' />
+ <nd ref='-38063' />
+ <nd ref='-38065' />
+ <nd ref='-38067' />
+ <nd ref='-43397' />
+ <nd ref='-43395' />
+ <nd ref='-38069' />
+ <nd ref='-38071' />
+ <nd ref='-54415' />
+ <nd ref='-38073' />
+ <nd ref='-38075' />
+ <nd ref='-38077' />
+ <nd ref='-38079' />
+ <nd ref='-38081' />
+ <nd ref='-43393' />
+ <nd ref='-43391' />
+ <nd ref='-38083' />
+ <nd ref='-38085' />
+ <nd ref='-38087' />
+ <nd ref='-38089' />
+ <nd ref='-38091' />
+ <nd ref='-43389' />
+ <nd ref='-43387' />
+ <nd ref='-38093' />
+ <nd ref='-43385' />
+ <nd ref='-43383' />
+ <nd ref='-43381' />
+ <nd ref='-43379' />
+ <nd ref='-38095' />
+ <nd ref='-38097' />
+ <nd ref='-43377' />
+ <nd ref='-43375' />
+ <nd ref='-38099' />
+ <nd ref='-43373' />
+ <nd ref='-43371' />
+ <nd ref='-38101' />
+ <nd ref='-38103' />
+ <nd ref='-38105' />
+ <nd ref='-38107' />
+ <nd ref='-38109' />
+ <nd ref='-38111' />
+ <nd ref='-38113' />
+ <nd ref='-38115' />
+ <nd ref='-38117' />
+ <nd ref='-38119' />
+ <nd ref='-38121' />
+ <nd ref='-56657' />
+ <nd ref='-54389' />
+ <nd ref='-38123' />
+ <nd ref='-38125' />
+ <nd ref='-38127' />
+ <nd ref='-38129' />
+ <nd ref='-38131' />
+ <nd ref='-38133' />
+ <nd ref='-38135' />
+ <nd ref='-38137' />
+ <nd ref='-38139' />
+ <nd ref='-38141' />
+ <nd ref='-38143' />
+ <nd ref='-38145' />
+ <nd ref='-38147' />
+ <nd ref='-38149' />
+ <nd ref='-38151' />
+ <nd ref='-38153' />
+ <nd ref='-38155' />
+ <nd ref='-38157' />
+ <nd ref='-43367' />
+ <nd ref='-43369' />
+ <nd ref='-43363' />
+ <nd ref='-43365' />
+ <nd ref='-43361' />
+ <nd ref='-43359' />
+ <nd ref='-43355' />
+ <nd ref='-43357' />
+ <nd ref='-43339' />
+ <nd ref='-43341' />
+ <nd ref='-43345' />
+ <nd ref='-43343' />
+ <nd ref='-43347' />
+ <nd ref='-43349' />
+ <nd ref='-43351' />
+ <nd ref='-43353' />
+ <nd ref='-38159' />
+ <nd ref='-38161' />
+ <nd ref='-38163' />
+ <nd ref='-56631' />
+ <nd ref='-56709' />
+ <nd ref='-38165' />
+ <nd ref='-38167' />
+ <nd ref='-38169' />
+ <nd ref='-56119' />
+ <nd ref='-38171' />
+ <nd ref='-38173' />
+ <nd ref='-38175' />
+ <nd ref='-38177' />
+ <nd ref='-38179' />
+ <nd ref='-38181' />
+ <nd ref='-38183' />
+ <nd ref='-38185' />
+ <nd ref='-38187' />
+ <nd ref='-38189' />
+ <nd ref='-38191' />
+ <nd ref='-38193' />
+ <nd ref='-38195' />
+ <nd ref='-38197' />
+ <nd ref='-43337' />
+ <nd ref='-43335' />
+ <nd ref='-43333' />
+ <nd ref='-38199' />
+ <nd ref='-38201' />
+ <nd ref='-38203' />
+ <nd ref='-38205' />
+ <nd ref='-38207' />
+ <nd ref='-38209' />
+ <nd ref='-38211' />
+ <nd ref='-38213' />
+ <nd ref='-38215' />
+ <nd ref='-38217' />
+ <nd ref='-38219' />
+ <nd ref='-38221' />
+ <nd ref='-38223' />
+ <nd ref='-38225' />
+ <nd ref='-38227' />
+ <nd ref='-38229' />
+ <nd ref='-38231' />
+ <nd ref='-38233' />
+ <nd ref='-38235' />
+ <nd ref='-38237' />
+ <nd ref='-38239' />
+ <nd ref='-38241' />
+ <nd ref='-38243' />
+ <nd ref='-38245' />
+ <nd ref='-38247' />
+ <nd ref='-38249' />
+ <nd ref='-38251' />
+ <nd ref='-38253' />
+ <nd ref='-38255' />
+ <nd ref='-38257' />
+ <nd ref='-38259' />
+ <nd ref='-38261' />
+ <nd ref='-38263' />
+ <nd ref='-38265' />
+ <nd ref='-38267' />
+ <nd ref='-38269' />
+ <nd ref='-38271' />
+ <nd ref='-38273' />
+ <nd ref='-38275' />
+ <nd ref='-38277' />
+ <nd ref='-38279' />
+ <nd ref='-38281' />
+ <nd ref='-38283' />
+ <nd ref='-43331' />
+ <nd ref='-38285' />
+ <nd ref='-38287' />
+ <nd ref='-38289' />
+ <nd ref='-38291' />
+ <nd ref='-38293' />
+ <nd ref='-38295' />
+ <nd ref='-38297' />
+ <nd ref='-38299' />
+ <nd ref='-38301' />
+ <nd ref='-38303' />
+ <nd ref='-38305' />
+ <nd ref='-38307' />
+ <nd ref='-38309' />
+ <nd ref='-38311' />
+ <nd ref='-38313' />
+ <nd ref='-43329' />
+ <nd ref='-38315' />
+ <nd ref='-43327' />
+ <nd ref='-38317' />
+ <nd ref='-43325' />
+ <nd ref='-43323' />
+ <nd ref='-38319' />
+ <nd ref='-38321' />
+ <nd ref='-38323' />
+ <nd ref='-38325' />
+ <nd ref='-38327' />
+ <nd ref='-38329' />
+ <nd ref='-43321' />
+ <nd ref='-43319' />
+ <nd ref='-38331' />
+ <nd ref='-38333' />
+ <nd ref='-38335' />
+ <nd ref='-38337' />
+ <nd ref='-38339' />
+ <nd ref='-43317' />
+ <nd ref='-43315' />
+ <nd ref='-38341' />
+ <nd ref='-38343' />
+ <nd ref='-38345' />
+ <nd ref='-38347' />
+ <nd ref='-38349' />
+ <nd ref='-38351' />
+ <nd ref='-43313' />
+ <nd ref='-38353' />
+ <nd ref='-38355' />
+ <nd ref='-38357' />
+ <nd ref='-38359' />
+ <nd ref='-43311' />
+ <nd ref='-43309' />
+ <nd ref='-43307' />
+ <nd ref='-38361' />
+ <nd ref='-38363' />
+ <nd ref='-43305' />
+ <nd ref='-38365' />
+ <nd ref='-38367' />
+ <nd ref='-38369' />
+ <nd ref='-38371' />
+ <nd ref='-38373' />
+ <nd ref='-38375' />
+ <nd ref='-38377' />
+ <nd ref='-43303' />
+ <nd ref='-38379' />
+ <nd ref='-38381' />
+ <nd ref='-38383' />
+ <nd ref='-38385' />
+ <nd ref='-43299' />
+ <nd ref='-38387' />
+ <nd ref='-38389' />
+ <nd ref='-43301' />
+ <nd ref='-38391' />
+ <nd ref='-38393' />
+ <nd ref='-56233' />
+ <nd ref='-54209' />
+ <nd ref='-56307' />
+ <nd ref='-54205' />
+ <nd ref='-54197' />
+ <nd ref='-55153' />
+ <nd ref='-55155' />
+ <nd ref='-42431' />
+ <nd ref='-42429' />
+ <nd ref='-42427' />
+ <nd ref='-42425' />
+ <nd ref='-42423' />
+ <nd ref='-42421' />
+ <nd ref='-42419' />
+ <nd ref='-42437' />
+ <nd ref='-42439' />
+ <nd ref='-42441' />
+ <nd ref='-42443' />
+ <nd ref='-42445' />
+ <nd ref='-42447' />
+ <nd ref='-42449' />
+ <nd ref='-42451' />
+ <nd ref='-42453' />
+ <nd ref='-43291' />
+ <nd ref='-43293' />
+ <nd ref='-43289' />
+ <nd ref='-43287' />
+ <nd ref='-43297' />
+ <nd ref='-43295' />
+ <nd ref='-43285' />
+ <nd ref='-43253' />
+ <nd ref='-43273' />
+ <nd ref='-43279' />
+ <nd ref='-43283' />
+ <nd ref='-43281' />
+ <nd ref='-43277' />
+ <nd ref='-43275' />
+ <nd ref='-43271' />
+ <nd ref='-43257' />
+ <nd ref='-43265' />
+ <nd ref='-43269' />
+ <nd ref='-43267' />
+ <nd ref='-43261' />
+ <nd ref='-43263' />
+ <nd ref='-43259' />
+ <nd ref='-43255' />
+ <nd ref='-43245' />
+ <nd ref='-43247' />
+ <nd ref='-43251' />
+ <nd ref='-43249' />
+ <nd ref='-43241' />
+ <nd ref='-43243' />
+ <nd ref='-43239' />
+ <nd ref='-43235' />
+ <nd ref='-43237' />
+ <nd ref='-43233' />
+ <nd ref='-43231' />
+ <nd ref='-38395' />
+ <nd ref='-54517' />
+ <nd ref='-42405' />
+ <nd ref='-42407' />
+ <nd ref='-42409' />
+ <nd ref='-42411' />
+ <nd ref='-42415' />
+ <nd ref='-42413' />
+ <nd ref='-42417' />
+ <nd ref='-54473' />
+ <nd ref='-42471' />
+ <nd ref='-38397' />
+ <nd ref='-38399' />
+ <nd ref='-38401' />
+ <nd ref='-42691' />
+ <nd ref='-38403' />
+ <nd ref='-42455' />
+ <nd ref='-38015' />
+ <nd ref='-38017' />
+ <nd ref='-42461' />
+ <nd ref='-42459' />
+ <nd ref='-42463' />
+ <nd ref='-42457' />
+ <nd ref='-38019' />
+ <nd ref='-38021' />
+ <nd ref='-38023' />
+ <nd ref='-38025' />
+ <nd ref='-38027' />
+ <tag k='ISO3166-1:alpha2' v='CA' />
+ <tag k='name:en' v='Canada' />
+ </way>
+ <way id='-57537'>
+ <nd ref='-43801' />
+ <nd ref='-43803' />
+ <nd ref='-38405' />
+ <nd ref='-38407' />
+ <nd ref='-43799' />
+ <nd ref='-43797' />
+ <nd ref='-43795' />
+ <nd ref='-43793' />
+ <nd ref='-38409' />
+ <nd ref='-43791' />
+ <nd ref='-43789' />
+ <nd ref='-43783' />
+ <nd ref='-43785' />
+ <nd ref='-43787' />
+ <nd ref='-43781' />
+ <nd ref='-43769' />
+ <nd ref='-43771' />
+ <nd ref='-43773' />
+ <nd ref='-43775' />
+ <nd ref='-43777' />
+ <nd ref='-43779' />
+ <nd ref='-43767' />
+ <nd ref='-43765' />
+ <nd ref='-43763' />
+ <nd ref='-43761' />
+ <nd ref='-43759' />
+ <nd ref='-43757' />
+ <nd ref='-43755' />
+ <nd ref='-43753' />
+ <nd ref='-43751' />
+ <nd ref='-43749' />
+ <nd ref='-38411' />
+ <nd ref='-38413' />
+ <nd ref='-43747' />
+ <nd ref='-43745' />
+ <nd ref='-38415' />
+ <nd ref='-43743' />
+ <nd ref='-43741' />
+ <nd ref='-43739' />
+ <nd ref='-43737' />
+ <nd ref='-43735' />
+ <nd ref='-38417' />
+ <nd ref='-43733' />
+ <nd ref='-38419' />
+ <nd ref='-38421' />
+ <nd ref='-43729' />
+ <nd ref='-43731' />
+ <nd ref='-43727' />
+ <nd ref='-43725' />
+ <nd ref='-43723' />
+ <nd ref='-43721' />
+ <nd ref='-43719' />
+ <nd ref='-38423' />
+ <nd ref='-43715' />
+ <nd ref='-43717' />
+ <nd ref='-43713' />
+ <nd ref='-43711' />
+ <nd ref='-43707' />
+ <nd ref='-43709' />
+ <nd ref='-43701' />
+ <nd ref='-43703' />
+ <nd ref='-43705' />
+ <nd ref='-43699' />
+ <nd ref='-43695' />
+ <nd ref='-43697' />
+ <nd ref='-43693' />
+ <nd ref='-38425' />
+ <nd ref='-43691' />
+ <nd ref='-43689' />
+ <nd ref='-43687' />
+ <nd ref='-43685' />
+ <nd ref='-41637' />
+ <nd ref='-43675' />
+ <nd ref='-43677' />
+ <nd ref='-43679' />
+ <nd ref='-43673' />
+ <nd ref='-38427' />
+ <nd ref='-43671' />
+ <nd ref='-38429' />
+ <nd ref='-43659' />
+ <nd ref='-43669' />
+ <nd ref='-43667' />
+ <nd ref='-43665' />
+ <nd ref='-43661' />
+ <nd ref='-43663' />
+ <nd ref='-38431' />
+ <nd ref='-38433' />
+ <nd ref='-38435' />
+ <nd ref='-43657' />
+ <nd ref='-38437' />
+ <nd ref='-38439' />
+ <nd ref='-43655' />
+ <nd ref='-38441' />
+ <nd ref='-43653' />
+ <nd ref='-43651' />
+ <nd ref='-43649' />
+ <nd ref='-43647' />
+ <nd ref='-43645' />
+ <nd ref='-38443' />
+ <nd ref='-38445' />
+ <nd ref='-43013' />
+ <nd ref='-43015' />
+ <nd ref='-41657' />
+ <nd ref='-42725' />
+ <nd ref='-42723' />
+ <nd ref='-42735' />
+ <nd ref='-42737' />
+ <nd ref='-38447' />
+ <nd ref='-42741' />
+ <nd ref='-38449' />
+ <nd ref='-38451' />
+ <nd ref='-38453' />
+ <nd ref='-42739' />
+ <nd ref='-38455' />
+ <nd ref='-42751' />
+ <nd ref='-42753' />
+ <nd ref='-42755' />
+ <nd ref='-42759' />
+ <nd ref='-42757' />
+ <nd ref='-38457' />
+ <nd ref='-32975' />
+ <nd ref='-32973' />
+ <nd ref='-32977' />
+ <nd ref='-32979' />
+ <nd ref='-32981' />
+ <nd ref='-32983' />
+ <nd ref='-32985' />
+ <nd ref='-32987' />
+ <nd ref='-32989' />
+ <nd ref='-32991' />
+ <nd ref='-32993' />
+ <nd ref='-32995' />
+ <nd ref='-32997' />
+ <nd ref='-32999' />
+ <nd ref='-33001' />
+ <nd ref='-33003' />
+ <nd ref='-33005' />
+ <nd ref='-33007' />
+ <nd ref='-33009' />
+ <nd ref='-33011' />
+ <nd ref='-33013' />
+ <nd ref='-33015' />
+ <nd ref='-33017' />
+ <nd ref='-33019' />
+ <nd ref='-33021' />
+ <nd ref='-33023' />
+ <nd ref='-33025' />
+ <nd ref='-33029' />
+ <nd ref='-33027' />
+ <nd ref='-33031' />
+ <nd ref='-33033' />
+ <nd ref='-33043' />
+ <nd ref='-33039' />
+ <nd ref='-33035' />
+ <nd ref='-33037' />
+ <nd ref='-33041' />
+ <nd ref='-33045' />
+ <nd ref='-33143' />
+ <nd ref='-33047' />
+ <nd ref='-33051' />
+ <nd ref='-33049' />
+ <nd ref='-33057' />
+ <nd ref='-33055' />
+ <nd ref='-33059' />
+ <nd ref='-33053' />
+ <nd ref='-33073' />
+ <nd ref='-33061' />
+ <nd ref='-33063' />
+ <nd ref='-33065' />
+ <nd ref='-33071' />
+ <nd ref='-33069' />
+ <nd ref='-33067' />
+ <nd ref='-33075' />
+ <nd ref='-33077' />
+ <nd ref='-33079' />
+ <nd ref='-33081' />
+ <nd ref='-33083' />
+ <nd ref='-33085' />
+ <nd ref='-33087' />
+ <nd ref='-33089' />
+ <nd ref='-33091' />
+ <nd ref='-33139' />
+ <nd ref='-33093' />
+ <nd ref='-33095' />
+ <nd ref='-33097' />
+ <nd ref='-33099' />
+ <nd ref='-33111' />
+ <nd ref='-33109' />
+ <nd ref='-33101' />
+ <nd ref='-33103' />
+ <nd ref='-33107' />
+ <nd ref='-33105' />
+ <nd ref='-33113' />
+ <nd ref='-33115' />
+ <nd ref='-33117' />
+ <nd ref='-33119' />
+ <nd ref='-33121' />
+ <nd ref='-33125' />
+ <nd ref='-33123' />
+ <nd ref='-33129' />
+ <nd ref='-33127' />
+ <nd ref='-33137' />
+ <nd ref='-33131' />
+ <nd ref='-33133' />
+ <nd ref='-33141' />
+ <nd ref='-33135' />
+ <nd ref='-33207' />
+ <nd ref='-33205' />
+ <nd ref='-33203' />
+ <nd ref='-33201' />
+ <nd ref='-33197' />
+ <nd ref='-33199' />
+ <nd ref='-33195' />
+ <nd ref='-33193' />
+ <nd ref='-33179' />
+ <nd ref='-33181' />
+ <nd ref='-33187' />
+ <nd ref='-33183' />
+ <nd ref='-33185' />
+ <nd ref='-33189' />
+ <nd ref='-33171' />
+ <nd ref='-33173' />
+ <nd ref='-33175' />
+ <nd ref='-33177' />
+ <nd ref='-33169' />
+ <nd ref='-33191' />
+ <nd ref='-33163' />
+ <nd ref='-33165' />
+ <nd ref='-33167' />
+ <nd ref='-33149' />
+ <nd ref='-33147' />
+ <nd ref='-33153' />
+ <nd ref='-33151' />
+ <nd ref='-33155' />
+ <nd ref='-33157' />
+ <nd ref='-33159' />
+ <nd ref='-33161' />
+ <nd ref='-33145' />
+ <nd ref='-40723' />
+ <nd ref='-40721' />
+ <nd ref='-49535' />
+ <nd ref='-49537' />
+ <nd ref='-49539' />
+ <nd ref='-49541' />
+ <nd ref='-49533' />
+ <nd ref='-49523' />
+ <nd ref='-49527' />
+ <nd ref='-49525' />
+ <nd ref='-49543' />
+ <nd ref='-49519' />
+ <nd ref='-49531' />
+ <nd ref='-49529' />
+ <nd ref='-49521' />
+ <nd ref='-49483' />
+ <nd ref='-49485' />
+ <nd ref='-49511' />
+ <nd ref='-49517' />
+ <nd ref='-49515' />
+ <nd ref='-49513' />
+ <nd ref='-49509' />
+ <nd ref='-49507' />
+ <nd ref='-49499' />
+ <nd ref='-49505' />
+ <nd ref='-49503' />
+ <nd ref='-49501' />
+ <nd ref='-49497' />
+ <nd ref='-49495' />
+ <nd ref='-49493' />
+ <nd ref='-49491' />
+ <nd ref='-49489' />
+ <nd ref='-49487' />
+ <nd ref='-40731' />
+ <nd ref='-40729' />
+ <nd ref='-49481' />
+ <nd ref='-49479' />
+ <nd ref='-49475' />
+ <nd ref='-49473' />
+ <nd ref='-41107' />
+ <nd ref='-38459' />
+ <nd ref='-38461' />
+ <nd ref='-52751' />
+ <nd ref='-52749' />
+ <nd ref='-52755' />
+ <nd ref='-52753' />
+ <nd ref='-52757' />
+ <nd ref='-52759' />
+ <nd ref='-52763' />
+ <nd ref='-52761' />
+ <nd ref='-52747' />
+ <nd ref='-52745' />
+ <nd ref='-52743' />
+ <nd ref='-52741' />
+ <nd ref='-52735' />
+ <nd ref='-52737' />
+ <nd ref='-52739' />
+ <nd ref='-52733' />
+ <nd ref='-52769' />
+ <nd ref='-52767' />
+ <nd ref='-52765' />
+ <nd ref='-38463' />
+ <nd ref='-52775' />
+ <nd ref='-52773' />
+ <nd ref='-52777' />
+ <nd ref='-52771' />
+ <nd ref='-38465' />
+ <nd ref='-38467' />
+ <nd ref='-38469' />
+ <nd ref='-38471' />
+ <nd ref='-52781' />
+ <nd ref='-52785' />
+ <nd ref='-52783' />
+ <nd ref='-52779' />
+ <nd ref='-38473' />
+ <nd ref='-52803' />
+ <nd ref='-52799' />
+ <nd ref='-52801' />
+ <nd ref='-52793' />
+ <nd ref='-52797' />
+ <nd ref='-52791' />
+ <nd ref='-52795' />
+ <nd ref='-52789' />
+ <nd ref='-52787' />
+ <nd ref='-52805' />
+ <nd ref='-52807' />
+ <nd ref='-38475' />
+ <nd ref='-52811' />
+ <nd ref='-52809' />
+ <nd ref='-38477' />
+ <nd ref='-52813' />
+ <nd ref='-38479' />
+ <nd ref='-38481' />
+ <nd ref='-38483' />
+ <nd ref='-52823' />
+ <nd ref='-52821' />
+ <nd ref='-52825' />
+ <nd ref='-52819' />
+ <nd ref='-52829' />
+ <nd ref='-52827' />
+ <nd ref='-52817' />
+ <nd ref='-52815' />
+ <nd ref='-52831' />
+ <nd ref='-38485' />
+ <nd ref='-52833' />
+ <nd ref='-52835' />
+ <nd ref='-52837' />
+ <nd ref='-52839' />
+ <nd ref='-52841' />
+ <nd ref='-52845' />
+ <nd ref='-52843' />
+ <nd ref='-52847' />
+ <nd ref='-52849' />
+ <nd ref='-52851' />
+ <nd ref='-52853' />
+ <nd ref='-52855' />
+ <nd ref='-52861' />
+ <nd ref='-52857' />
+ <nd ref='-52859' />
+ <nd ref='-52863' />
+ <nd ref='-52865' />
+ <nd ref='-52867' />
+ <nd ref='-52869' />
+ <nd ref='-52871' />
+ <nd ref='-38487' />
+ <nd ref='-52873' />
+ <nd ref='-52875' />
+ <nd ref='-52877' />
+ <nd ref='-52879' />
+ <nd ref='-38489' />
+ <nd ref='-52889' />
+ <nd ref='-52887' />
+ <nd ref='-52885' />
+ <nd ref='-52883' />
+ <nd ref='-52881' />
+ <nd ref='-52905' />
+ <nd ref='-52903' />
+ <nd ref='-52899' />
+ <nd ref='-52901' />
+ <nd ref='-52891' />
+ <nd ref='-52897' />
+ <nd ref='-52895' />
+ <nd ref='-52893' />
+ <nd ref='-38491' />
+ <nd ref='-53049' />
+ <nd ref='-53051' />
+ <nd ref='-53057' />
+ <nd ref='-53055' />
+ <nd ref='-53053' />
+ <nd ref='-53047' />
+ <nd ref='-53039' />
+ <nd ref='-53045' />
+ <nd ref='-53041' />
+ <nd ref='-53043' />
+ <nd ref='-38493' />
+ <nd ref='-53067' />
+ <nd ref='-53063' />
+ <nd ref='-53065' />
+ <nd ref='-53061' />
+ <nd ref='-53069' />
+ <nd ref='-53071' />
+ <nd ref='-53073' />
+ <nd ref='-53077' />
+ <nd ref='-53075' />
+ <nd ref='-53059' />
+ <nd ref='-38495' />
+ <nd ref='-53099' />
+ <nd ref='-53097' />
+ <nd ref='-53089' />
+ <nd ref='-53087' />
+ <nd ref='-53095' />
+ <nd ref='-53093' />
+ <nd ref='-53091' />
+ <nd ref='-53085' />
+ <nd ref='-53081' />
+ <nd ref='-53103' />
+ <nd ref='-53101' />
+ <nd ref='-53083' />
+ <nd ref='-53079' />
+ <nd ref='-38497' />
+ <nd ref='-53105' />
+ <nd ref='-53107' />
+ <nd ref='-38499' />
+ <nd ref='-38501' />
+ <nd ref='-53109' />
+ <nd ref='-53111' />
+ <nd ref='-53113' />
+ <nd ref='-53115' />
+ <nd ref='-38503' />
+ <nd ref='-53121' />
+ <nd ref='-53123' />
+ <nd ref='-53125' />
+ <nd ref='-53133' />
+ <nd ref='-53131' />
+ <nd ref='-53127' />
+ <nd ref='-53129' />
+ <nd ref='-53119' />
+ <nd ref='-53117' />
+ <nd ref='-37977' />
+ <nd ref='-32763' />
+ <nd ref='-32761' />
+ <nd ref='-32759' />
+ <nd ref='-32765' />
+ <nd ref='-32767' />
+ <nd ref='-32777' />
+ <nd ref='-32775' />
+ <nd ref='-32773' />
+ <nd ref='-32769' />
+ <nd ref='-32771' />
+ <nd ref='-32781' />
+ <nd ref='-32779' />
+ <nd ref='-32783' />
+ <nd ref='-32785' />
+ <nd ref='-32787' />
+ <nd ref='-32789' />
+ <nd ref='-32791' />
+ <nd ref='-32793' />
+ <nd ref='-32795' />
+ <nd ref='-32797' />
+ <nd ref='-37985' />
+ <nd ref='-52727' />
+ <nd ref='-52729' />
+ <nd ref='-52723' />
+ <nd ref='-52721' />
+ <nd ref='-52731' />
+ <nd ref='-52725' />
+ <nd ref='-38505' />
+ <nd ref='-41543' />
+ <nd ref='-32329' />
+ <nd ref='-32339' />
+ <nd ref='-32337' />
+ <nd ref='-32331' />
+ <nd ref='-32333' />
+ <nd ref='-32335' />
+ <nd ref='-32345' />
+ <nd ref='-32347' />
+ <nd ref='-32341' />
+ <nd ref='-32343' />
+ <nd ref='-32349' />
+ <nd ref='-32351' />
+ <nd ref='-32353' />
+ <nd ref='-32355' />
+ <nd ref='-32401' />
+ <nd ref='-32385' />
+ <nd ref='-32387' />
+ <nd ref='-32389' />
+ <nd ref='-32391' />
+ <nd ref='-32393' />
+ <nd ref='-32395' />
+ <nd ref='-32397' />
+ <nd ref='-32379' />
+ <nd ref='-32381' />
+ <nd ref='-32383' />
+ <nd ref='-32399' />
+ <nd ref='-32357' />
+ <nd ref='-32359' />
+ <nd ref='-32361' />
+ <nd ref='-32363' />
+ <nd ref='-32365' />
+ <nd ref='-32373' />
+ <nd ref='-32369' />
+ <nd ref='-32371' />
+ <nd ref='-32367' />
+ <nd ref='-32377' />
+ <nd ref='-32375' />
+ <nd ref='-32503' />
+ <nd ref='-32419' />
+ <nd ref='-32421' />
+ <nd ref='-32423' />
+ <nd ref='-32425' />
+ <nd ref='-32427' />
+ <nd ref='-32429' />
+ <nd ref='-32443' />
+ <nd ref='-32433' />
+ <nd ref='-32431' />
+ <nd ref='-32435' />
+ <nd ref='-32437' />
+ <nd ref='-32439' />
+ <nd ref='-32441' />
+ <nd ref='-32451' />
+ <nd ref='-32403' />
+ <nd ref='-32405' />
+ <nd ref='-32407' />
+ <nd ref='-32445' />
+ <nd ref='-32447' />
+ <nd ref='-32449' />
+ <nd ref='-32501' />
+ <nd ref='-32411' />
+ <nd ref='-32413' />
+ <nd ref='-32415' />
+ <nd ref='-32417' />
+ <nd ref='-32409' />
+ <nd ref='-32453' />
+ <nd ref='-32457' />
+ <nd ref='-32459' />
+ <nd ref='-32461' />
+ <nd ref='-32455' />
+ <nd ref='-32463' />
+ <nd ref='-32465' />
+ <nd ref='-32467' />
+ <nd ref='-32499' />
+ <nd ref='-32471' />
+ <nd ref='-32469' />
+ <nd ref='-32479' />
+ <nd ref='-32473' />
+ <nd ref='-32475' />
+ <nd ref='-32477' />
+ <nd ref='-32481' />
+ <nd ref='-32483' />
+ <nd ref='-32497' />
+ <nd ref='-32485' />
+ <nd ref='-32487' />
+ <nd ref='-32491' />
+ <nd ref='-32489' />
+ <nd ref='-32493' />
+ <nd ref='-32495' />
+ <nd ref='-41547' />
+ <nd ref='-53293' />
+ <nd ref='-53297' />
+ <nd ref='-53295' />
+ <nd ref='-53299' />
+ <nd ref='-53301' />
+ <nd ref='-53303' />
+ <nd ref='-53305' />
+ <nd ref='-53291' />
+ <nd ref='-53289' />
+ <nd ref='-53287' />
+ <nd ref='-53285' />
+ <nd ref='-53283' />
+ <nd ref='-53281' />
+ <nd ref='-53279' />
+ <nd ref='-53277' />
+ <nd ref='-53275' />
+ <nd ref='-53273' />
+ <nd ref='-53259' />
+ <nd ref='-53265' />
+ <nd ref='-53267' />
+ <nd ref='-53263' />
+ <nd ref='-53271' />
+ <nd ref='-53269' />
+ <nd ref='-53261' />
+ <nd ref='-53251' />
+ <nd ref='-53255' />
+ <nd ref='-53257' />
+ <nd ref='-53253' />
+ <nd ref='-53249' />
+ <nd ref='-53247' />
+ <nd ref='-53245' />
+ <nd ref='-53243' />
+ <nd ref='-53241' />
+ <nd ref='-38507' />
+ <nd ref='-53237' />
+ <nd ref='-53239' />
+ <nd ref='-38509' />
+ <nd ref='-53231' />
+ <nd ref='-53233' />
+ <nd ref='-53227' />
+ <nd ref='-53229' />
+ <nd ref='-53235' />
+ <nd ref='-53223' />
+ <nd ref='-53225' />
+ <nd ref='-38511' />
+ <nd ref='-38513' />
+ <nd ref='-38515' />
+ <nd ref='-53215' />
+ <nd ref='-53217' />
+ <nd ref='-53221' />
+ <nd ref='-53219' />
+ <nd ref='-53213' />
+ <nd ref='-53211' />
+ <nd ref='-53209' />
+ <nd ref='-53207' />
+ <nd ref='-38517' />
+ <nd ref='-53199' />
+ <nd ref='-53201' />
+ <nd ref='-53203' />
+ <nd ref='-53205' />
+ <nd ref='-53197' />
+ <nd ref='-38519' />
+ <nd ref='-53171' />
+ <nd ref='-53173' />
+ <nd ref='-53175' />
+ <nd ref='-53177' />
+ <nd ref='-53179' />
+ <nd ref='-53181' />
+ <nd ref='-53183' />
+ <nd ref='-53185' />
+ <nd ref='-53189' />
+ <nd ref='-53187' />
+ <nd ref='-53191' />
+ <nd ref='-53193' />
+ <nd ref='-53195' />
+ <nd ref='-38521' />
+ <nd ref='-53169' />
+ <nd ref='-53163' />
+ <nd ref='-53167' />
+ <nd ref='-53165' />
+ <nd ref='-53161' />
+ <nd ref='-53159' />
+ <nd ref='-53155' />
+ <nd ref='-53157' />
+ <nd ref='-38523' />
+ <nd ref='-53151' />
+ <nd ref='-53153' />
+ <nd ref='-53149' />
+ <nd ref='-53147' />
+ <nd ref='-53139' />
+ <nd ref='-53143' />
+ <nd ref='-53141' />
+ <nd ref='-53145' />
+ <nd ref='-53137' />
+ <nd ref='-53135' />
+ <nd ref='-38525' />
+ <nd ref='-52393' />
+ <nd ref='-52391' />
+ <nd ref='-52389' />
+ <nd ref='-52387' />
+ <nd ref='-52395' />
+ <nd ref='-52383' />
+ <nd ref='-52385' />
+ <nd ref='-52381' />
+ <nd ref='-52379' />
+ <nd ref='-52377' />
+ <nd ref='-38527' />
+ <nd ref='-52401' />
+ <nd ref='-52405' />
+ <nd ref='-52407' />
+ <nd ref='-52403' />
+ <nd ref='-52399' />
+ <nd ref='-52397' />
+ <nd ref='-38529' />
+ <nd ref='-38531' />
+ <nd ref='-52421' />
+ <nd ref='-52423' />
+ <nd ref='-52419' />
+ <nd ref='-52417' />
+ <nd ref='-52431' />
+ <nd ref='-52429' />
+ <nd ref='-52427' />
+ <nd ref='-52425' />
+ <nd ref='-52409' />
+ <nd ref='-52411' />
+ <nd ref='-52415' />
+ <nd ref='-52413' />
+ <nd ref='-38533' />
+ <nd ref='-52371' />
+ <nd ref='-52375' />
+ <nd ref='-52373' />
+ <nd ref='-52369' />
+ <nd ref='-52367' />
+ <nd ref='-38535' />
+ <nd ref='-52473' />
+ <nd ref='-52471' />
+ <nd ref='-52479' />
+ <nd ref='-52477' />
+ <nd ref='-52475' />
+ <nd ref='-52481' />
+ <nd ref='-52487' />
+ <nd ref='-52485' />
+ <nd ref='-52483' />
+ <nd ref='-38537' />
+ <nd ref='-52463' />
+ <nd ref='-52461' />
+ <nd ref='-52469' />
+ <nd ref='-52465' />
+ <nd ref='-52467' />
+ <nd ref='-52459' />
+ <nd ref='-38539' />
+ <nd ref='-52457' />
+ <nd ref='-52455' />
+ <nd ref='-52453' />
+ <nd ref='-52451' />
+ <nd ref='-52449' />
+ <nd ref='-52447' />
+ <nd ref='-52445' />
+ <nd ref='-38541' />
+ <nd ref='-52433' />
+ <nd ref='-52435' />
+ <nd ref='-52437' />
+ <nd ref='-52439' />
+ <nd ref='-52441' />
+ <nd ref='-52443' />
+ <nd ref='-38543' />
+ <nd ref='-52195' />
+ <nd ref='-52193' />
+ <nd ref='-52189' />
+ <nd ref='-52191' />
+ <nd ref='-38545' />
+ <nd ref='-38547' />
+ <nd ref='-38549' />
+ <nd ref='-40635' />
+ <nd ref='-38551' />
+ <nd ref='-38553' />
+ <nd ref='-38555' />
+ <nd ref='-40633' />
+ <nd ref='-38557' />
+ <nd ref='-52197' />
+ <nd ref='-52199' />
+ <nd ref='-52201' />
+ <nd ref='-52203' />
+ <nd ref='-52205' />
+ <nd ref='-52305' />
+ <nd ref='-52303' />
+ <nd ref='-52307' />
+ <nd ref='-52309' />
+ <nd ref='-52311' />
+ <nd ref='-52313' />
+ <nd ref='-52321' />
+ <nd ref='-52315' />
+ <nd ref='-52317' />
+ <nd ref='-52319' />
+ <nd ref='-52289' />
+ <nd ref='-52291' />
+ <nd ref='-52293' />
+ <nd ref='-52299' />
+ <nd ref='-52301' />
+ <nd ref='-52297' />
+ <nd ref='-52295' />
+ <nd ref='-52269' />
+ <nd ref='-52271' />
+ <nd ref='-52273' />
+ <nd ref='-52283' />
+ <nd ref='-52287' />
+ <nd ref='-52285' />
+ <nd ref='-52275' />
+ <nd ref='-52277' />
+ <nd ref='-52279' />
+ <nd ref='-52281' />
+ <nd ref='-40631' />
+ <nd ref='-45727' />
+ <nd ref='-40629' />
+ <nd ref='-38559' />
+ <nd ref='-38561' />
+ <nd ref='-38563' />
+ <nd ref='-38565' />
+ <nd ref='-38567' />
+ <nd ref='-38569' />
+ <nd ref='-45729' />
+ <nd ref='-38571' />
+ <nd ref='-38573' />
+ <nd ref='-38575' />
+ <nd ref='-38577' />
+ <nd ref='-38579' />
+ <nd ref='-45731' />
+ <nd ref='-45733' />
+ <nd ref='-45735' />
+ <nd ref='-45737' />
+ <nd ref='-45739' />
+ <nd ref='-45741' />
+ <nd ref='-45743' />
+ <nd ref='-45745' />
+ <nd ref='-45747' />
+ <nd ref='-45749' />
+ <nd ref='-45755' />
+ <nd ref='-45759' />
+ <nd ref='-45757' />
+ <nd ref='-45751' />
+ <nd ref='-45753' />
+ <nd ref='-45761' />
+ <nd ref='-45763' />
+ <nd ref='-45765' />
+ <nd ref='-45767' />
+ <nd ref='-45769' />
+ <nd ref='-38581' />
+ <nd ref='-38583' />
+ <nd ref='-45657' />
+ <nd ref='-45655' />
+ <nd ref='-41253' />
+ <nd ref='-41251' />
+ <nd ref='-38585' />
+ <nd ref='-31461' />
+ <nd ref='-31459' />
+ <nd ref='-31457' />
+ <nd ref='-31455' />
+ <nd ref='-31451' />
+ <nd ref='-31453' />
+ <nd ref='-41249' />
+ <nd ref='-31475' />
+ <nd ref='-31473' />
+ <nd ref='-31471' />
+ <nd ref='-31469' />
+ <nd ref='-31467' />
+ <nd ref='-31463' />
+ <nd ref='-31465' />
+ <nd ref='-38587' />
+ <nd ref='-31481' />
+ <nd ref='-31477' />
+ <nd ref='-31479' />
+ <nd ref='-31483' />
+ <nd ref='-31487' />
+ <nd ref='-31485' />
+ <nd ref='-41247' />
+ <nd ref='-38589' />
+ <nd ref='-41245' />
+ <nd ref='-31489' />
+ <nd ref='-31495' />
+ <nd ref='-31493' />
+ <nd ref='-31491' />
+ <nd ref='-38591' />
+ <nd ref='-38593' />
+ <nd ref='-41243' />
+ <nd ref='-38595' />
+ <nd ref='-38597' />
+ <nd ref='-38599' />
+ <nd ref='-38601' />
+ <nd ref='-41241' />
+ <nd ref='-41239' />
+ <nd ref='-31499' />
+ <nd ref='-31497' />
+ <nd ref='-38603' />
+ <nd ref='-31505' />
+ <nd ref='-31501' />
+ <nd ref='-31507' />
+ <nd ref='-31503' />
+ <nd ref='-41237' />
+ <nd ref='-41235' />
+ <nd ref='-38605' />
+ <nd ref='-31509' />
+ <nd ref='-38607' />
+ <nd ref='-41233' />
+ <nd ref='-31517' />
+ <nd ref='-31513' />
+ <nd ref='-31511' />
+ <nd ref='-31515' />
+ <nd ref='-38609' />
+ <nd ref='-31519' />
+ <nd ref='-31525' />
+ <nd ref='-31523' />
+ <nd ref='-31521' />
+ <nd ref='-41231' />
+ <nd ref='-31533' />
+ <nd ref='-31527' />
+ <nd ref='-31531' />
+ <nd ref='-31529' />
+ <nd ref='-41229' />
+ <nd ref='-41227' />
+ <nd ref='-31535' />
+ <nd ref='-38611' />
+ <nd ref='-38613' />
+ <nd ref='-41225' />
+ <nd ref='-31539' />
+ <nd ref='-31537' />
+ <nd ref='-41223' />
+ <nd ref='-31545' />
+ <nd ref='-31543' />
+ <nd ref='-31541' />
+ <nd ref='-38615' />
+ <nd ref='-38617' />
+ <nd ref='-38619' />
+ <nd ref='-31547' />
+ <nd ref='-38621' />
+ <nd ref='-41221' />
+ <nd ref='-38623' />
+ <nd ref='-38625' />
+ <nd ref='-38627' />
+ <nd ref='-31549' />
+ <nd ref='-41219' />
+ <nd ref='-31551' />
+ <nd ref='-38629' />
+ <nd ref='-31553' />
+ <nd ref='-38631' />
+ <nd ref='-41217' />
+ <nd ref='-31577' />
+ <nd ref='-31575' />
+ <nd ref='-31573' />
+ <nd ref='-31571' />
+ <nd ref='-31567' />
+ <nd ref='-31561' />
+ <nd ref='-31563' />
+ <nd ref='-31565' />
+ <nd ref='-31569' />
+ <nd ref='-31559' />
+ <nd ref='-31557' />
+ <nd ref='-31555' />
+ <nd ref='-38633' />
+ <nd ref='-31599' />
+ <nd ref='-31597' />
+ <nd ref='-31593' />
+ <nd ref='-31595' />
+ <nd ref='-31591' />
+ <nd ref='-31579' />
+ <nd ref='-31581' />
+ <nd ref='-31583' />
+ <nd ref='-31585' />
+ <nd ref='-31587' />
+ <nd ref='-31589' />
+ <nd ref='-38635' />
+ <nd ref='-41215' />
+ <nd ref='-38637' />
+ <nd ref='-41213' />
+ <nd ref='-38639' />
+ <nd ref='-41211' />
+ <nd ref='-31605' />
+ <nd ref='-31601' />
+ <nd ref='-31603' />
+ <nd ref='-31607' />
+ <nd ref='-41209' />
+ <nd ref='-31609' />
+ <nd ref='-38641' />
+ <nd ref='-41207' />
+ <nd ref='-41205' />
+ <nd ref='-31611' />
+ <nd ref='-41203' />
+ <nd ref='-38643' />
+ <nd ref='-41201' />
+ <nd ref='-38645' />
+ <nd ref='-41199' />
+ <nd ref='-38647' />
+ <nd ref='-41197' />
+ <nd ref='-41195' />
+ <nd ref='-38649' />
+ <nd ref='-38651' />
+ <nd ref='-41193' />
+ <nd ref='-38653' />
+ <nd ref='-38655' />
+ <nd ref='-38657' />
+ <nd ref='-43829' />
+ <nd ref='-43831' />
+ <nd ref='-38659' />
+ <nd ref='-43827' />
+ <nd ref='-43825' />
+ <nd ref='-38661' />
+ <nd ref='-43823' />
+ <nd ref='-38663' />
+ <nd ref='-43821' />
+ <nd ref='-38665' />
+ <nd ref='-38667' />
+ <nd ref='-43819' />
+ <nd ref='-43817' />
+ <nd ref='-43815' />
+ <nd ref='-43813' />
+ <nd ref='-38669' />
+ <nd ref='-43811' />
+ <nd ref='-38671' />
+ <nd ref='-38673' />
+ <nd ref='-43809' />
+ <nd ref='-43805' />
+ <nd ref='-43807' />
+ <nd ref='-43801' />
+ <tag k='ISO3166-1:alpha2' v='CN' />
+ <tag k='name:en' v='China' />
+ </way>
+ <way id='-57539'>
+ <nd ref='-36747' />
+ <nd ref='-36749' />
+ <nd ref='-36751' />
+ <nd ref='-38731' />
+ <nd ref='-36753' />
+ <nd ref='-36755' />
+ <nd ref='-36757' />
+ <nd ref='-36759' />
+ <nd ref='-36793' />
+ <nd ref='-38737' />
+ <nd ref='-36795' />
+ <nd ref='-36189' />
+ <nd ref='-36187' />
+ <nd ref='-36191' />
+ <nd ref='-36183' />
+ <nd ref='-36185' />
+ <nd ref='-36181' />
+ <nd ref='-36195' />
+ <nd ref='-36193' />
+ <nd ref='-41601' />
+ <nd ref='-36179' />
+ <nd ref='-36177' />
+ <nd ref='-36175' />
+ <nd ref='-37885' />
+ <nd ref='-38733' />
+ <nd ref='-37883' />
+ <nd ref='-36205' />
+ <nd ref='-36207' />
+ <nd ref='-36209' />
+ <nd ref='-36211' />
+ <nd ref='-36213' />
+ <nd ref='-36199' />
+ <nd ref='-36197' />
+ <nd ref='-36201' />
+ <nd ref='-36203' />
+ <nd ref='-38735' />
+ <nd ref='-36215' />
+ <nd ref='-37105' />
+ <nd ref='-37103' />
+ <nd ref='-36221' />
+ <nd ref='-36223' />
+ <nd ref='-36219' />
+ <nd ref='-36217' />
+ <nd ref='-36225' />
+ <nd ref='-36239' />
+ <nd ref='-36237' />
+ <nd ref='-36241' />
+ <nd ref='-36243' />
+ <nd ref='-36231' />
+ <nd ref='-36233' />
+ <nd ref='-36227' />
+ <nd ref='-36235' />
+ <nd ref='-36229' />
+ <nd ref='-36247' />
+ <nd ref='-36245' />
+ <nd ref='-36249' />
+ <nd ref='-36253' />
+ <nd ref='-36251' />
+ <nd ref='-36255' />
+ <nd ref='-36257' />
+ <nd ref='-36259' />
+ <nd ref='-36261' />
+ <nd ref='-36263' />
+ <nd ref='-37101' />
+ <nd ref='-36265' />
+ <nd ref='-36267' />
+ <nd ref='-36269' />
+ <nd ref='-36271' />
+ <nd ref='-36273' />
+ <nd ref='-36275' />
+ <nd ref='-36281' />
+ <nd ref='-36283' />
+ <nd ref='-36285' />
+ <nd ref='-36287' />
+ <nd ref='-36279' />
+ <nd ref='-36277' />
+ <nd ref='-37099' />
+ <nd ref='-36289' />
+ <nd ref='-36295' />
+ <nd ref='-36293' />
+ <nd ref='-36291' />
+ <nd ref='-36297' />
+ <nd ref='-36299' />
+ <nd ref='-43523' />
+ <nd ref='-43527' />
+ <nd ref='-43525' />
+ <nd ref='-37097' />
+ <nd ref='-43521' />
+ <nd ref='-43515' />
+ <nd ref='-43517' />
+ <nd ref='-43519' />
+ <nd ref='-36747' />
+ <tag k='ISO3166-1:alpha2' v='CL' />
+ <tag k='name:en' v='Chile' />
+ </way>
+ <way id='-57541'>
+ <nd ref='-40743' />
+ <nd ref='-38749' />
+ <nd ref='-33781' />
+ <nd ref='-33765' />
+ <nd ref='-33769' />
+ <nd ref='-33767' />
+ <nd ref='-33779' />
+ <nd ref='-33777' />
+ <nd ref='-33775' />
+ <nd ref='-33773' />
+ <nd ref='-33771' />
+ <nd ref='-33749' />
+ <nd ref='-33743' />
+ <nd ref='-33741' />
+ <nd ref='-33745' />
+ <nd ref='-33747' />
+ <nd ref='-33751' />
+ <nd ref='-33753' />
+ <nd ref='-33755' />
+ <nd ref='-33757' />
+ <nd ref='-33759' />
+ <nd ref='-33761' />
+ <nd ref='-33763' />
+ <nd ref='-33739' />
+ <nd ref='-33733' />
+ <nd ref='-33735' />
+ <nd ref='-33737' />
+ <nd ref='-38751' />
+ <nd ref='-33789' />
+ <nd ref='-33787' />
+ <nd ref='-33783' />
+ <nd ref='-33785' />
+ <nd ref='-38753' />
+ <nd ref='-33883' />
+ <nd ref='-33881' />
+ <nd ref='-33879' />
+ <nd ref='-33877' />
+ <nd ref='-33875' />
+ <nd ref='-33869' />
+ <nd ref='-33867' />
+ <nd ref='-33871' />
+ <nd ref='-33873' />
+ <nd ref='-33885' />
+ <nd ref='-33887' />
+ <nd ref='-33865' />
+ <nd ref='-33863' />
+ <nd ref='-33861' />
+ <nd ref='-33859' />
+ <nd ref='-33857' />
+ <nd ref='-33855' />
+ <nd ref='-33853' />
+ <nd ref='-33851' />
+ <nd ref='-33849' />
+ <nd ref='-33847' />
+ <nd ref='-33845' />
+ <nd ref='-33843' />
+ <nd ref='-33841' />
+ <nd ref='-33839' />
+ <nd ref='-39803' />
+ <nd ref='-31989' />
+ <nd ref='-31987' />
+ <nd ref='-31985' />
+ <nd ref='-31983' />
+ <nd ref='-31981' />
+ <nd ref='-31979' />
+ <nd ref='-41099' />
+ <nd ref='-32023' />
+ <nd ref='-32009' />
+ <nd ref='-32007' />
+ <nd ref='-32005' />
+ <nd ref='-32003' />
+ <nd ref='-32001' />
+ <nd ref='-32021' />
+ <nd ref='-32011' />
+ <nd ref='-32017' />
+ <nd ref='-32015' />
+ <nd ref='-32013' />
+ <nd ref='-32019' />
+ <nd ref='-31997' />
+ <nd ref='-31999' />
+ <nd ref='-31995' />
+ <nd ref='-31993' />
+ <nd ref='-31991' />
+ <nd ref='-38739' />
+ <nd ref='-47909' />
+ <nd ref='-47905' />
+ <nd ref='-47907' />
+ <nd ref='-47901' />
+ <nd ref='-47903' />
+ <nd ref='-47881' />
+ <nd ref='-47883' />
+ <nd ref='-47885' />
+ <nd ref='-47887' />
+ <nd ref='-47899' />
+ <nd ref='-47895' />
+ <nd ref='-47897' />
+ <nd ref='-47889' />
+ <nd ref='-47893' />
+ <nd ref='-47891' />
+ <nd ref='-38741' />
+ <nd ref='-47917' />
+ <nd ref='-47913' />
+ <nd ref='-47915' />
+ <nd ref='-47911' />
+ <nd ref='-38743' />
+ <nd ref='-47937' />
+ <nd ref='-47935' />
+ <nd ref='-47927' />
+ <nd ref='-47933' />
+ <nd ref='-47931' />
+ <nd ref='-47929' />
+ <nd ref='-47925' />
+ <nd ref='-47923' />
+ <nd ref='-47921' />
+ <nd ref='-47919' />
+ <nd ref='-47959' />
+ <nd ref='-47941' />
+ <nd ref='-47939' />
+ <nd ref='-47951' />
+ <nd ref='-47955' />
+ <nd ref='-47957' />
+ <nd ref='-47953' />
+ <nd ref='-47943' />
+ <nd ref='-47945' />
+ <nd ref='-47947' />
+ <nd ref='-47949' />
+ <nd ref='-38745' />
+ <nd ref='-42899' />
+ <nd ref='-42897' />
+ <nd ref='-42901' />
+ <nd ref='-42895' />
+ <nd ref='-42893' />
+ <nd ref='-38747' />
+ <nd ref='-40743' />
+ <tag k='ISO3166-1:alpha2' v='CI' />
+ <tag k='name:en' v='Côte d'Ivoire' />
+ </way>
+ <way id='-57543'>
+ <nd ref='-38755' />
+ <nd ref='-38757' />
+ <nd ref='-30685' />
+ <nd ref='-30683' />
+ <nd ref='-30681' />
+ <nd ref='-30679' />
+ <nd ref='-30677' />
+ <nd ref='-38759' />
+ <nd ref='-30675' />
+ <nd ref='-30673' />
+ <nd ref='-30671' />
+ <nd ref='-30667' />
+ <nd ref='-30669' />
+ <nd ref='-30665' />
+ <nd ref='-38761' />
+ <nd ref='-30661' />
+ <nd ref='-30663' />
+ <nd ref='-30659' />
+ <nd ref='-30657' />
+ <nd ref='-30655' />
+ <nd ref='-38763' />
+ <nd ref='-38765' />
+ <nd ref='-30649' />
+ <nd ref='-30645' />
+ <nd ref='-30647' />
+ <nd ref='-30651' />
+ <nd ref='-30653' />
+ <nd ref='-38767' />
+ <nd ref='-38769' />
+ <nd ref='-38771' />
+ <nd ref='-30643' />
+ <nd ref='-38773' />
+ <nd ref='-30641' />
+ <nd ref='-38775' />
+ <nd ref='-30639' />
+ <nd ref='-30637' />
+ <nd ref='-38777' />
+ <nd ref='-30635' />
+ <nd ref='-38779' />
+ <nd ref='-38781' />
+ <nd ref='-38013' />
+ <nd ref='-49237' />
+ <nd ref='-49235' />
+ <nd ref='-49233' />
+ <nd ref='-49231' />
+ <nd ref='-49239' />
+ <nd ref='-49241' />
+ <nd ref='-49245' />
+ <nd ref='-49243' />
+ <nd ref='-49247' />
+ <nd ref='-49249' />
+ <nd ref='-49259' />
+ <nd ref='-49257' />
+ <nd ref='-49255' />
+ <nd ref='-49253' />
+ <nd ref='-49251' />
+ <nd ref='-49261' />
+ <nd ref='-49263' />
+ <nd ref='-38011' />
+ <nd ref='-49229' />
+ <nd ref='-49227' />
+ <nd ref='-38009' />
+ <nd ref='-49225' />
+ <nd ref='-38007' />
+ <nd ref='-49223' />
+ <nd ref='-49221' />
+ <nd ref='-49181' />
+ <nd ref='-49183' />
+ <nd ref='-38783' />
+ <nd ref='-49179' />
+ <nd ref='-49177' />
+ <nd ref='-49175' />
+ <nd ref='-49173' />
+ <nd ref='-49171' />
+ <nd ref='-49169' />
+ <nd ref='-49167' />
+ <nd ref='-49161' />
+ <nd ref='-49163' />
+ <nd ref='-49165' />
+ <nd ref='-49159' />
+ <nd ref='-38785' />
+ <nd ref='-31973' />
+ <nd ref='-39737' />
+ <nd ref='-39735' />
+ <nd ref='-38787' />
+ <nd ref='-39855' />
+ <nd ref='-39853' />
+ <nd ref='-36869' />
+ <nd ref='-36867' />
+ <nd ref='-39851' />
+ <nd ref='-36871' />
+ <nd ref='-38789' />
+ <nd ref='-39849' />
+ <nd ref='-36857' />
+ <nd ref='-38791' />
+ <nd ref='-38793' />
+ <nd ref='-30821' />
+ <nd ref='-30817' />
+ <nd ref='-30819' />
+ <nd ref='-30815' />
+ <nd ref='-30813' />
+ <nd ref='-30835' />
+ <nd ref='-30809' />
+ <nd ref='-30811' />
+ <nd ref='-30805' />
+ <nd ref='-30807' />
+ <nd ref='-30837' />
+ <nd ref='-30801' />
+ <nd ref='-30803' />
+ <nd ref='-30799' />
+ <nd ref='-30795' />
+ <nd ref='-30797' />
+ <nd ref='-30793' />
+ <nd ref='-30791' />
+ <nd ref='-30785' />
+ <nd ref='-30789' />
+ <nd ref='-30787' />
+ <nd ref='-30831' />
+ <nd ref='-30767' />
+ <nd ref='-30765' />
+ <nd ref='-30769' />
+ <nd ref='-30771' />
+ <nd ref='-30773' />
+ <nd ref='-30781' />
+ <nd ref='-30779' />
+ <nd ref='-30775' />
+ <nd ref='-30777' />
+ <nd ref='-30783' />
+ <nd ref='-30763' />
+ <nd ref='-30759' />
+ <nd ref='-30757' />
+ <nd ref='-30761' />
+ <nd ref='-30755' />
+ <nd ref='-30753' />
+ <nd ref='-30751' />
+ <nd ref='-30749' />
+ <nd ref='-30747' />
+ <nd ref='-30745' />
+ <nd ref='-30743' />
+ <nd ref='-30741' />
+ <nd ref='-30833' />
+ <nd ref='-30735' />
+ <nd ref='-30737' />
+ <nd ref='-30731' />
+ <nd ref='-30733' />
+ <nd ref='-30729' />
+ <nd ref='-30727' />
+ <nd ref='-30725' />
+ <nd ref='-30723' />
+ <nd ref='-30739' />
+ <nd ref='-30721' />
+ <nd ref='-30719' />
+ <nd ref='-30717' />
+ <nd ref='-30715' />
+ <nd ref='-30713' />
+ <nd ref='-30709' />
+ <nd ref='-30707' />
+ <nd ref='-30705' />
+ <nd ref='-30711' />
+ <nd ref='-30825' />
+ <nd ref='-30703' />
+ <nd ref='-30823' />
+ <nd ref='-30701' />
+ <nd ref='-30699' />
+ <nd ref='-30697' />
+ <nd ref='-30695' />
+ <nd ref='-30827' />
+ <nd ref='-30829' />
+ <nd ref='-30691' />
+ <nd ref='-30693' />
+ <nd ref='-38795' />
+ <nd ref='-38797' />
+ <nd ref='-30687' />
+ <nd ref='-30689' />
+ <nd ref='-38755' />
+ <tag k='ISO3166-1:alpha2' v='CM' />
+ <tag k='name:en' v='Cameroon' />
+ </way>
+ <way id='-57545'>
+ <nd ref='-38801' />
+ <nd ref='-49003' />
+ <nd ref='-49005' />
+ <nd ref='-49009' />
+ <nd ref='-49007' />
+ <nd ref='-49011' />
+ <nd ref='-49013' />
+ <nd ref='-49015' />
+ <nd ref='-49017' />
+ <nd ref='-49019' />
+ <nd ref='-49021' />
+ <nd ref='-49023' />
+ <nd ref='-49025' />
+ <nd ref='-49027' />
+ <nd ref='-49029' />
+ <nd ref='-49031' />
+ <nd ref='-49033' />
+ <nd ref='-49035' />
+ <nd ref='-49037' />
+ <nd ref='-49039' />
+ <nd ref='-49041' />
+ <nd ref='-49043' />
+ <nd ref='-49045' />
+ <nd ref='-49047' />
+ <nd ref='-49049' />
+ <nd ref='-49051' />
+ <nd ref='-49053' />
+ <nd ref='-49055' />
+ <nd ref='-49001' />
+ <nd ref='-49059' />
+ <nd ref='-49057' />
+ <nd ref='-49061' />
+ <nd ref='-49063' />
+ <nd ref='-49065' />
+ <nd ref='-49067' />
+ <nd ref='-49069' />
+ <nd ref='-49071' />
+ <nd ref='-49085' />
+ <nd ref='-49083' />
+ <nd ref='-49081' />
+ <nd ref='-49087' />
+ <nd ref='-49079' />
+ <nd ref='-49073' />
+ <nd ref='-49077' />
+ <nd ref='-49075' />
+ <nd ref='-49089' />
+ <nd ref='-49091' />
+ <nd ref='-49095' />
+ <nd ref='-49099' />
+ <nd ref='-49097' />
+ <nd ref='-49093' />
+ <nd ref='-42245' />
+ <nd ref='-30977' />
+ <nd ref='-30975' />
+ <nd ref='-30979' />
+ <nd ref='-30983' />
+ <nd ref='-30981' />
+ <nd ref='-30987' />
+ <nd ref='-30985' />
+ <nd ref='-31005' />
+ <nd ref='-30989' />
+ <nd ref='-31003' />
+ <nd ref='-31001' />
+ <nd ref='-30993' />
+ <nd ref='-30991' />
+ <nd ref='-30995' />
+ <nd ref='-30999' />
+ <nd ref='-30997' />
+ <nd ref='-31043' />
+ <nd ref='-31041' />
+ <nd ref='-31045' />
+ <nd ref='-31033' />
+ <nd ref='-31031' />
+ <nd ref='-31035' />
+ <nd ref='-31037' />
+ <nd ref='-31023' />
+ <nd ref='-31025' />
+ <nd ref='-31027' />
+ <nd ref='-31029' />
+ <nd ref='-31019' />
+ <nd ref='-31021' />
+ <nd ref='-31039' />
+ <nd ref='-31017' />
+ <nd ref='-31007' />
+ <nd ref='-31009' />
+ <nd ref='-31011' />
+ <nd ref='-31013' />
+ <nd ref='-31015' />
+ <nd ref='-41781' />
+ <nd ref='-34275' />
+ <nd ref='-34277' />
+ <nd ref='-34279' />
+ <nd ref='-34285' />
+ <nd ref='-34273' />
+ <nd ref='-34281' />
+ <nd ref='-34283' />
+ <nd ref='-34301' />
+ <nd ref='-34303' />
+ <nd ref='-34305' />
+ <nd ref='-34307' />
+ <nd ref='-34309' />
+ <nd ref='-34295' />
+ <nd ref='-34297' />
+ <nd ref='-34291' />
+ <nd ref='-34293' />
+ <nd ref='-34299' />
+ <nd ref='-34289' />
+ <nd ref='-34311' />
+ <nd ref='-34287' />
+ <nd ref='-38803' />
+ <nd ref='-34695' />
+ <nd ref='-34683' />
+ <nd ref='-34685' />
+ <nd ref='-34687' />
+ <nd ref='-34693' />
+ <nd ref='-34689' />
+ <nd ref='-34691' />
+ <nd ref='-37309' />
+ <nd ref='-34697' />
+ <nd ref='-37307' />
+ <nd ref='-37305' />
+ <nd ref='-38805' />
+ <nd ref='-34661' />
+ <nd ref='-38807' />
+ <nd ref='-38809' />
+ <nd ref='-34703' />
+ <nd ref='-34705' />
+ <nd ref='-34707' />
+ <nd ref='-34709' />
+ <nd ref='-42397' />
+ <nd ref='-34699' />
+ <nd ref='-34701' />
+ <nd ref='-38811' />
+ <nd ref='-33965' />
+ <nd ref='-33963' />
+ <nd ref='-33961' />
+ <nd ref='-33959' />
+ <nd ref='-33957' />
+ <nd ref='-33955' />
+ <nd ref='-42395' />
+ <nd ref='-38813' />
+ <nd ref='-33943' />
+ <nd ref='-33945' />
+ <nd ref='-33947' />
+ <nd ref='-33949' />
+ <nd ref='-33951' />
+ <nd ref='-33953' />
+ <nd ref='-33941' />
+ <nd ref='-33929' />
+ <nd ref='-33931' />
+ <nd ref='-33927' />
+ <nd ref='-33933' />
+ <nd ref='-33939' />
+ <nd ref='-33937' />
+ <nd ref='-33935' />
+ <nd ref='-36971' />
+ <nd ref='-34839' />
+ <nd ref='-34841' />
+ <nd ref='-34843' />
+ <nd ref='-34845' />
+ <nd ref='-36969' />
+ <nd ref='-34855' />
+ <nd ref='-34853' />
+ <nd ref='-34851' />
+ <nd ref='-34857' />
+ <nd ref='-36967' />
+ <nd ref='-34863' />
+ <nd ref='-34861' />
+ <nd ref='-34859' />
+ <nd ref='-34865' />
+ <nd ref='-36965' />
+ <nd ref='-36963' />
+ <nd ref='-34867' />
+ <nd ref='-36961' />
+ <nd ref='-34869' />
+ <nd ref='-36959' />
+ <nd ref='-34847' />
+ <nd ref='-34849' />
+ <nd ref='-36991' />
+ <nd ref='-36989' />
+ <nd ref='-36987' />
+ <nd ref='-36985' />
+ <nd ref='-30615' />
+ <nd ref='-30611' />
+ <nd ref='-30605' />
+ <nd ref='-30607' />
+ <nd ref='-30609' />
+ <nd ref='-30613' />
+ <nd ref='-30597' />
+ <nd ref='-30595' />
+ <nd ref='-30599' />
+ <nd ref='-30601' />
+ <nd ref='-30603' />
+ <nd ref='-38817' />
+ <nd ref='-30525' />
+ <nd ref='-30523' />
+ <nd ref='-30519' />
+ <nd ref='-30521' />
+ <nd ref='-30531' />
+ <nd ref='-30529' />
+ <nd ref='-30527' />
+ <nd ref='-30553' />
+ <nd ref='-30535' />
+ <nd ref='-30537' />
+ <nd ref='-30533' />
+ <nd ref='-30551' />
+ <nd ref='-30547' />
+ <nd ref='-30549' />
+ <nd ref='-30517' />
+ <nd ref='-30545' />
+ <nd ref='-30543' />
+ <nd ref='-30541' />
+ <nd ref='-30539' />
+ <nd ref='-30555' />
+ <nd ref='-30559' />
+ <nd ref='-30557' />
+ <nd ref='-30563' />
+ <nd ref='-30561' />
+ <nd ref='-30593' />
+ <nd ref='-30565' />
+ <nd ref='-30573' />
+ <nd ref='-30571' />
+ <nd ref='-30569' />
+ <nd ref='-30567' />
+ <nd ref='-30591' />
+ <nd ref='-30579' />
+ <nd ref='-30575' />
+ <nd ref='-30577' />
+ <nd ref='-30581' />
+ <nd ref='-30583' />
+ <nd ref='-30585' />
+ <nd ref='-30589' />
+ <nd ref='-30587' />
+ <nd ref='-38815' />
+ <nd ref='-49267' />
+ <nd ref='-49269' />
+ <nd ref='-49275' />
+ <nd ref='-49273' />
+ <nd ref='-49271' />
+ <nd ref='-49283' />
+ <nd ref='-49277' />
+ <nd ref='-49279' />
+ <nd ref='-49281' />
+ <nd ref='-49265' />
+ <nd ref='-49291' />
+ <nd ref='-49295' />
+ <nd ref='-49293' />
+ <nd ref='-49297' />
+ <nd ref='-49299' />
+ <nd ref='-49301' />
+ <nd ref='-49303' />
+ <nd ref='-49289' />
+ <nd ref='-49287' />
+ <nd ref='-49285' />
+ <nd ref='-49305' />
+ <nd ref='-49307' />
+ <nd ref='-49309' />
+ <nd ref='-49311' />
+ <nd ref='-49313' />
+ <nd ref='-49315' />
+ <nd ref='-49317' />
+ <nd ref='-49319' />
+ <nd ref='-49321' />
+ <nd ref='-49323' />
+ <nd ref='-49325' />
+ <nd ref='-49327' />
+ <nd ref='-38801' />
+ <tag k='ISO3166-1:alpha2' v='CD' />
+ <tag k='name:en' v='Congo, Dem. Rep.' />
+ </way>
+ <way id='-57547'>
+ <nd ref='-38815' />
+ <nd ref='-30587' />
+ <nd ref='-30589' />
+ <nd ref='-30585' />
+ <nd ref='-30583' />
+ <nd ref='-30581' />
+ <nd ref='-30577' />
+ <nd ref='-30575' />
+ <nd ref='-30579' />
+ <nd ref='-30591' />
+ <nd ref='-30567' />
+ <nd ref='-30569' />
+ <nd ref='-30571' />
+ <nd ref='-30573' />
+ <nd ref='-30565' />
+ <nd ref='-30593' />
+ <nd ref='-30561' />
+ <nd ref='-30563' />
+ <nd ref='-30557' />
+ <nd ref='-30559' />
+ <nd ref='-30555' />
+ <nd ref='-30539' />
+ <nd ref='-30541' />
+ <nd ref='-30543' />
+ <nd ref='-30545' />
+ <nd ref='-30517' />
+ <nd ref='-30549' />
+ <nd ref='-30547' />
+ <nd ref='-30551' />
+ <nd ref='-30533' />
+ <nd ref='-30537' />
+ <nd ref='-30535' />
+ <nd ref='-30553' />
+ <nd ref='-30527' />
+ <nd ref='-30529' />
+ <nd ref='-30531' />
+ <nd ref='-30521' />
+ <nd ref='-30519' />
+ <nd ref='-30523' />
+ <nd ref='-30525' />
+ <nd ref='-38817' />
+ <nd ref='-30617' />
+ <nd ref='-30619' />
+ <nd ref='-30621' />
+ <nd ref='-30623' />
+ <nd ref='-30625' />
+ <nd ref='-30629' />
+ <nd ref='-30627' />
+ <nd ref='-30631' />
+ <nd ref='-30633' />
+ <nd ref='-38819' />
+ <nd ref='-38821' />
+ <nd ref='-38823' />
+ <nd ref='-39709' />
+ <nd ref='-31917' />
+ <nd ref='-31915' />
+ <nd ref='-31913' />
+ <nd ref='-38825' />
+ <nd ref='-39707' />
+ <nd ref='-38827' />
+ <nd ref='-38829' />
+ <nd ref='-31919' />
+ <nd ref='-39705' />
+ <nd ref='-31921' />
+ <nd ref='-31923' />
+ <nd ref='-31925' />
+ <nd ref='-31927' />
+ <nd ref='-31929' />
+ <nd ref='-39703' />
+ <nd ref='-31931' />
+ <nd ref='-31933' />
+ <nd ref='-38831' />
+ <nd ref='-31941' />
+ <nd ref='-31939' />
+ <nd ref='-31937' />
+ <nd ref='-31935' />
+ <nd ref='-39701' />
+ <nd ref='-38833' />
+ <nd ref='-31955' />
+ <nd ref='-31953' />
+ <nd ref='-31951' />
+ <nd ref='-31949' />
+ <nd ref='-31947' />
+ <nd ref='-31945' />
+ <nd ref='-31943' />
+ <nd ref='-38835' />
+ <nd ref='-38837' />
+ <nd ref='-38839' />
+ <nd ref='-31961' />
+ <nd ref='-31957' />
+ <nd ref='-31959' />
+ <nd ref='-38841' />
+ <nd ref='-31965' />
+ <nd ref='-31963' />
+ <nd ref='-38843' />
+ <nd ref='-39699' />
+ <nd ref='-39697' />
+ <nd ref='-31967' />
+ <nd ref='-39695' />
+ <nd ref='-31971' />
+ <nd ref='-31969' />
+ <nd ref='-38785' />
+ <nd ref='-49159' />
+ <nd ref='-49165' />
+ <nd ref='-49163' />
+ <nd ref='-49161' />
+ <nd ref='-49167' />
+ <nd ref='-49169' />
+ <nd ref='-49171' />
+ <nd ref='-49173' />
+ <nd ref='-49175' />
+ <nd ref='-49177' />
+ <nd ref='-49179' />
+ <nd ref='-38783' />
+ <nd ref='-49185' />
+ <nd ref='-49189' />
+ <nd ref='-49187' />
+ <nd ref='-49195' />
+ <nd ref='-49197' />
+ <nd ref='-49193' />
+ <nd ref='-49191' />
+ <nd ref='-49219' />
+ <nd ref='-49213' />
+ <nd ref='-49215' />
+ <nd ref='-49217' />
+ <nd ref='-49199' />
+ <nd ref='-49205' />
+ <nd ref='-49207' />
+ <nd ref='-49209' />
+ <nd ref='-49211' />
+ <nd ref='-49201' />
+ <nd ref='-49203' />
+ <nd ref='-38815' />
+ <tag k='ISO3166-1:alpha2' v='CG' />
+ <tag k='name:en' v='Congo, Rep.' />
+ </way>
+ <way id='-57549'>
+ <nd ref='-38845' />
+ <nd ref='-36411' />
+ <nd ref='-38847' />
+ <nd ref='-35383' />
+ <nd ref='-35381' />
+ <nd ref='-35375' />
+ <nd ref='-35377' />
+ <nd ref='-35379' />
+ <nd ref='-35399' />
+ <nd ref='-35397' />
+ <nd ref='-35395' />
+ <nd ref='-35401' />
+ <nd ref='-35403' />
+ <nd ref='-35387' />
+ <nd ref='-35385' />
+ <nd ref='-35389' />
+ <nd ref='-35391' />
+ <nd ref='-35393' />
+ <nd ref='-35409' />
+ <nd ref='-35407' />
+ <nd ref='-35405' />
+ <nd ref='-35411' />
+ <nd ref='-38849' />
+ <nd ref='-35413' />
+ <nd ref='-35415' />
+ <nd ref='-35417' />
+ <nd ref='-35419' />
+ <nd ref='-35421' />
+ <nd ref='-35423' />
+ <nd ref='-35425' />
+ <nd ref='-35427' />
+ <nd ref='-35429' />
+ <nd ref='-38851' />
+ <nd ref='-35435' />
+ <nd ref='-35433' />
+ <nd ref='-35431' />
+ <nd ref='-38853' />
+ <nd ref='-37935' />
+ <nd ref='-35437' />
+ <nd ref='-35439' />
+ <nd ref='-35441' />
+ <nd ref='-35443' />
+ <nd ref='-35445' />
+ <nd ref='-35447' />
+ <nd ref='-35449' />
+ <nd ref='-35451' />
+ <nd ref='-35455' />
+ <nd ref='-35453' />
+ <nd ref='-35457' />
+ <nd ref='-35463' />
+ <nd ref='-35461' />
+ <nd ref='-35459' />
+ <nd ref='-35471' />
+ <nd ref='-35473' />
+ <nd ref='-35475' />
+ <nd ref='-35477' />
+ <nd ref='-35469' />
+ <nd ref='-35467' />
+ <nd ref='-35465' />
+ <nd ref='-37933' />
+ <nd ref='-37931' />
+ <nd ref='-35977' />
+ <nd ref='-35979' />
+ <nd ref='-38855' />
+ <nd ref='-38857' />
+ <nd ref='-35813' />
+ <nd ref='-35811' />
+ <nd ref='-35809' />
+ <nd ref='-38859' />
+ <nd ref='-35859' />
+ <nd ref='-35861' />
+ <nd ref='-39283' />
+ <nd ref='-35867' />
+ <nd ref='-35869' />
+ <nd ref='-35871' />
+ <nd ref='-35873' />
+ <nd ref='-35877' />
+ <nd ref='-35875' />
+ <nd ref='-35879' />
+ <nd ref='-38861' />
+ <nd ref='-36803' />
+ <nd ref='-38863' />
+ <nd ref='-36801' />
+ <nd ref='-35927' />
+ <nd ref='-35917' />
+ <nd ref='-35919' />
+ <nd ref='-35921' />
+ <nd ref='-35923' />
+ <nd ref='-35925' />
+ <nd ref='-38865' />
+ <nd ref='-36763' />
+ <nd ref='-36761' />
+ <nd ref='-41503' />
+ <nd ref='-41501' />
+ <nd ref='-36767' />
+ <nd ref='-36765' />
+ <nd ref='-38845' />
+ <tag k='ISO3166-1:alpha2' v='CO' />
+ <tag k='name:en' v='Colombia' />
+ </way>
+ <way id='-57551'>
+ <nd ref='-41505' />
+ <nd ref='-36775' />
+ <nd ref='-38867' />
+ <nd ref='-38869' />
+ <nd ref='-35893' />
+ <nd ref='-35895' />
+ <nd ref='-35897' />
+ <nd ref='-35899' />
+ <nd ref='-35913' />
+ <nd ref='-35915' />
+ <nd ref='-35911' />
+ <nd ref='-35909' />
+ <nd ref='-35907' />
+ <nd ref='-35903' />
+ <nd ref='-35905' />
+ <nd ref='-35901' />
+ <nd ref='-38871' />
+ <nd ref='-38873' />
+ <nd ref='-36797' />
+ <nd ref='-38875' />
+ <nd ref='-36799' />
+ <nd ref='-38877' />
+ <nd ref='-35891' />
+ <nd ref='-35889' />
+ <nd ref='-35887' />
+ <nd ref='-35885' />
+ <nd ref='-35883' />
+ <nd ref='-35881' />
+ <nd ref='-41505' />
+ <tag k='ISO3166-1:alpha2' v='CR' />
+ <tag k='name:en' v='Costa Rica' />
+ </way>
+ <way id='-57553'>
+ <nd ref='-38885' />
+ <nd ref='-38887' />
+ <nd ref='-38889' />
+ <nd ref='-38891' />
+ <nd ref='-38893' />
+ <nd ref='-38895' />
+ <nd ref='-38897' />
+ <nd ref='-43213' />
+ <nd ref='-38899' />
+ <nd ref='-38901' />
+ <nd ref='-38903' />
+ <nd ref='-38905' />
+ <nd ref='-38907' />
+ <nd ref='-38909' />
+ <nd ref='-38885' />
+ </way>
+ <way id='-57555'>
+ <nd ref='-38911' />
+ <nd ref='-38913' />
+ <nd ref='-38915' />
+ <nd ref='-38917' />
+ <nd ref='-38919' />
+ <nd ref='-38921' />
+ <nd ref='-38911' />
+ </way>
+ <way id='-57557'>
+ <nd ref='-43209' />
+ <nd ref='-43211' />
+ <nd ref='-43123' />
+ <nd ref='-38925' />
+ <nd ref='-38927' />
+ <nd ref='-43229' />
+ <nd ref='-38929' />
+ <nd ref='-38931' />
+ <nd ref='-38933' />
+ <nd ref='-43227' />
+ <nd ref='-43225' />
+ <nd ref='-43223' />
+ <nd ref='-38935' />
+ <nd ref='-38937' />
+ <nd ref='-38939' />
+ <nd ref='-38941' />
+ <nd ref='-43221' />
+ <nd ref='-38943' />
+ <nd ref='-43219' />
+ <nd ref='-38945' />
+ <nd ref='-43217' />
+ <nd ref='-43215' />
+ <nd ref='-38947' />
+ <nd ref='-38949' />
+ <nd ref='-38951' />
+ <nd ref='-38953' />
+ <nd ref='-38955' />
+ <nd ref='-38957' />
+ <nd ref='-38959' />
+ <nd ref='-38961' />
+ <nd ref='-38963' />
+ <nd ref='-38965' />
+ <nd ref='-38967' />
+ <nd ref='-38969' />
+ <nd ref='-38971' />
+ <nd ref='-38973' />
+ <nd ref='-38799' />
+ <nd ref='-38883' />
+ <nd ref='-40739' />
+ <nd ref='-43121' />
+ <nd ref='-38923' />
+ <nd ref='-43125' />
+ <nd ref='-43127' />
+ <nd ref='-43129' />
+ <nd ref='-43131' />
+ <nd ref='-43133' />
+ <nd ref='-43135' />
+ <nd ref='-43137' />
+ <nd ref='-43139' />
+ <nd ref='-43141' />
+ <nd ref='-43143' />
+ <nd ref='-43145' />
+ <nd ref='-43147' />
+ <nd ref='-43149' />
+ <nd ref='-43151' />
+ <nd ref='-43153' />
+ <nd ref='-43155' />
+ <nd ref='-43157' />
+ <nd ref='-43163' />
+ <nd ref='-43161' />
+ <nd ref='-43159' />
+ <nd ref='-43165' />
+ <nd ref='-43179' />
+ <nd ref='-43177' />
+ <nd ref='-43175' />
+ <nd ref='-43173' />
+ <nd ref='-43171' />
+ <nd ref='-43169' />
+ <nd ref='-43167' />
+ <nd ref='-43183' />
+ <nd ref='-43181' />
+ <nd ref='-43185' />
+ <nd ref='-38879' />
+ <nd ref='-38881' />
+ <nd ref='-43187' />
+ <nd ref='-43189' />
+ <nd ref='-43203' />
+ <nd ref='-43201' />
+ <nd ref='-43205' />
+ <nd ref='-43197' />
+ <nd ref='-43199' />
+ <nd ref='-43195' />
+ <nd ref='-43193' />
+ <nd ref='-43191' />
+ <nd ref='-43207' />
+ <nd ref='-43209' />
+ </way>
+ <way id='-57559'>
+ <nd ref='-38975' />
+ <nd ref='-50705' />
+ <nd ref='-50707' />
+ <nd ref='-50709' />
+ <nd ref='-50711' />
+ <nd ref='-50725' />
+ <nd ref='-50717' />
+ <nd ref='-50719' />
+ <nd ref='-50721' />
+ <nd ref='-50723' />
+ <nd ref='-50713' />
+ <nd ref='-50727' />
+ <nd ref='-50729' />
+ <nd ref='-50715' />
+ <nd ref='-50731' />
+ <nd ref='-50741' />
+ <nd ref='-50735' />
+ <nd ref='-50737' />
+ <nd ref='-50739' />
+ <nd ref='-50747' />
+ <nd ref='-50745' />
+ <nd ref='-50733' />
+ <nd ref='-50743' />
+ <nd ref='-50757' />
+ <nd ref='-50755' />
+ <nd ref='-50753' />
+ <nd ref='-50751' />
+ <nd ref='-50761' />
+ <nd ref='-50759' />
+ <nd ref='-50749' />
+ <nd ref='-50765' />
+ <nd ref='-50779' />
+ <nd ref='-50767' />
+ <nd ref='-50777' />
+ <nd ref='-50781' />
+ <nd ref='-50775' />
+ <nd ref='-50769' />
+ <nd ref='-50771' />
+ <nd ref='-50773' />
+ <nd ref='-50763' />
+ <nd ref='-50791' />
+ <nd ref='-50807' />
+ <nd ref='-50797' />
+ <nd ref='-50799' />
+ <nd ref='-50801' />
+ <nd ref='-50803' />
+ <nd ref='-50805' />
+ <nd ref='-50793' />
+ <nd ref='-50795' />
+ <nd ref='-50785' />
+ <nd ref='-50783' />
+ <nd ref='-50787' />
+ <nd ref='-50789' />
+ <nd ref='-50821' />
+ <nd ref='-50819' />
+ <nd ref='-50823' />
+ <nd ref='-50825' />
+ <nd ref='-50829' />
+ <nd ref='-50827' />
+ <nd ref='-50813' />
+ <nd ref='-50831' />
+ <nd ref='-50833' />
+ <nd ref='-50817' />
+ <nd ref='-50815' />
+ <nd ref='-50809' />
+ <nd ref='-50811' />
+ <nd ref='-50835' />
+ <nd ref='-50839' />
+ <nd ref='-50837' />
+ <nd ref='-50845' />
+ <nd ref='-50855' />
+ <nd ref='-50853' />
+ <nd ref='-50851' />
+ <nd ref='-50849' />
+ <nd ref='-50847' />
+ <nd ref='-50857' />
+ <nd ref='-50859' />
+ <nd ref='-50861' />
+ <nd ref='-50863' />
+ <nd ref='-50843' />
+ <nd ref='-50867' />
+ <nd ref='-50865' />
+ <nd ref='-50869' />
+ <nd ref='-50871' />
+ <nd ref='-50873' />
+ <nd ref='-50875' />
+ <nd ref='-50881' />
+ <nd ref='-50879' />
+ <nd ref='-50877' />
+ <nd ref='-50841' />
+ <nd ref='-50885' />
+ <nd ref='-50887' />
+ <nd ref='-38977' />
+ <nd ref='-50883' />
+ <nd ref='-38979' />
+ <nd ref='-50895' />
+ <nd ref='-50899' />
+ <nd ref='-50903' />
+ <nd ref='-50897' />
+ <nd ref='-50901' />
+ <nd ref='-50893' />
+ <nd ref='-50905' />
+ <nd ref='-50907' />
+ <nd ref='-50909' />
+ <nd ref='-50891' />
+ <nd ref='-50889' />
+ <nd ref='-50929' />
+ <nd ref='-50927' />
+ <nd ref='-50925' />
+ <nd ref='-50923' />
+ <nd ref='-50921' />
+ <nd ref='-50919' />
+ <nd ref='-50917' />
+ <nd ref='-50915' />
+ <nd ref='-50913' />
+ <nd ref='-50911' />
+ <nd ref='-50935' />
+ <nd ref='-38981' />
+ <nd ref='-50933' />
+ <nd ref='-50931' />
+ <nd ref='-37199' />
+ <nd ref='-49599' />
+ <nd ref='-49601' />
+ <nd ref='-49603' />
+ <nd ref='-49595' />
+ <nd ref='-49597' />
+ <nd ref='-49591' />
+ <nd ref='-49593' />
+ <nd ref='-49589' />
+ <nd ref='-49587' />
+ <nd ref='-49585' />
+ <nd ref='-49583' />
+ <nd ref='-49581' />
+ <nd ref='-37197' />
+ <nd ref='-49575' />
+ <nd ref='-49573' />
+ <nd ref='-49571' />
+ <nd ref='-49569' />
+ <nd ref='-49567' />
+ <nd ref='-49577' />
+ <nd ref='-49579' />
+ <nd ref='-49565' />
+ <nd ref='-49563' />
+ <nd ref='-37257' />
+ <nd ref='-49561' />
+ <nd ref='-49559' />
+ <nd ref='-49557' />
+ <nd ref='-49555' />
+ <nd ref='-37255' />
+ <nd ref='-49553' />
+ <nd ref='-49551' />
+ <nd ref='-37253' />
+ <nd ref='-37251' />
+ <nd ref='-37249' />
+ <nd ref='-37247' />
+ <nd ref='-49549' />
+ <nd ref='-49547' />
+ <nd ref='-49545' />
+ <nd ref='-39005' />
+ <nd ref='-46101' />
+ <nd ref='-46099' />
+ <nd ref='-46097' />
+ <nd ref='-46095' />
+ <nd ref='-46115' />
+ <nd ref='-46117' />
+ <nd ref='-46113' />
+ <nd ref='-46111' />
+ <nd ref='-46109' />
+ <nd ref='-46107' />
+ <nd ref='-46105' />
+ <nd ref='-46103' />
+ <nd ref='-46119' />
+ <nd ref='-46121' />
+ <nd ref='-46123' />
+ <nd ref='-46125' />
+ <nd ref='-46093' />
+ <nd ref='-46151' />
+ <nd ref='-46147' />
+ <nd ref='-46149' />
+ <nd ref='-46145' />
+ <nd ref='-46143' />
+ <nd ref='-46155' />
+ <nd ref='-46141' />
+ <nd ref='-46153' />
+ <nd ref='-46129' />
+ <nd ref='-46131' />
+ <nd ref='-46133' />
+ <nd ref='-46135' />
+ <nd ref='-46137' />
+ <nd ref='-46139' />
+ <nd ref='-46127' />
+ <nd ref='-46161' />
+ <nd ref='-46163' />
+ <nd ref='-46159' />
+ <nd ref='-46157' />
+ <nd ref='-46165' />
+ <nd ref='-46167' />
+ <nd ref='-46177' />
+ <nd ref='-46175' />
+ <nd ref='-46173' />
+ <nd ref='-46171' />
+ <nd ref='-46169' />
+ <nd ref='-46091' />
+ <nd ref='-46193' />
+ <nd ref='-46195' />
+ <nd ref='-46197' />
+ <nd ref='-46199' />
+ <nd ref='-46201' />
+ <nd ref='-46233' />
+ <nd ref='-46235' />
+ <nd ref='-46203' />
+ <nd ref='-46205' />
+ <nd ref='-46231' />
+ <nd ref='-46229' />
+ <nd ref='-46191' />
+ <nd ref='-46239' />
+ <nd ref='-46237' />
+ <nd ref='-46227' />
+ <nd ref='-46225' />
+ <nd ref='-46223' />
+ <nd ref='-46221' />
+ <nd ref='-46207' />
+ <nd ref='-46219' />
+ <nd ref='-46217' />
+ <nd ref='-46215' />
+ <nd ref='-46209' />
+ <nd ref='-46213' />
+ <nd ref='-46211' />
+ <nd ref='-46183' />
+ <nd ref='-46189' />
+ <nd ref='-46185' />
+ <nd ref='-46187' />
+ <nd ref='-46181' />
+ <nd ref='-46179' />
+ <nd ref='-46257' />
+ <nd ref='-46247' />
+ <nd ref='-46267' />
+ <nd ref='-46269' />
+ <nd ref='-46245' />
+ <nd ref='-46249' />
+ <nd ref='-46259' />
+ <nd ref='-46261' />
+ <nd ref='-46263' />
+ <nd ref='-46265' />
+ <nd ref='-46251' />
+ <nd ref='-46243' />
+ <nd ref='-46271' />
+ <nd ref='-46253' />
+ <nd ref='-46273' />
+ <nd ref='-46255' />
+ <nd ref='-46241' />
+ <nd ref='-46275' />
+ <nd ref='-46279' />
+ <nd ref='-46281' />
+ <nd ref='-46277' />
+ <nd ref='-46295' />
+ <nd ref='-46297' />
+ <nd ref='-46299' />
+ <nd ref='-46301' />
+ <nd ref='-46293' />
+ <nd ref='-46291' />
+ <nd ref='-46339' />
+ <nd ref='-46341' />
+ <nd ref='-46289' />
+ <nd ref='-46287' />
+ <nd ref='-46285' />
+ <nd ref='-46283' />
+ <nd ref='-46303' />
+ <nd ref='-46305' />
+ <nd ref='-46329' />
+ <nd ref='-46327' />
+ <nd ref='-46331' />
+ <nd ref='-46333' />
+ <nd ref='-46325' />
+ <nd ref='-46335' />
+ <nd ref='-46337' />
+ <nd ref='-46323' />
+ <nd ref='-46321' />
+ <nd ref='-46307' />
+ <nd ref='-46309' />
+ <nd ref='-46319' />
+ <nd ref='-46311' />
+ <nd ref='-46315' />
+ <nd ref='-46313' />
+ <nd ref='-46317' />
+ <nd ref='-38975' />
+ <tag k='ISO3166-1:alpha2' v='CZ' />
+ <tag k='maxspeed:motorway' v='130' />
+ <tag k='maxspeed:rural' v='90' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Czechia' />
+ </way>
+ <way id='-57561'>
+ <nd ref='-39025' />
+ <nd ref='-39027' />
+ <nd ref='-44911' />
+ <nd ref='-44913' />
+ <nd ref='-44915' />
+ <nd ref='-44923' />
+ <nd ref='-44921' />
+ <nd ref='-44917' />
+ <nd ref='-44919' />
+ <nd ref='-39029' />
+ <nd ref='-38675' />
+ <nd ref='-39031' />
+ <nd ref='-38729' />
+ <nd ref='-38727' />
+ <nd ref='-44909' />
+ <nd ref='-44907' />
+ <nd ref='-44905' />
+ <nd ref='-44903' />
+ <nd ref='-44901' />
+ <nd ref='-38725' />
+ <nd ref='-44891' />
+ <nd ref='-44893' />
+ <nd ref='-44895' />
+ <nd ref='-44899' />
+ <nd ref='-44897' />
+ <nd ref='-38723' />
+ <nd ref='-44887' />
+ <nd ref='-44889' />
+ <nd ref='-38721' />
+ <nd ref='-44877' />
+ <nd ref='-44881' />
+ <nd ref='-44883' />
+ <nd ref='-44885' />
+ <nd ref='-44879' />
+ <nd ref='-44875' />
+ <nd ref='-44873' />
+ <nd ref='-44871' />
+ <nd ref='-44869' />
+ <nd ref='-38719' />
+ <nd ref='-39033' />
+ <nd ref='-44867' />
+ <nd ref='-44865' />
+ <nd ref='-44863' />
+ <nd ref='-44861' />
+ <nd ref='-44859' />
+ <nd ref='-44857' />
+ <nd ref='-38717' />
+ <nd ref='-44855' />
+ <nd ref='-44853' />
+ <nd ref='-38715' />
+ <nd ref='-44851' />
+ <nd ref='-44849' />
+ <nd ref='-44847' />
+ <nd ref='-44845' />
+ <nd ref='-44841' />
+ <nd ref='-44843' />
+ <nd ref='-38713' />
+ <nd ref='-44839' />
+ <nd ref='-44837' />
+ <nd ref='-44835' />
+ <nd ref='-44833' />
+ <nd ref='-44829' />
+ <nd ref='-44831' />
+ <nd ref='-38711' />
+ <nd ref='-44825' />
+ <nd ref='-44823' />
+ <nd ref='-44821' />
+ <nd ref='-44827' />
+ <nd ref='-44817' />
+ <nd ref='-44819' />
+ <nd ref='-38709' />
+ <nd ref='-44815' />
+ <nd ref='-44813' />
+ <nd ref='-44809' />
+ <nd ref='-44811' />
+ <nd ref='-39035' />
+ <nd ref='-44807' />
+ <nd ref='-39037' />
+ <nd ref='-38707' />
+ <nd ref='-38705' />
+ <nd ref='-39039' />
+ <nd ref='-44805' />
+ <nd ref='-44803' />
+ <nd ref='-44801' />
+ <nd ref='-44799' />
+ <nd ref='-44797' />
+ <nd ref='-44773' />
+ <nd ref='-44785' />
+ <nd ref='-44787' />
+ <nd ref='-44795' />
+ <nd ref='-44793' />
+ <nd ref='-44791' />
+ <nd ref='-44789' />
+ <nd ref='-44783' />
+ <nd ref='-44781' />
+ <nd ref='-44779' />
+ <nd ref='-44777' />
+ <nd ref='-44775' />
+ <nd ref='-38703' />
+ <nd ref='-44605' />
+ <nd ref='-44609' />
+ <nd ref='-44607' />
+ <nd ref='-39041' />
+ <nd ref='-39043' />
+ <nd ref='-39045' />
+ <nd ref='-39047' />
+ <nd ref='-39049' />
+ <nd ref='-39051' />
+ <nd ref='-39053' />
+ <nd ref='-39055' />
+ <nd ref='-45381' />
+ <nd ref='-45383' />
+ <nd ref='-45377' />
+ <nd ref='-45375' />
+ <nd ref='-45379' />
+ <nd ref='-45365' />
+ <nd ref='-45369' />
+ <nd ref='-45367' />
+ <nd ref='-45371' />
+ <nd ref='-45373' />
+ <nd ref='-39057' />
+ <nd ref='-39059' />
+ <nd ref='-45349' />
+ <nd ref='-45359' />
+ <nd ref='-45357' />
+ <nd ref='-45351' />
+ <nd ref='-45355' />
+ <nd ref='-45353' />
+ <nd ref='-45361' />
+ <nd ref='-45363' />
+ <nd ref='-39061' />
+ <nd ref='-39063' />
+ <nd ref='-39065' />
+ <nd ref='-45347' />
+ <nd ref='-39067' />
+ <nd ref='-39069' />
+ <nd ref='-39071' />
+ <nd ref='-39073' />
+ <nd ref='-45345' />
+ <nd ref='-45343' />
+ <nd ref='-39075' />
+ <nd ref='-45341' />
+ <nd ref='-45339' />
+ <nd ref='-45337' />
+ <nd ref='-39077' />
+ <nd ref='-39079' />
+ <nd ref='-45335' />
+ <nd ref='-45333' />
+ <nd ref='-39081' />
+ <nd ref='-45325' />
+ <nd ref='-45331' />
+ <nd ref='-45329' />
+ <nd ref='-45327' />
+ <nd ref='-45323' />
+ <nd ref='-45321' />
+ <nd ref='-45319' />
+ <nd ref='-45317' />
+ <nd ref='-45311' />
+ <nd ref='-45315' />
+ <nd ref='-45313' />
+ <nd ref='-45309' />
+ <nd ref='-45307' />
+ <nd ref='-45305' />
+ <nd ref='-45303' />
+ <nd ref='-45301' />
+ <nd ref='-45299' />
+ <nd ref='-45297' />
+ <nd ref='-45293' />
+ <nd ref='-45291' />
+ <nd ref='-45289' />
+ <nd ref='-45287' />
+ <nd ref='-45295' />
+ <nd ref='-45285' />
+ <nd ref='-45283' />
+ <nd ref='-45281' />
+ <nd ref='-45279' />
+ <nd ref='-45277' />
+ <nd ref='-45275' />
+ <nd ref='-45273' />
+ <nd ref='-45271' />
+ <nd ref='-39083' />
+ <nd ref='-45269' />
+ <nd ref='-45267' />
+ <nd ref='-45265' />
+ <nd ref='-45263' />
+ <nd ref='-45261' />
+ <nd ref='-45259' />
+ <nd ref='-45257' />
+ <nd ref='-39085' />
+ <nd ref='-39087' />
+ <nd ref='-39089' />
+ <nd ref='-40827' />
+ <nd ref='-39091' />
+ <nd ref='-40825' />
+ <nd ref='-40823' />
+ <nd ref='-39093' />
+ <nd ref='-45021' />
+ <nd ref='-39095' />
+ <nd ref='-40821' />
+ <nd ref='-45023' />
+ <nd ref='-45025' />
+ <nd ref='-40819' />
+ <nd ref='-39097' />
+ <nd ref='-39099' />
+ <nd ref='-39101' />
+ <nd ref='-39103' />
+ <nd ref='-45027' />
+ <nd ref='-39105' />
+ <nd ref='-39107' />
+ <nd ref='-45029' />
+ <nd ref='-39109' />
+ <nd ref='-45047' />
+ <nd ref='-45049' />
+ <nd ref='-45041' />
+ <nd ref='-45045' />
+ <nd ref='-45043' />
+ <nd ref='-45031' />
+ <nd ref='-45039' />
+ <nd ref='-45035' />
+ <nd ref='-45037' />
+ <nd ref='-45033' />
+ <nd ref='-39111' />
+ <nd ref='-45063' />
+ <nd ref='-45061' />
+ <nd ref='-45059' />
+ <nd ref='-45057' />
+ <nd ref='-45051' />
+ <nd ref='-45053' />
+ <nd ref='-45055' />
+ <nd ref='-40817' />
+ <nd ref='-45065' />
+ <nd ref='-45069' />
+ <nd ref='-45067' />
+ <nd ref='-40815' />
+ <nd ref='-39113' />
+ <nd ref='-45073' />
+ <nd ref='-45071' />
+ <nd ref='-39115' />
+ <nd ref='-45075' />
+ <nd ref='-39117' />
+ <nd ref='-39119' />
+ <nd ref='-40813' />
+ <nd ref='-45085' />
+ <nd ref='-45083' />
+ <nd ref='-45081' />
+ <nd ref='-45079' />
+ <nd ref='-45077' />
+ <nd ref='-39121' />
+ <nd ref='-39123' />
+ <nd ref='-45091' />
+ <nd ref='-45089' />
+ <nd ref='-45087' />
+ <nd ref='-39125' />
+ <nd ref='-40811' />
+ <nd ref='-45095' />
+ <nd ref='-45093' />
+ <nd ref='-40809' />
+ <nd ref='-40807' />
+ <nd ref='-39127' />
+ <nd ref='-39129' />
+ <nd ref='-39131' />
+ <nd ref='-40805' />
+ <nd ref='-40803' />
+ <nd ref='-39133' />
+ <nd ref='-39135' />
+ <nd ref='-40801' />
+ <nd ref='-39137' />
+ <nd ref='-39139' />
+ <nd ref='-45097' />
+ <nd ref='-39141' />
+ <nd ref='-40799' />
+ <nd ref='-40797' />
+ <nd ref='-37503' />
+ <nd ref='-34603' />
+ <nd ref='-37501' />
+ <nd ref='-37499' />
+ <nd ref='-37497' />
+ <nd ref='-37495' />
+ <nd ref='-37493' />
+ <nd ref='-37491' />
+ <nd ref='-37489' />
+ <nd ref='-34595' />
+ <nd ref='-34593' />
+ <nd ref='-34601' />
+ <nd ref='-34599' />
+ <nd ref='-34597' />
+ <nd ref='-34591' />
+ <nd ref='-37487' />
+ <nd ref='-37485' />
+ <nd ref='-37483' />
+ <nd ref='-34589' />
+ <nd ref='-34587' />
+ <nd ref='-37481' />
+ <nd ref='-34585' />
+ <nd ref='-34583' />
+ <nd ref='-37479' />
+ <nd ref='-37477' />
+ <nd ref='-34581' />
+ <nd ref='-34579' />
+ <nd ref='-37475' />
+ <nd ref='-37473' />
+ <nd ref='-37471' />
+ <nd ref='-37469' />
+ <nd ref='-37467' />
+ <nd ref='-37465' />
+ <nd ref='-37463' />
+ <nd ref='-37461' />
+ <nd ref='-37459' />
+ <nd ref='-37457' />
+ <nd ref='-37455' />
+ <nd ref='-34577' />
+ <nd ref='-37453' />
+ <nd ref='-37451' />
+ <nd ref='-39143' />
+ <nd ref='-39145' />
+ <nd ref='-39147' />
+ <nd ref='-34483' />
+ <nd ref='-34485' />
+ <nd ref='-34487' />
+ <nd ref='-34489' />
+ <nd ref='-34491' />
+ <nd ref='-34493' />
+ <nd ref='-39149' />
+ <nd ref='-39151' />
+ <nd ref='-39153' />
+ <nd ref='-39155' />
+ <nd ref='-34495' />
+ <nd ref='-34497' />
+ <nd ref='-34499' />
+ <nd ref='-34501' />
+ <nd ref='-39157' />
+ <nd ref='-34503' />
+ <nd ref='-34505' />
+ <nd ref='-34507' />
+ <nd ref='-34509' />
+ <nd ref='-34517' />
+ <nd ref='-34515' />
+ <nd ref='-34511' />
+ <nd ref='-34513' />
+ <nd ref='-39159' />
+ <nd ref='-39161' />
+ <nd ref='-34519' />
+ <nd ref='-34521' />
+ <nd ref='-34523' />
+ <nd ref='-34541' />
+ <nd ref='-34537' />
+ <nd ref='-34539' />
+ <nd ref='-34535' />
+ <nd ref='-34533' />
+ <nd ref='-34531' />
+ <nd ref='-34529' />
+ <nd ref='-34527' />
+ <nd ref='-34525' />
+ <nd ref='-39163' />
+ <nd ref='-34547' />
+ <nd ref='-34545' />
+ <nd ref='-34543' />
+ <nd ref='-34555' />
+ <nd ref='-34557' />
+ <nd ref='-34553' />
+ <nd ref='-34551' />
+ <nd ref='-34549' />
+ <nd ref='-34563' />
+ <nd ref='-34561' />
+ <nd ref='-34559' />
+ <nd ref='-39165' />
+ <nd ref='-34565' />
+ <nd ref='-34567' />
+ <nd ref='-39167' />
+ <nd ref='-34569' />
+ <nd ref='-39169' />
+ <nd ref='-39171' />
+ <nd ref='-34571' />
+ <nd ref='-34573' />
+ <nd ref='-34575' />
+ <nd ref='-39173' />
+ <nd ref='-39175' />
+ <nd ref='-39177' />
+ <nd ref='-39179' />
+ <nd ref='-39181' />
+ <nd ref='-39183' />
+ <nd ref='-39185' />
+ <nd ref='-39205' />
+ <nd ref='-39187' />
+ <nd ref='-42879' />
+ <nd ref='-42881' />
+ <nd ref='-42883' />
+ <nd ref='-42885' />
+ <nd ref='-38985' />
+ <nd ref='-38987' />
+ <nd ref='-38989' />
+ <nd ref='-38991' />
+ <nd ref='-42875' />
+ <nd ref='-42877' />
+ <nd ref='-38993' />
+ <nd ref='-38995' />
+ <nd ref='-38997' />
+ <nd ref='-42873' />
+ <nd ref='-42871' />
+ <nd ref='-42869' />
+ <nd ref='-42867' />
+ <nd ref='-42865' />
+ <nd ref='-38999' />
+ <nd ref='-39001' />
+ <nd ref='-42863' />
+ <nd ref='-39003' />
+ <nd ref='-42861' />
+ <nd ref='-42887' />
+ <nd ref='-38983' />
+ <nd ref='-46437' />
+ <nd ref='-46441' />
+ <nd ref='-46439' />
+ <nd ref='-46443' />
+ <nd ref='-43051' />
+ <nd ref='-41635' />
+ <nd ref='-46445' />
+ <nd ref='-46447' />
+ <nd ref='-46451' />
+ <nd ref='-46449' />
+ <nd ref='-46429' />
+ <nd ref='-46431' />
+ <nd ref='-46433' />
+ <nd ref='-46435' />
+ <nd ref='-46427' />
+ <nd ref='-46425' />
+ <nd ref='-46423' />
+ <nd ref='-46421' />
+ <nd ref='-46419' />
+ <nd ref='-46417' />
+ <nd ref='-46415' />
+ <nd ref='-46411' />
+ <nd ref='-46413' />
+ <nd ref='-46409' />
+ <nd ref='-46405' />
+ <nd ref='-46407' />
+ <nd ref='-46345' />
+ <nd ref='-46349' />
+ <nd ref='-46347' />
+ <nd ref='-46353' />
+ <nd ref='-46355' />
+ <nd ref='-46357' />
+ <nd ref='-46351' />
+ <nd ref='-46343' />
+ <nd ref='-46377' />
+ <nd ref='-46379' />
+ <nd ref='-46381' />
+ <nd ref='-46383' />
+ <nd ref='-46375' />
+ <nd ref='-46373' />
+ <nd ref='-46371' />
+ <nd ref='-46369' />
+ <nd ref='-46367' />
+ <nd ref='-46365' />
+ <nd ref='-46363' />
+ <nd ref='-46361' />
+ <nd ref='-46389' />
+ <nd ref='-46387' />
+ <nd ref='-46385' />
+ <nd ref='-46391' />
+ <nd ref='-46359' />
+ <nd ref='-46399' />
+ <nd ref='-46401' />
+ <nd ref='-46397' />
+ <nd ref='-46395' />
+ <nd ref='-46393' />
+ <nd ref='-46403' />
+ <nd ref='-38975' />
+ <nd ref='-46317' />
+ <nd ref='-46313' />
+ <nd ref='-46315' />
+ <nd ref='-46311' />
+ <nd ref='-46319' />
+ <nd ref='-46309' />
+ <nd ref='-46307' />
+ <nd ref='-46321' />
+ <nd ref='-46323' />
+ <nd ref='-46337' />
+ <nd ref='-46335' />
+ <nd ref='-46325' />
+ <nd ref='-46333' />
+ <nd ref='-46331' />
+ <nd ref='-46327' />
+ <nd ref='-46329' />
+ <nd ref='-46305' />
+ <nd ref='-46303' />
+ <nd ref='-46283' />
+ <nd ref='-46285' />
+ <nd ref='-46287' />
+ <nd ref='-46289' />
+ <nd ref='-46341' />
+ <nd ref='-46339' />
+ <nd ref='-46291' />
+ <nd ref='-46293' />
+ <nd ref='-46301' />
+ <nd ref='-46299' />
+ <nd ref='-46297' />
+ <nd ref='-46295' />
+ <nd ref='-46277' />
+ <nd ref='-46281' />
+ <nd ref='-46279' />
+ <nd ref='-46275' />
+ <nd ref='-46241' />
+ <nd ref='-46255' />
+ <nd ref='-46273' />
+ <nd ref='-46253' />
+ <nd ref='-46271' />
+ <nd ref='-46243' />
+ <nd ref='-46251' />
+ <nd ref='-46265' />
+ <nd ref='-46263' />
+ <nd ref='-46261' />
+ <nd ref='-46259' />
+ <nd ref='-46249' />
+ <nd ref='-46245' />
+ <nd ref='-46269' />
+ <nd ref='-46267' />
+ <nd ref='-46247' />
+ <nd ref='-46257' />
+ <nd ref='-46179' />
+ <nd ref='-46181' />
+ <nd ref='-46187' />
+ <nd ref='-46185' />
+ <nd ref='-46189' />
+ <nd ref='-46183' />
+ <nd ref='-46211' />
+ <nd ref='-46213' />
+ <nd ref='-46209' />
+ <nd ref='-46215' />
+ <nd ref='-46217' />
+ <nd ref='-46219' />
+ <nd ref='-46207' />
+ <nd ref='-46221' />
+ <nd ref='-46223' />
+ <nd ref='-46225' />
+ <nd ref='-46227' />
+ <nd ref='-46237' />
+ <nd ref='-46239' />
+ <nd ref='-46191' />
+ <nd ref='-46229' />
+ <nd ref='-46231' />
+ <nd ref='-46205' />
+ <nd ref='-46203' />
+ <nd ref='-46235' />
+ <nd ref='-46233' />
+ <nd ref='-46201' />
+ <nd ref='-46199' />
+ <nd ref='-46197' />
+ <nd ref='-46195' />
+ <nd ref='-46193' />
+ <nd ref='-46091' />
+ <nd ref='-46169' />
+ <nd ref='-46171' />
+ <nd ref='-46173' />
+ <nd ref='-46175' />
+ <nd ref='-46177' />
+ <nd ref='-46167' />
+ <nd ref='-46165' />
+ <nd ref='-46157' />
+ <nd ref='-46159' />
+ <nd ref='-46163' />
+ <nd ref='-46161' />
+ <nd ref='-46127' />
+ <nd ref='-46139' />
+ <nd ref='-46137' />
+ <nd ref='-46135' />
+ <nd ref='-46133' />
+ <nd ref='-46131' />
+ <nd ref='-46129' />
+ <nd ref='-46153' />
+ <nd ref='-46141' />
+ <nd ref='-46155' />
+ <nd ref='-46143' />
+ <nd ref='-46145' />
+ <nd ref='-46149' />
+ <nd ref='-46147' />
+ <nd ref='-46151' />
+ <nd ref='-46093' />
+ <nd ref='-46125' />
+ <nd ref='-46123' />
+ <nd ref='-46121' />
+ <nd ref='-46119' />
+ <nd ref='-46103' />
+ <nd ref='-46105' />
+ <nd ref='-46107' />
+ <nd ref='-46109' />
+ <nd ref='-46111' />
+ <nd ref='-46113' />
+ <nd ref='-46117' />
+ <nd ref='-46115' />
+ <nd ref='-46095' />
+ <nd ref='-46097' />
+ <nd ref='-46099' />
+ <nd ref='-46101' />
+ <nd ref='-39005' />
+ <nd ref='-46057' />
+ <nd ref='-46063' />
+ <nd ref='-46061' />
+ <nd ref='-46067' />
+ <nd ref='-46071' />
+ <nd ref='-46069' />
+ <nd ref='-46065' />
+ <nd ref='-46059' />
+ <nd ref='-46077' />
+ <nd ref='-46075' />
+ <nd ref='-46073' />
+ <nd ref='-46089' />
+ <nd ref='-46087' />
+ <nd ref='-46085' />
+ <nd ref='-46083' />
+ <nd ref='-46081' />
+ <nd ref='-46079' />
+ <nd ref='-46055' />
+ <nd ref='-37245' />
+ <nd ref='-46033' />
+ <nd ref='-46035' />
+ <nd ref='-46043' />
+ <nd ref='-46045' />
+ <nd ref='-46041' />
+ <nd ref='-46037' />
+ <nd ref='-46039' />
+ <nd ref='-46047' />
+ <nd ref='-46049' />
+ <nd ref='-46051' />
+ <nd ref='-46053' />
+ <nd ref='-46031' />
+ <nd ref='-46029' />
+ <nd ref='-46027' />
+ <nd ref='-46025' />
+ <nd ref='-46023' />
+ <nd ref='-37243' />
+ <nd ref='-46013' />
+ <nd ref='-46017' />
+ <nd ref='-46015' />
+ <nd ref='-46019' />
+ <nd ref='-46021' />
+ <nd ref='-45997' />
+ <nd ref='-45999' />
+ <nd ref='-46001' />
+ <nd ref='-46011' />
+ <nd ref='-46009' />
+ <nd ref='-46003' />
+ <nd ref='-46007' />
+ <nd ref='-46005' />
+ <nd ref='-45991' />
+ <nd ref='-45987' />
+ <nd ref='-45993' />
+ <nd ref='-45995' />
+ <nd ref='-45989' />
+ <nd ref='-45985' />
+ <nd ref='-45983' />
+ <nd ref='-45981' />
+ <nd ref='-45975' />
+ <nd ref='-45979' />
+ <nd ref='-45977' />
+ <nd ref='-45973' />
+ <nd ref='-45909' />
+ <nd ref='-45917' />
+ <nd ref='-45921' />
+ <nd ref='-45919' />
+ <nd ref='-45923' />
+ <nd ref='-45915' />
+ <nd ref='-45953' />
+ <nd ref='-45951' />
+ <nd ref='-45949' />
+ <nd ref='-45943' />
+ <nd ref='-45947' />
+ <nd ref='-45945' />
+ <nd ref='-45939' />
+ <nd ref='-45941' />
+ <nd ref='-45971' />
+ <nd ref='-45937' />
+ <nd ref='-45969' />
+ <nd ref='-45965' />
+ <nd ref='-45967' />
+ <nd ref='-45961' />
+ <nd ref='-45963' />
+ <nd ref='-45913' />
+ <nd ref='-45959' />
+ <nd ref='-45955' />
+ <nd ref='-45957' />
+ <nd ref='-45931' />
+ <nd ref='-45933' />
+ <nd ref='-45935' />
+ <nd ref='-45929' />
+ <nd ref='-45925' />
+ <nd ref='-45927' />
+ <nd ref='-45911' />
+ <nd ref='-37241' />
+ <nd ref='-45849' />
+ <nd ref='-45851' />
+ <nd ref='-45853' />
+ <nd ref='-45857' />
+ <nd ref='-45855' />
+ <nd ref='-45859' />
+ <nd ref='-45907' />
+ <nd ref='-45905' />
+ <nd ref='-45903' />
+ <nd ref='-45901' />
+ <nd ref='-45899' />
+ <nd ref='-45897' />
+ <nd ref='-45895' />
+ <nd ref='-45893' />
+ <nd ref='-45887' />
+ <nd ref='-45889' />
+ <nd ref='-45891' />
+ <nd ref='-45885' />
+ <nd ref='-45883' />
+ <nd ref='-45881' />
+ <nd ref='-45879' />
+ <nd ref='-45877' />
+ <nd ref='-45875' />
+ <nd ref='-45873' />
+ <nd ref='-45861' />
+ <nd ref='-45863' />
+ <nd ref='-45871' />
+ <nd ref='-45869' />
+ <nd ref='-45867' />
+ <nd ref='-45865' />
+ <nd ref='-37239' />
+ <nd ref='-45771' />
+ <nd ref='-45773' />
+ <nd ref='-45775' />
+ <nd ref='-45777' />
+ <nd ref='-45779' />
+ <nd ref='-45781' />
+ <nd ref='-45821' />
+ <nd ref='-45825' />
+ <nd ref='-45823' />
+ <nd ref='-45833' />
+ <nd ref='-45831' />
+ <nd ref='-45829' />
+ <nd ref='-45827' />
+ <nd ref='-45835' />
+ <nd ref='-45837' />
+ <nd ref='-45839' />
+ <nd ref='-45841' />
+ <nd ref='-45843' />
+ <nd ref='-45847' />
+ <nd ref='-45845' />
+ <nd ref='-45819' />
+ <nd ref='-45817' />
+ <nd ref='-45815' />
+ <nd ref='-45813' />
+ <nd ref='-45811' />
+ <nd ref='-45809' />
+ <nd ref='-45807' />
+ <nd ref='-45805' />
+ <nd ref='-45803' />
+ <nd ref='-45801' />
+ <nd ref='-45799' />
+ <nd ref='-45795' />
+ <nd ref='-45797' />
+ <nd ref='-45793' />
+ <nd ref='-45791' />
+ <nd ref='-45789' />
+ <nd ref='-45787' />
+ <nd ref='-45785' />
+ <nd ref='-45783' />
+ <nd ref='-37237' />
+ <nd ref='-39007' />
+ <nd ref='-39009' />
+ <nd ref='-39011' />
+ <nd ref='-44951' />
+ <nd ref='-38687' />
+ <nd ref='-44949' />
+ <nd ref='-39013' />
+ <nd ref='-44947' />
+ <nd ref='-38685' />
+ <nd ref='-39015' />
+ <nd ref='-44945' />
+ <nd ref='-39017' />
+ <nd ref='-39019' />
+ <nd ref='-39021' />
+ <nd ref='-38683' />
+ <nd ref='-38681' />
+ <nd ref='-38679' />
+ <nd ref='-44943' />
+ <nd ref='-38677' />
+ <nd ref='-44941' />
+ <nd ref='-39023' />
+ <nd ref='-39025' />
+ </way>
+ <way id='-57563'>
+ <nd ref='-39189' />
+ <nd ref='-39561' />
+ <nd ref='-34353' />
+ <nd ref='-34355' />
+ <nd ref='-34357' />
+ <nd ref='-34359' />
+ <nd ref='-34351' />
+ <nd ref='-34361' />
+ <nd ref='-39191' />
+ <nd ref='-34365' />
+ <nd ref='-34363' />
+ <nd ref='-39193' />
+ <nd ref='-39195' />
+ <nd ref='-39197' />
+ <nd ref='-34373' />
+ <nd ref='-34371' />
+ <nd ref='-34369' />
+ <nd ref='-34367' />
+ <nd ref='-39199' />
+ <nd ref='-39201' />
+ <nd ref='-42353' />
+ <nd ref='-39189' />
+ <tag k='ISO3166-1:alpha2' v='DJ' />
+ <tag k='name:en' v='Djibouti' />
+ </way>
+ <way id='-57565'>
+ <nd ref='-39611' />
+ <nd ref='-39619' />
+ <nd ref='-39617' />
+ <nd ref='-39615' />
+ <nd ref='-39613' />
+ <nd ref='-39611' />
+ <tag k='ISO3166-1:alpha2' v='DM' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Dominica' />
+ </way>
+ <way id='-57567'>
+ <nd ref='-43037' />
+ <nd ref='-41995' />
+ <nd ref='-39203' />
+ <nd ref='-41993' />
+ <nd ref='-41991' />
+ <nd ref='-41989' />
+ <nd ref='-41987' />
+ <nd ref='-41985' />
+ <nd ref='-43039' />
+ <nd ref='-42889' />
+ <nd ref='-42891' />
+ <nd ref='-42887' />
+ <nd ref='-42861' />
+ <nd ref='-39003' />
+ <nd ref='-42863' />
+ <nd ref='-39001' />
+ <nd ref='-38999' />
+ <nd ref='-42865' />
+ <nd ref='-42867' />
+ <nd ref='-42869' />
+ <nd ref='-42871' />
+ <nd ref='-42873' />
+ <nd ref='-38997' />
+ <nd ref='-38995' />
+ <nd ref='-38993' />
+ <nd ref='-42877' />
+ <nd ref='-42875' />
+ <nd ref='-38991' />
+ <nd ref='-38989' />
+ <nd ref='-38987' />
+ <nd ref='-38985' />
+ <nd ref='-42885' />
+ <nd ref='-42883' />
+ <nd ref='-42881' />
+ <nd ref='-42879' />
+ <nd ref='-39187' />
+ <nd ref='-39205' />
+ <nd ref='-39185' />
+ <nd ref='-39183' />
+ <nd ref='-39207' />
+ <nd ref='-39209' />
+ <nd ref='-43037' />
+ <tag k='name:en' v='Continental Denmark' />
+ </way>
+ <way id='-57569'>
+ <nd ref='-39211' />
+ <nd ref='-39213' />
+ <nd ref='-39215' />
+ <nd ref='-36431' />
+ <nd ref='-39217' />
+ <nd ref='-35799' />
+ <nd ref='-35801' />
+ <nd ref='-35803' />
+ <nd ref='-35793' />
+ <nd ref='-35795' />
+ <nd ref='-35797' />
+ <nd ref='-35789' />
+ <nd ref='-35791' />
+ <nd ref='-39219' />
+ <nd ref='-35781' />
+ <nd ref='-35783' />
+ <nd ref='-35779' />
+ <nd ref='-35785' />
+ <nd ref='-35777' />
+ <nd ref='-35787' />
+ <nd ref='-35775' />
+ <nd ref='-35773' />
+ <nd ref='-36429' />
+ <nd ref='-39221' />
+ <nd ref='-36427' />
+ <nd ref='-39211' />
+ <tag k='ISO3166-1:alpha2' v='DO' />
+ <tag k='name:en' v='Dominican Republic' />
+ </way>
+ <way id='-57571'>
+ <nd ref='-42215' />
+ <nd ref='-42213' />
+ <nd ref='-34147' />
+ <nd ref='-34145' />
+ <nd ref='-34149' />
+ <nd ref='-34151' />
+ <nd ref='-34153' />
+ <nd ref='-34155' />
+ <nd ref='-34141' />
+ <nd ref='-34143' />
+ <nd ref='-34139' />
+ <nd ref='-39223' />
+ <nd ref='-34137' />
+ <nd ref='-34135' />
+ <nd ref='-39225' />
+ <nd ref='-42211' />
+ <nd ref='-34129' />
+ <nd ref='-34127' />
+ <nd ref='-34131' />
+ <nd ref='-34133' />
+ <nd ref='-39227' />
+ <nd ref='-42209' />
+ <nd ref='-34125' />
+ <nd ref='-42207' />
+ <nd ref='-42205' />
+ <nd ref='-39229' />
+ <nd ref='-34123' />
+ <nd ref='-42203' />
+ <nd ref='-34119' />
+ <nd ref='-34117' />
+ <nd ref='-34121' />
+ <nd ref='-39231' />
+ <nd ref='-39233' />
+ <nd ref='-42201' />
+ <nd ref='-42199' />
+ <nd ref='-39235' />
+ <nd ref='-34099' />
+ <nd ref='-34097' />
+ <nd ref='-34083' />
+ <nd ref='-34095' />
+ <nd ref='-34093' />
+ <nd ref='-34091' />
+ <nd ref='-34089' />
+ <nd ref='-34087' />
+ <nd ref='-34085' />
+ <nd ref='-34101' />
+ <nd ref='-39237' />
+ <nd ref='-39239' />
+ <nd ref='-39241' />
+ <nd ref='-39243' />
+ <nd ref='-39245' />
+ <nd ref='-34081' />
+ <nd ref='-34079' />
+ <nd ref='-34077' />
+ <nd ref='-34075' />
+ <nd ref='-39247' />
+ <nd ref='-39249' />
+ <nd ref='-41785' />
+ <nd ref='-39251' />
+ <nd ref='-39253' />
+ <nd ref='-45129' />
+ <nd ref='-39255' />
+ <nd ref='-40925' />
+ <nd ref='-39257' />
+ <nd ref='-39259' />
+ <nd ref='-40923' />
+ <nd ref='-39261' />
+ <nd ref='-40921' />
+ <nd ref='-40919' />
+ <nd ref='-45127' />
+ <nd ref='-39263' />
+ <nd ref='-39265' />
+ <nd ref='-45125' />
+ <nd ref='-45123' />
+ <nd ref='-45121' />
+ <nd ref='-45119' />
+ <nd ref='-39267' />
+ <nd ref='-40917' />
+ <nd ref='-40915' />
+ <nd ref='-39269' />
+ <nd ref='-40913' />
+ <nd ref='-45115' />
+ <nd ref='-45117' />
+ <nd ref='-45113' />
+ <nd ref='-39271' />
+ <nd ref='-39273' />
+ <nd ref='-39275' />
+ <nd ref='-45111' />
+ <nd ref='-40911' />
+ <nd ref='-45109' />
+ <nd ref='-45107' />
+ <nd ref='-39277' />
+ <nd ref='-39279' />
+ <nd ref='-39281' />
+ <nd ref='-40909' />
+ <nd ref='-40907' />
+ <nd ref='-45103' />
+ <nd ref='-45105' />
+ <nd ref='-45101' />
+ <nd ref='-45099' />
+ <nd ref='-40905' />
+ <nd ref='-40903' />
+ <nd ref='-36471' />
+ <nd ref='-42215' />
+ <tag k='ISO3166-1:alpha2' v='DZ' />
+ <tag k='name:en' v='Algeria' />
+ </way>
+ <way id='-57573'>
+ <nd ref='-39283' />
+ <nd ref='-35865' />
+ <nd ref='-35863' />
+ <nd ref='-35855' />
+ <nd ref='-35853' />
+ <nd ref='-35857' />
+ <nd ref='-35851' />
+ <nd ref='-39285' />
+ <nd ref='-39287' />
+ <nd ref='-39289' />
+ <nd ref='-39291' />
+ <nd ref='-39293' />
+ <nd ref='-35843' />
+ <nd ref='-35837' />
+ <nd ref='-35839' />
+ <nd ref='-35845' />
+ <nd ref='-35847' />
+ <nd ref='-35841' />
+ <nd ref='-35849' />
+ <nd ref='-39295' />
+ <nd ref='-35835' />
+ <nd ref='-35833' />
+ <nd ref='-35829' />
+ <nd ref='-35831' />
+ <nd ref='-35827' />
+ <nd ref='-35825' />
+ <nd ref='-35823' />
+ <nd ref='-35821' />
+ <nd ref='-35819' />
+ <nd ref='-35817' />
+ <nd ref='-35815' />
+ <nd ref='-39297' />
+ <nd ref='-39299' />
+ <nd ref='-39301' />
+ <nd ref='-36805' />
+ <nd ref='-36807' />
+ <nd ref='-38861' />
+ <nd ref='-35879' />
+ <nd ref='-35875' />
+ <nd ref='-35877' />
+ <nd ref='-35873' />
+ <nd ref='-35871' />
+ <nd ref='-35869' />
+ <nd ref='-35867' />
+ <nd ref='-39283' />
+ <tag k='ISO3166-1:alpha2' v='EC' />
+ <tag k='name:en' v='Ecuador' />
+ </way>
+ <way id='-57575'>
+ <nd ref='-40331' />
+ <nd ref='-53713' />
+ <nd ref='-39303' />
+ <nd ref='-39305' />
+ <nd ref='-53723' />
+ <nd ref='-40377' />
+ <nd ref='-40375' />
+ <nd ref='-41831' />
+ <nd ref='-36317' />
+ <nd ref='-41845' />
+ <nd ref='-53901' />
+ <nd ref='-53899' />
+ <nd ref='-40751' />
+ <nd ref='-39307' />
+ <nd ref='-35021' />
+ <nd ref='-35019' />
+ <nd ref='-35017' />
+ <nd ref='-39309' />
+ <nd ref='-39311' />
+ <nd ref='-40749' />
+ <nd ref='-40331' />
+ <tag k='ISO3166-1:alpha2' v='EG' />
+ <tag k='name:en' v='Egypt, Arab Rep.' />
+ </way>
+ <way id='-57577'>
+ <nd ref='-39313' />
+ <nd ref='-39315' />
+ <nd ref='-39317' />
+ <nd ref='-39199' />
+ <nd ref='-34367' />
+ <nd ref='-34369' />
+ <nd ref='-34371' />
+ <nd ref='-34373' />
+ <nd ref='-39197' />
+ <nd ref='-48535' />
+ <nd ref='-48533' />
+ <nd ref='-48531' />
+ <nd ref='-48529' />
+ <nd ref='-48521' />
+ <nd ref='-48527' />
+ <nd ref='-48525' />
+ <nd ref='-48523' />
+ <nd ref='-48477' />
+ <nd ref='-48501' />
+ <nd ref='-48499' />
+ <nd ref='-48509' />
+ <nd ref='-48507' />
+ <nd ref='-48505' />
+ <nd ref='-48503' />
+ <nd ref='-48511' />
+ <nd ref='-48513' />
+ <nd ref='-48515' />
+ <nd ref='-48517' />
+ <nd ref='-48519' />
+ <nd ref='-48497' />
+ <nd ref='-48495' />
+ <nd ref='-48493' />
+ <nd ref='-48491' />
+ <nd ref='-48489' />
+ <nd ref='-48487' />
+ <nd ref='-48479' />
+ <nd ref='-48485' />
+ <nd ref='-48481' />
+ <nd ref='-48483' />
+ <nd ref='-48455' />
+ <nd ref='-48457' />
+ <nd ref='-48465' />
+ <nd ref='-48463' />
+ <nd ref='-48461' />
+ <nd ref='-48459' />
+ <nd ref='-48467' />
+ <nd ref='-48469' />
+ <nd ref='-48471' />
+ <nd ref='-48473' />
+ <nd ref='-48475' />
+ <nd ref='-39319' />
+ <nd ref='-39321' />
+ <nd ref='-48439' />
+ <nd ref='-48441' />
+ <nd ref='-48443' />
+ <nd ref='-48449' />
+ <nd ref='-48445' />
+ <nd ref='-48447' />
+ <nd ref='-48451' />
+ <nd ref='-48453' />
+ <nd ref='-39323' />
+ <nd ref='-39325' />
+ <nd ref='-36315' />
+ <nd ref='-39327' />
+ <nd ref='-39313' />
+ <tag k='ISO3166-1:alpha2' v='ER' />
+ <tag k='name:en' v='Eritrea' />
+ </way>
+ <way id='-57579'>
+ <nd ref='-39341' />
+ <nd ref='-39343' />
+ <nd ref='-39345' />
+ <nd ref='-39347' />
+ <nd ref='-39349' />
+ <nd ref='-44251' />
+ <nd ref='-44249' />
+ <nd ref='-39351' />
+ <nd ref='-44247' />
+ <nd ref='-39353' />
+ <nd ref='-39355' />
+ <nd ref='-39357' />
+ <nd ref='-39359' />
+ <nd ref='-39361' />
+ <nd ref='-39341' />
+ </way>
+ <way id='-57581'>
+ <nd ref='-43025' />
+ <nd ref='-43027' />
+ <nd ref='-39541' />
+ <nd ref='-39543' />
+ <nd ref='-35011' />
+ <nd ref='-35013' />
+ <nd ref='-35009' />
+ <nd ref='-35015' />
+ <nd ref='-35005' />
+ <nd ref='-35007' />
+ <nd ref='-39545' />
+ <nd ref='-39547' />
+ <nd ref='-39549' />
+ <nd ref='-35001' />
+ <nd ref='-34999' />
+ <nd ref='-35003' />
+ <nd ref='-39551' />
+ <nd ref='-34987' />
+ <nd ref='-34985' />
+ <nd ref='-34989' />
+ <nd ref='-34991' />
+ <nd ref='-34993' />
+ <nd ref='-34995' />
+ <nd ref='-34997' />
+ <nd ref='-39553' />
+ <nd ref='-34983' />
+ <nd ref='-34981' />
+ <nd ref='-34975' />
+ <nd ref='-34977' />
+ <nd ref='-34979' />
+ <nd ref='-34969' />
+ <nd ref='-34967' />
+ <nd ref='-34965' />
+ <nd ref='-34953' />
+ <nd ref='-34963' />
+ <nd ref='-34961' />
+ <nd ref='-34959' />
+ <nd ref='-34957' />
+ <nd ref='-34955' />
+ <nd ref='-34971' />
+ <nd ref='-34973' />
+ <nd ref='-34947' />
+ <nd ref='-34951' />
+ <nd ref='-34949' />
+ <nd ref='-39555' />
+ <nd ref='-39557' />
+ <nd ref='-39559' />
+ <nd ref='-40895' />
+ <nd ref='-43045' />
+ <nd ref='-43043' />
+ <nd ref='-43041' />
+ <nd ref='-43025' />
+ <tag k='ISO3166-1:alpha2' v='EE' />
+ <tag k='maxspeed:motorway' v='90' />
+ <tag k='maxspeed:rural' v='90' />
+ <tag k='maxspeed:source' v='http://ec.europa.eu/transport/road_safety/going_abroad/estonia/speed_limits_en.htm' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Estonia' />
+ </way>
+ <way id='-57583'>
+ <nd ref='-39197' />
+ <nd ref='-39195' />
+ <nd ref='-39193' />
+ <nd ref='-34363' />
+ <nd ref='-34365' />
+ <nd ref='-39191' />
+ <nd ref='-34361' />
+ <nd ref='-34351' />
+ <nd ref='-34359' />
+ <nd ref='-34357' />
+ <nd ref='-34355' />
+ <nd ref='-34353' />
+ <nd ref='-39561' />
+ <nd ref='-34165' />
+ <nd ref='-34163' />
+ <nd ref='-34161' />
+ <nd ref='-34159' />
+ <nd ref='-34157' />
+ <nd ref='-39563' />
+ <nd ref='-39565' />
+ <nd ref='-36311' />
+ <nd ref='-41931' />
+ <nd ref='-39567' />
+ <nd ref='-39569' />
+ <nd ref='-34173' />
+ <nd ref='-34169' />
+ <nd ref='-34167' />
+ <nd ref='-34171' />
+ <nd ref='-34175' />
+ <nd ref='-34177' />
+ <nd ref='-39571' />
+ <nd ref='-31081' />
+ <nd ref='-31103' />
+ <nd ref='-31101' />
+ <nd ref='-31097' />
+ <nd ref='-31099' />
+ <nd ref='-31095' />
+ <nd ref='-31093' />
+ <nd ref='-31091' />
+ <nd ref='-31083' />
+ <nd ref='-31085' />
+ <nd ref='-31087' />
+ <nd ref='-31089' />
+ <nd ref='-39573' />
+ <nd ref='-40599' />
+ <nd ref='-31105' />
+ <nd ref='-40597' />
+ <nd ref='-39575' />
+ <nd ref='-31107' />
+ <nd ref='-40595' />
+ <nd ref='-41855' />
+ <nd ref='-31109' />
+ <nd ref='-31111' />
+ <nd ref='-31113' />
+ <nd ref='-31115' />
+ <nd ref='-39577' />
+ <nd ref='-30895' />
+ <nd ref='-30893' />
+ <nd ref='-30899' />
+ <nd ref='-30897' />
+ <nd ref='-30907' />
+ <nd ref='-30901' />
+ <nd ref='-30905' />
+ <nd ref='-30903' />
+ <nd ref='-30909' />
+ <nd ref='-30889' />
+ <nd ref='-30887' />
+ <nd ref='-30881' />
+ <nd ref='-30883' />
+ <nd ref='-30885' />
+ <nd ref='-30891' />
+ <nd ref='-30877' />
+ <nd ref='-30879' />
+ <nd ref='-30875' />
+ <nd ref='-30869' />
+ <nd ref='-30871' />
+ <nd ref='-30873' />
+ <nd ref='-30867' />
+ <nd ref='-30911' />
+ <nd ref='-30863' />
+ <nd ref='-30861' />
+ <nd ref='-30859' />
+ <nd ref='-30857' />
+ <nd ref='-30865' />
+ <nd ref='-30849' />
+ <nd ref='-30847' />
+ <nd ref='-30853' />
+ <nd ref='-30851' />
+ <nd ref='-30845' />
+ <nd ref='-30841' />
+ <nd ref='-30843' />
+ <nd ref='-30855' />
+ <nd ref='-30839' />
+ <nd ref='-39579' />
+ <nd ref='-30961' />
+ <nd ref='-30957' />
+ <nd ref='-30959' />
+ <nd ref='-30967' />
+ <nd ref='-30963' />
+ <nd ref='-30965' />
+ <nd ref='-30971' />
+ <nd ref='-30969' />
+ <nd ref='-30955' />
+ <nd ref='-30951' />
+ <nd ref='-30943' />
+ <nd ref='-30941' />
+ <nd ref='-30945' />
+ <nd ref='-30947' />
+ <nd ref='-30949' />
+ <nd ref='-30953' />
+ <nd ref='-30973' />
+ <nd ref='-30935' />
+ <nd ref='-30933' />
+ <nd ref='-30931' />
+ <nd ref='-30929' />
+ <nd ref='-30937' />
+ <nd ref='-30939' />
+ <nd ref='-30923' />
+ <nd ref='-30925' />
+ <nd ref='-30921' />
+ <nd ref='-30919' />
+ <nd ref='-30927' />
+ <nd ref='-30915' />
+ <nd ref='-30917' />
+ <nd ref='-30913' />
+ <nd ref='-39319' />
+ <nd ref='-48475' />
+ <nd ref='-48473' />
+ <nd ref='-48471' />
+ <nd ref='-48469' />
+ <nd ref='-48467' />
+ <nd ref='-48459' />
+ <nd ref='-48461' />
+ <nd ref='-48463' />
+ <nd ref='-48465' />
+ <nd ref='-48457' />
+ <nd ref='-48455' />
+ <nd ref='-48483' />
+ <nd ref='-48481' />
+ <nd ref='-48485' />
+ <nd ref='-48479' />
+ <nd ref='-48487' />
+ <nd ref='-48489' />
+ <nd ref='-48491' />
+ <nd ref='-48493' />
+ <nd ref='-48495' />
+ <nd ref='-48497' />
+ <nd ref='-48519' />
+ <nd ref='-48517' />
+ <nd ref='-48515' />
+ <nd ref='-48513' />
+ <nd ref='-48511' />
+ <nd ref='-48503' />
+ <nd ref='-48505' />
+ <nd ref='-48507' />
+ <nd ref='-48509' />
+ <nd ref='-48499' />
+ <nd ref='-48501' />
+ <nd ref='-48477' />
+ <nd ref='-48523' />
+ <nd ref='-48525' />
+ <nd ref='-48527' />
+ <nd ref='-48521' />
+ <nd ref='-48529' />
+ <nd ref='-48531' />
+ <nd ref='-48533' />
+ <nd ref='-48535' />
+ <nd ref='-39197' />
+ <tag k='ISO3166-1:alpha2' v='ET' />
+ <tag k='name:en' v='Ethiopia' />
+ </way>
+ <way id='-57585'>
+ <nd ref='-39581' />
+ <nd ref='-35355' />
+ <nd ref='-35357' />
+ <nd ref='-35359' />
+ <nd ref='-41521' />
+ <nd ref='-35329' />
+ <nd ref='-35327' />
+ <nd ref='-35325' />
+ <nd ref='-39583' />
+ <nd ref='-39585' />
+ <nd ref='-35297' />
+ <nd ref='-39587' />
+ <nd ref='-35295' />
+ <nd ref='-35293' />
+ <nd ref='-35289' />
+ <nd ref='-35291' />
+ <nd ref='-35287' />
+ <nd ref='-35285' />
+ <nd ref='-35283' />
+ <nd ref='-35281' />
+ <nd ref='-35279' />
+ <nd ref='-35277' />
+ <nd ref='-35275' />
+ <nd ref='-35273' />
+ <nd ref='-35271' />
+ <nd ref='-35269' />
+ <nd ref='-35267' />
+ <nd ref='-35265' />
+ <nd ref='-35263' />
+ <nd ref='-35261' />
+ <nd ref='-35259' />
+ <nd ref='-35255' />
+ <nd ref='-35257' />
+ <nd ref='-35253' />
+ <nd ref='-35251' />
+ <nd ref='-35249' />
+ <nd ref='-35247' />
+ <nd ref='-35245' />
+ <nd ref='-35239' />
+ <nd ref='-35241' />
+ <nd ref='-35243' />
+ <nd ref='-41775' />
+ <nd ref='-43021' />
+ <nd ref='-43023' />
+ <nd ref='-43025' />
+ <nd ref='-43041' />
+ <nd ref='-43019' />
+ <nd ref='-53539' />
+ <nd ref='-43017' />
+ <nd ref='-39589' />
+ <nd ref='-39591' />
+ <nd ref='-35179' />
+ <nd ref='-35181' />
+ <nd ref='-35189' />
+ <nd ref='-35187' />
+ <nd ref='-35183' />
+ <nd ref='-35185' />
+ <nd ref='-35191' />
+ <nd ref='-35193' />
+ <nd ref='-35195' />
+ <nd ref='-35197' />
+ <nd ref='-35199' />
+ <nd ref='-35201' />
+ <nd ref='-35207' />
+ <nd ref='-35205' />
+ <nd ref='-35203' />
+ <nd ref='-35215' />
+ <nd ref='-35209' />
+ <nd ref='-35211' />
+ <nd ref='-35213' />
+ <nd ref='-35217' />
+ <nd ref='-35219' />
+ <nd ref='-35221' />
+ <nd ref='-35223' />
+ <nd ref='-35225' />
+ <nd ref='-35227' />
+ <nd ref='-35229' />
+ <nd ref='-35231' />
+ <nd ref='-39593' />
+ <nd ref='-39595' />
+ <nd ref='-39597' />
+ <nd ref='-39599' />
+ <nd ref='-39601' />
+ <nd ref='-35233' />
+ <nd ref='-39603' />
+ <nd ref='-35299' />
+ <nd ref='-35237' />
+ <nd ref='-35235' />
+ <nd ref='-35301' />
+ <nd ref='-35303' />
+ <nd ref='-35305' />
+ <nd ref='-35307' />
+ <nd ref='-35309' />
+ <nd ref='-35311' />
+ <nd ref='-35313' />
+ <nd ref='-35315' />
+ <nd ref='-35317' />
+ <nd ref='-35319' />
+ <nd ref='-35321' />
+ <nd ref='-35323' />
+ <nd ref='-35331' />
+ <nd ref='-35333' />
+ <nd ref='-35335' />
+ <nd ref='-35337' />
+ <nd ref='-35339' />
+ <nd ref='-35341' />
+ <nd ref='-35345' />
+ <nd ref='-35343' />
+ <nd ref='-35347' />
+ <nd ref='-35349' />
+ <nd ref='-35351' />
+ <nd ref='-35353' />
+ <nd ref='-39581' />
+ <tag k='ISO3166-1:alpha2' v='FI' />
+ <tag k='maxspeed:rural' v='80' />
+ <tag k='maxspeed:source' v='http://ec.europa.eu/transport/road_safety/going_abroad/finland/speed_limits_en.htm' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Finland' />
+ </way>
+ <way id='-57587'>
+ <nd ref='-42493' />
+ <nd ref='-42479' />
+ <nd ref='-39605' />
+ <nd ref='-39607' />
+ <nd ref='-42475' />
+ <nd ref='-42493' />
+ <tag k='ISO3166-1:alpha2' v='NC' />
+ <tag k='ISO3166-2' v='FR-NC' />
+ <tag k='name:en' v='New Caledonia' />
+ </way>
+ <way id='-57589'>
+ <nd ref='-43493' />
+ <nd ref='-36409' />
+ <nd ref='-43481' />
+ <nd ref='-43483' />
+ <nd ref='-37901' />
+ <nd ref='-43485' />
+ <nd ref='-43489' />
+ <nd ref='-43487' />
+ <nd ref='-41963' />
+ <nd ref='-43491' />
+ <nd ref='-41961' />
+ <nd ref='-43479' />
+ <nd ref='-43477' />
+ <nd ref='-43475' />
+ <nd ref='-39609' />
+ <nd ref='-43473' />
+ <nd ref='-43471' />
+ <nd ref='-41969' />
+ <nd ref='-43493' />
+ <tag k='ISO3166-1:alpha2' v='GF' />
+ <tag k='ISO3166-2' v='FR-GF' />
+ <tag k='name:en' v='French Guiana' />
+ </way>
+ <way id='-57591'>
+ <nd ref='-40771' />
+ <nd ref='-40775' />
+ <nd ref='-39611' />
+ <nd ref='-39613' />
+ <nd ref='-40771' />
+ <tag k='ISO3166-1:alpha2' v='MQ' />
+ <tag k='ISO3166-2' v='FR-MQ' />
+ <tag k='name:en' v='Martinique' />
+ </way>
+ <way id='-57593'>
+ <nd ref='-39615' />
+ <nd ref='-39617' />
+ <nd ref='-39619' />
+ <nd ref='-39621' />
+ <nd ref='-36397' />
+ <nd ref='-36893' />
+ <nd ref='-36403' />
+ <nd ref='-39615' />
+ <tag k='ISO3166-1:alpha2' v='GP' />
+ <tag k='ISO3166-2' v='FR-GP' />
+ <tag k='name:en' v='Guadeloupe' />
+ </way>
+ <way id='-57595'>
+ <nd ref='-37551' />
+ <nd ref='-45131' />
+ <nd ref='-45137' />
+ <nd ref='-45135' />
+ <nd ref='-45133' />
+ <nd ref='-45139' />
+ <nd ref='-45141' />
+ <nd ref='-45143' />
+ <nd ref='-45145' />
+ <nd ref='-45147' />
+ <nd ref='-45149' />
+ <nd ref='-45151' />
+ <nd ref='-45153' />
+ <nd ref='-45159' />
+ <nd ref='-45157' />
+ <nd ref='-45155' />
+ <nd ref='-45161' />
+ <nd ref='-45163' />
+ <nd ref='-45165' />
+ <nd ref='-45167' />
+ <nd ref='-45169' />
+ <nd ref='-45171' />
+ <nd ref='-45173' />
+ <nd ref='-45175' />
+ <nd ref='-45177' />
+ <nd ref='-45179' />
+ <nd ref='-45181' />
+ <nd ref='-45183' />
+ <nd ref='-45185' />
+ <nd ref='-45187' />
+ <nd ref='-45189' />
+ <nd ref='-45191' />
+ <nd ref='-45193' />
+ <nd ref='-45195' />
+ <nd ref='-45197' />
+ <nd ref='-45199' />
+ <nd ref='-45201' />
+ <nd ref='-45203' />
+ <nd ref='-45205' />
+ <nd ref='-45207' />
+ <nd ref='-45209' />
+ <nd ref='-45211' />
+ <nd ref='-45213' />
+ <nd ref='-45215' />
+ <nd ref='-45217' />
+ <nd ref='-45219' />
+ <nd ref='-45221' />
+ <nd ref='-45223' />
+ <nd ref='-45225' />
+ <nd ref='-45227' />
+ <nd ref='-45229' />
+ <nd ref='-37549' />
+ <nd ref='-37547' />
+ <nd ref='-45253' />
+ <nd ref='-45255' />
+ <nd ref='-37545' />
+ <nd ref='-37543' />
+ <nd ref='-37541' />
+ <nd ref='-45231' />
+ <nd ref='-45233' />
+ <nd ref='-45245' />
+ <nd ref='-45239' />
+ <nd ref='-45237' />
+ <nd ref='-45243' />
+ <nd ref='-45241' />
+ <nd ref='-45235' />
+ <nd ref='-45247' />
+ <nd ref='-45249' />
+ <nd ref='-45251' />
+ <nd ref='-37539' />
+ <nd ref='-37537' />
+ <nd ref='-37535' />
+ <nd ref='-37533' />
+ <nd ref='-40841' />
+ <nd ref='-40839' />
+ <nd ref='-39631' />
+ <nd ref='-44995' />
+ <nd ref='-44997' />
+ <nd ref='-44999' />
+ <nd ref='-39633' />
+ <nd ref='-40837' />
+ <nd ref='-39635' />
+ <nd ref='-40835' />
+ <nd ref='-39637' />
+ <nd ref='-39639' />
+ <nd ref='-39641' />
+ <nd ref='-40833' />
+ <nd ref='-45001' />
+ <nd ref='-40831' />
+ <nd ref='-39643' />
+ <nd ref='-45005' />
+ <nd ref='-45003' />
+ <nd ref='-39645' />
+ <nd ref='-45007' />
+ <nd ref='-45009' />
+ <nd ref='-45011' />
+ <nd ref='-45013' />
+ <nd ref='-45015' />
+ <nd ref='-39647' />
+ <nd ref='-45017' />
+ <nd ref='-45019' />
+ <nd ref='-40829' />
+ <nd ref='-40827' />
+ <nd ref='-39089' />
+ <nd ref='-39087' />
+ <nd ref='-39085' />
+ <nd ref='-45257' />
+ <nd ref='-45259' />
+ <nd ref='-45261' />
+ <nd ref='-45263' />
+ <nd ref='-45265' />
+ <nd ref='-45267' />
+ <nd ref='-45269' />
+ <nd ref='-39083' />
+ <nd ref='-45271' />
+ <nd ref='-45273' />
+ <nd ref='-45275' />
+ <nd ref='-45277' />
+ <nd ref='-45279' />
+ <nd ref='-45281' />
+ <nd ref='-45283' />
+ <nd ref='-45285' />
+ <nd ref='-45295' />
+ <nd ref='-45287' />
+ <nd ref='-45289' />
+ <nd ref='-45291' />
+ <nd ref='-45293' />
+ <nd ref='-45297' />
+ <nd ref='-45299' />
+ <nd ref='-45301' />
+ <nd ref='-45303' />
+ <nd ref='-45305' />
+ <nd ref='-45307' />
+ <nd ref='-45309' />
+ <nd ref='-45313' />
+ <nd ref='-45315' />
+ <nd ref='-45311' />
+ <nd ref='-45317' />
+ <nd ref='-45319' />
+ <nd ref='-45321' />
+ <nd ref='-45323' />
+ <nd ref='-45327' />
+ <nd ref='-45329' />
+ <nd ref='-45331' />
+ <nd ref='-45325' />
+ <nd ref='-39081' />
+ <nd ref='-45333' />
+ <nd ref='-45335' />
+ <nd ref='-39079' />
+ <nd ref='-39077' />
+ <nd ref='-45337' />
+ <nd ref='-45339' />
+ <nd ref='-45341' />
+ <nd ref='-39075' />
+ <nd ref='-45343' />
+ <nd ref='-45345' />
+ <nd ref='-39073' />
+ <nd ref='-39071' />
+ <nd ref='-39069' />
+ <nd ref='-39067' />
+ <nd ref='-45347' />
+ <nd ref='-39065' />
+ <nd ref='-39063' />
+ <nd ref='-39061' />
+ <nd ref='-45363' />
+ <nd ref='-45361' />
+ <nd ref='-45353' />
+ <nd ref='-45355' />
+ <nd ref='-45351' />
+ <nd ref='-45357' />
+ <nd ref='-45359' />
+ <nd ref='-45349' />
+ <nd ref='-39059' />
+ <nd ref='-39057' />
+ <nd ref='-45373' />
+ <nd ref='-45371' />
+ <nd ref='-45367' />
+ <nd ref='-45369' />
+ <nd ref='-45365' />
+ <nd ref='-45379' />
+ <nd ref='-45375' />
+ <nd ref='-45377' />
+ <nd ref='-45383' />
+ <nd ref='-45381' />
+ <nd ref='-39055' />
+ <nd ref='-39053' />
+ <nd ref='-39051' />
+ <nd ref='-39049' />
+ <nd ref='-39047' />
+ <nd ref='-39045' />
+ <nd ref='-39043' />
+ <nd ref='-39041' />
+ <nd ref='-44607' />
+ <nd ref='-44609' />
+ <nd ref='-44605' />
+ <nd ref='-38703' />
+ <nd ref='-44591' />
+ <nd ref='-44589' />
+ <nd ref='-44603' />
+ <nd ref='-44601' />
+ <nd ref='-44599' />
+ <nd ref='-44597' />
+ <nd ref='-44595' />
+ <nd ref='-44593' />
+ <nd ref='-44567' />
+ <nd ref='-44583' />
+ <nd ref='-44585' />
+ <nd ref='-44587' />
+ <nd ref='-44581' />
+ <nd ref='-44579' />
+ <nd ref='-44577' />
+ <nd ref='-44575' />
+ <nd ref='-44573' />
+ <nd ref='-44571' />
+ <nd ref='-44569' />
+ <nd ref='-39649' />
+ <nd ref='-38701' />
+ <nd ref='-39651' />
+ <nd ref='-38699' />
+ <nd ref='-44565' />
+ <nd ref='-44563' />
+ <nd ref='-44555' />
+ <nd ref='-44557' />
+ <nd ref='-44561' />
+ <nd ref='-44559' />
+ <nd ref='-38697' />
+ <nd ref='-38695' />
+ <nd ref='-39653' />
+ <nd ref='-39655' />
+ <nd ref='-44553' />
+ <nd ref='-39657' />
+ <nd ref='-39659' />
+ <nd ref='-44551' />
+ <nd ref='-44549' />
+ <nd ref='-44457' />
+ <nd ref='-44461' />
+ <nd ref='-44463' />
+ <nd ref='-44547' />
+ <nd ref='-44459' />
+ <nd ref='-44545' />
+ <nd ref='-44465' />
+ <nd ref='-44543' />
+ <nd ref='-44537' />
+ <nd ref='-44541' />
+ <nd ref='-44539' />
+ <nd ref='-44469' />
+ <nd ref='-44477' />
+ <nd ref='-44535' />
+ <nd ref='-44533' />
+ <nd ref='-44531' />
+ <nd ref='-44529' />
+ <nd ref='-44527' />
+ <nd ref='-44479' />
+ <nd ref='-44523' />
+ <nd ref='-44525' />
+ <nd ref='-44521' />
+ <nd ref='-44483' />
+ <nd ref='-44481' />
+ <nd ref='-44517' />
+ <nd ref='-44519' />
+ <nd ref='-44509' />
+ <nd ref='-44511' />
+ <nd ref='-44515' />
+ <nd ref='-44513' />
+ <nd ref='-44507' />
+ <nd ref='-44505' />
+ <nd ref='-44485' />
+ <nd ref='-44503' />
+ <nd ref='-44501' />
+ <nd ref='-44499' />
+ <nd ref='-44489' />
+ <nd ref='-44497' />
+ <nd ref='-44487' />
+ <nd ref='-44475' />
+ <nd ref='-44493' />
+ <nd ref='-44495' />
+ <nd ref='-44491' />
+ <nd ref='-44473' />
+ <nd ref='-44471' />
+ <nd ref='-44467' />
+ <nd ref='-38693' />
+ <nd ref='-44441' />
+ <nd ref='-44455' />
+ <nd ref='-44453' />
+ <nd ref='-44451' />
+ <nd ref='-44449' />
+ <nd ref='-44447' />
+ <nd ref='-44443' />
+ <nd ref='-44445' />
+ <nd ref='-40349' />
+ <nd ref='-44433' />
+ <nd ref='-44431' />
+ <nd ref='-44429' />
+ <nd ref='-44427' />
+ <nd ref='-44425' />
+ <nd ref='-44423' />
+ <nd ref='-44421' />
+ <nd ref='-44419' />
+ <nd ref='-44417' />
+ <nd ref='-44415' />
+ <nd ref='-44413' />
+ <nd ref='-44411' />
+ <nd ref='-44409' />
+ <nd ref='-39661' />
+ <nd ref='-44397' />
+ <nd ref='-44399' />
+ <nd ref='-44401' />
+ <nd ref='-44405' />
+ <nd ref='-44403' />
+ <nd ref='-44407' />
+ <nd ref='-44395' />
+ <nd ref='-44393' />
+ <nd ref='-44391' />
+ <nd ref='-44389' />
+ <nd ref='-39663' />
+ <nd ref='-39665' />
+ <nd ref='-39667' />
+ <nd ref='-44387' />
+ <nd ref='-44381' />
+ <nd ref='-44383' />
+ <nd ref='-44385' />
+ <nd ref='-44379' />
+ <nd ref='-44377' />
+ <nd ref='-44375' />
+ <nd ref='-44373' />
+ <nd ref='-44371' />
+ <nd ref='-44369' />
+ <nd ref='-44367' />
+ <nd ref='-44365' />
+ <nd ref='-39669' />
+ <nd ref='-39671' />
+ <nd ref='-39673' />
+ <nd ref='-39675' />
+ <nd ref='-39677' />
+ <nd ref='-39679' />
+ <nd ref='-39681' />
+ <nd ref='-39683' />
+ <nd ref='-36495' />
+ <nd ref='-36521' />
+ <nd ref='-36493' />
+ <nd ref='-39685' />
+ <nd ref='-40961' />
+ <nd ref='-40959' />
+ <nd ref='-40957' />
+ <nd ref='-39687' />
+ <nd ref='-40955' />
+ <nd ref='-36491' />
+ <nd ref='-36485' />
+ <nd ref='-36523' />
+ <nd ref='-36487' />
+ <nd ref='-36489' />
+ <nd ref='-36525' />
+ <nd ref='-36835' />
+ <nd ref='-39511' />
+ <nd ref='-39509' />
+ <nd ref='-39507' />
+ <nd ref='-39505' />
+ <nd ref='-39503' />
+ <nd ref='-39501' />
+ <nd ref='-39499' />
+ <nd ref='-39497' />
+ <nd ref='-39495' />
+ <nd ref='-39493' />
+ <nd ref='-39491' />
+ <nd ref='-39489' />
+ <nd ref='-39487' />
+ <nd ref='-39485' />
+ <nd ref='-39483' />
+ <nd ref='-39481' />
+ <nd ref='-39479' />
+ <nd ref='-39477' />
+ <nd ref='-39475' />
+ <nd ref='-39473' />
+ <nd ref='-39471' />
+ <nd ref='-39469' />
+ <nd ref='-39467' />
+ <nd ref='-39465' />
+ <nd ref='-39463' />
+ <nd ref='-39461' />
+ <nd ref='-39459' />
+ <nd ref='-39457' />
+ <nd ref='-39455' />
+ <nd ref='-39453' />
+ <nd ref='-39451' />
+ <nd ref='-39449' />
+ <nd ref='-39447' />
+ <nd ref='-39445' />
+ <nd ref='-39443' />
+ <nd ref='-39441' />
+ <nd ref='-39439' />
+ <nd ref='-39437' />
+ <nd ref='-39435' />
+ <nd ref='-39433' />
+ <nd ref='-44193' />
+ <nd ref='-44191' />
+ <nd ref='-44189' />
+ <nd ref='-44187' />
+ <nd ref='-44243' />
+ <nd ref='-44241' />
+ <nd ref='-44195' />
+ <nd ref='-44205' />
+ <nd ref='-44203' />
+ <nd ref='-44245' />
+ <nd ref='-44201' />
+ <nd ref='-44199' />
+ <nd ref='-44197' />
+ <nd ref='-37013' />
+ <nd ref='-39431' />
+ <nd ref='-39429' />
+ <nd ref='-39427' />
+ <nd ref='-39425' />
+ <nd ref='-39423' />
+ <nd ref='-39421' />
+ <nd ref='-39419' />
+ <nd ref='-39417' />
+ <nd ref='-44253' />
+ <nd ref='-39415' />
+ <nd ref='-39413' />
+ <nd ref='-44257' />
+ <nd ref='-44255' />
+ <nd ref='-39411' />
+ <nd ref='-39409' />
+ <nd ref='-39407' />
+ <nd ref='-44259' />
+ <nd ref='-39405' />
+ <nd ref='-39403' />
+ <nd ref='-39401' />
+ <nd ref='-39399' />
+ <nd ref='-44263' />
+ <nd ref='-44261' />
+ <nd ref='-39397' />
+ <nd ref='-44265' />
+ <nd ref='-44269' />
+ <nd ref='-44273' />
+ <nd ref='-44275' />
+ <nd ref='-44271' />
+ <nd ref='-44267' />
+ <nd ref='-39395' />
+ <nd ref='-44283' />
+ <nd ref='-44281' />
+ <nd ref='-44279' />
+ <nd ref='-44285' />
+ <nd ref='-44277' />
+ <nd ref='-44287' />
+ <nd ref='-39393' />
+ <nd ref='-44291' />
+ <nd ref='-44289' />
+ <nd ref='-39391' />
+ <nd ref='-39389' />
+ <nd ref='-39387' />
+ <nd ref='-44293' />
+ <nd ref='-39385' />
+ <nd ref='-39383' />
+ <nd ref='-39381' />
+ <nd ref='-39379' />
+ <nd ref='-44313' />
+ <nd ref='-44311' />
+ <nd ref='-44309' />
+ <nd ref='-44307' />
+ <nd ref='-44303' />
+ <nd ref='-44305' />
+ <nd ref='-44301' />
+ <nd ref='-44299' />
+ <nd ref='-44295' />
+ <nd ref='-44297' />
+ <nd ref='-39377' />
+ <nd ref='-39375' />
+ <nd ref='-39373' />
+ <nd ref='-39371' />
+ <nd ref='-39369' />
+ <nd ref='-39367' />
+ <nd ref='-39365' />
+ <nd ref='-39363' />
+ <nd ref='-42649' />
+ <nd ref='-39759' />
+ <nd ref='-42651' />
+ <nd ref='-39689' />
+ <nd ref='-42653' />
+ <nd ref='-42655' />
+ <nd ref='-42657' />
+ <nd ref='-39691' />
+ <nd ref='-39693' />
+ <nd ref='-37553' />
+ <nd ref='-37551' />
+ <tag k='ISO3166-1:alpha2' v='FX' />
+ <tag k='name:en' v='Metropolitan France' />
+ </way>
+ <way id='-57597'>
+ <nd ref='-38785' />
+ <nd ref='-31969' />
+ <nd ref='-31971' />
+ <nd ref='-39695' />
+ <nd ref='-31967' />
+ <nd ref='-39697' />
+ <nd ref='-39699' />
+ <nd ref='-38843' />
+ <nd ref='-31963' />
+ <nd ref='-31965' />
+ <nd ref='-38841' />
+ <nd ref='-31959' />
+ <nd ref='-31957' />
+ <nd ref='-31961' />
+ <nd ref='-38839' />
+ <nd ref='-38837' />
+ <nd ref='-38835' />
+ <nd ref='-31943' />
+ <nd ref='-31945' />
+ <nd ref='-31947' />
+ <nd ref='-31949' />
+ <nd ref='-31951' />
+ <nd ref='-31953' />
+ <nd ref='-31955' />
+ <nd ref='-38833' />
+ <nd ref='-39701' />
+ <nd ref='-31935' />
+ <nd ref='-31937' />
+ <nd ref='-31939' />
+ <nd ref='-31941' />
+ <nd ref='-38831' />
+ <nd ref='-31933' />
+ <nd ref='-31931' />
+ <nd ref='-39703' />
+ <nd ref='-31929' />
+ <nd ref='-31927' />
+ <nd ref='-31925' />
+ <nd ref='-31923' />
+ <nd ref='-31921' />
+ <nd ref='-39705' />
+ <nd ref='-31919' />
+ <nd ref='-38829' />
+ <nd ref='-38827' />
+ <nd ref='-39707' />
+ <nd ref='-38825' />
+ <nd ref='-31913' />
+ <nd ref='-31915' />
+ <nd ref='-31917' />
+ <nd ref='-39709' />
+ <nd ref='-38823' />
+ <nd ref='-36881' />
+ <nd ref='-39711' />
+ <nd ref='-39713' />
+ <nd ref='-39715' />
+ <nd ref='-39717' />
+ <nd ref='-39719' />
+ <nd ref='-39721' />
+ <nd ref='-39723' />
+ <nd ref='-39725' />
+ <nd ref='-39727' />
+ <nd ref='-39729' />
+ <nd ref='-39731' />
+ <nd ref='-39733' />
+ <nd ref='-39735' />
+ <nd ref='-39737' />
+ <nd ref='-31973' />
+ <nd ref='-38785' />
+ <tag k='ISO3166-1:alpha2' v='GA' />
+ <tag k='name:en' v='Gabon' />
+ </way>
+ <way id='-57599'>
+ <nd ref='-36397' />
+ <nd ref='-39621' />
+ <nd ref='-36399' />
+ <nd ref='-39739' />
+ <nd ref='-36397' />
+ <tag k='ISO3166-1:alpha2' v='MS' />
+ <tag k='name:en' v='Montserrat' />
+ </way>
+ <way id='-57601'>
+ <nd ref='-39741' />
+ <nd ref='-39743' />
+ <nd ref='-39745' />
+ <nd ref='-39747' />
+ <nd ref='-39741' />
+ <tag k='ISO3166-1:alpha2' v='BM' />
+ <tag k='name:en' v='Bermuda' />
+ </way>
+ <way id='-57603'>
+ <nd ref='-38959' />
+ <nd ref='-38957' />
+ <nd ref='-38955' />
+ <nd ref='-38953' />
+ <nd ref='-38951' />
+ <nd ref='-38949' />
+ <nd ref='-38947' />
+ <nd ref='-43215' />
+ <nd ref='-43217' />
+ <nd ref='-38945' />
+ <nd ref='-43219' />
+ <nd ref='-38943' />
+ <nd ref='-43221' />
+ <nd ref='-38941' />
+ <nd ref='-38939' />
+ <nd ref='-38937' />
+ <nd ref='-38935' />
+ <nd ref='-43223' />
+ <nd ref='-43225' />
+ <nd ref='-43227' />
+ <nd ref='-38933' />
+ <nd ref='-38931' />
+ <nd ref='-38929' />
+ <nd ref='-43229' />
+ <nd ref='-38927' />
+ <nd ref='-38925' />
+ <nd ref='-38969' />
+ <nd ref='-38967' />
+ <nd ref='-38965' />
+ <nd ref='-38963' />
+ <nd ref='-38961' />
+ <nd ref='-38959' />
+ </way>
+ <way id='-57605'>
+ <nd ref='-43211' />
+ <nd ref='-43209' />
+ <nd ref='-43207' />
+ <nd ref='-43191' />
+ <nd ref='-43193' />
+ <nd ref='-43195' />
+ <nd ref='-43199' />
+ <nd ref='-43197' />
+ <nd ref='-43205' />
+ <nd ref='-43201' />
+ <nd ref='-43203' />
+ <nd ref='-43189' />
+ <nd ref='-43187' />
+ <nd ref='-38881' />
+ <nd ref='-38879' />
+ <nd ref='-43185' />
+ <nd ref='-43181' />
+ <nd ref='-43183' />
+ <nd ref='-43167' />
+ <nd ref='-43169' />
+ <nd ref='-43171' />
+ <nd ref='-43173' />
+ <nd ref='-43175' />
+ <nd ref='-43177' />
+ <nd ref='-43179' />
+ <nd ref='-43165' />
+ <nd ref='-43159' />
+ <nd ref='-43161' />
+ <nd ref='-43163' />
+ <nd ref='-43157' />
+ <nd ref='-43155' />
+ <nd ref='-43153' />
+ <nd ref='-43151' />
+ <nd ref='-43149' />
+ <nd ref='-43147' />
+ <nd ref='-43145' />
+ <nd ref='-43143' />
+ <nd ref='-43141' />
+ <nd ref='-43139' />
+ <nd ref='-43137' />
+ <nd ref='-43135' />
+ <nd ref='-43133' />
+ <nd ref='-43131' />
+ <nd ref='-43129' />
+ <nd ref='-43127' />
+ <nd ref='-43125' />
+ <nd ref='-38923' />
+ <nd ref='-43121' />
+ <nd ref='-43123' />
+ <nd ref='-43211' />
+ </way>
+ <way id='-57607'>
+ <nd ref='-39749' />
+ <nd ref='-36841' />
+ <nd ref='-39751' />
+ <nd ref='-39753' />
+ <nd ref='-36843' />
+ <nd ref='-36845' />
+ <nd ref='-36847' />
+ <nd ref='-39515' />
+ <nd ref='-36849' />
+ <nd ref='-39513' />
+ <nd ref='-39755' />
+ <nd ref='-39749' />
+ <tag k='ISO3166-1:alpha2' v='GI' />
+ <tag k='driving_side' v='right' />
+ <tag k='name:en' v='Gibraltar' />
+ </way>
+ <way id='-57609'>
+ <nd ref='-37299' />
+ <nd ref='-47837' />
+ <nd ref='-47839' />
+ <nd ref='-47841' />
+ <nd ref='-47845' />
+ <nd ref='-47843' />
+ <nd ref='-47847' />
+ <nd ref='-47873' />
+ <nd ref='-47877' />
+ <nd ref='-47879' />
+ <nd ref='-47875' />
+ <nd ref='-47871' />
+ <nd ref='-47869' />
+ <nd ref='-47867' />
+ <nd ref='-47865' />
+ <nd ref='-47863' />
+ <nd ref='-47859' />
+ <nd ref='-47861' />
+ <nd ref='-47857' />
+ <nd ref='-47855' />
+ <nd ref='-47853' />
+ <nd ref='-47851' />
+ <nd ref='-47849' />
+ <nd ref='-47831' />
+ <nd ref='-47833' />
+ <nd ref='-47835' />
+ <nd ref='-47829' />
+ <nd ref='-47827' />
+ <nd ref='-47825' />
+ <nd ref='-47823' />
+ <nd ref='-47821' />
+ <nd ref='-47819' />
+ <nd ref='-37297' />
+ <nd ref='-37295' />
+ <nd ref='-37293' />
+ <nd ref='-37113' />
+ <nd ref='-37163' />
+ <nd ref='-47563' />
+ <nd ref='-47567' />
+ <nd ref='-47569' />
+ <nd ref='-47571' />
+ <nd ref='-47573' />
+ <nd ref='-47565' />
+ <nd ref='-47577' />
+ <nd ref='-47575' />
+ <nd ref='-47561' />
+ <nd ref='-47579' />
+ <nd ref='-47581' />
+ <nd ref='-47559' />
+ <nd ref='-47583' />
+ <nd ref='-37161' />
+ <nd ref='-31747' />
+ <nd ref='-31749' />
+ <nd ref='-31753' />
+ <nd ref='-31751' />
+ <nd ref='-31755' />
+ <nd ref='-31761' />
+ <nd ref='-31757' />
+ <nd ref='-31759' />
+ <nd ref='-31763' />
+ <nd ref='-31765' />
+ <nd ref='-31767' />
+ <nd ref='-31769' />
+ <nd ref='-39765' />
+ <nd ref='-31771' />
+ <nd ref='-31773' />
+ <nd ref='-31775' />
+ <nd ref='-39767' />
+ <nd ref='-42793' />
+ <nd ref='-41725' />
+ <nd ref='-31737' />
+ <nd ref='-31743' />
+ <nd ref='-31741' />
+ <nd ref='-31739' />
+ <nd ref='-31745' />
+ <nd ref='-31709' />
+ <nd ref='-31711' />
+ <nd ref='-31713' />
+ <nd ref='-31715' />
+ <nd ref='-31717' />
+ <nd ref='-31733' />
+ <nd ref='-31731' />
+ <nd ref='-31723' />
+ <nd ref='-31721' />
+ <nd ref='-31719' />
+ <nd ref='-31725' />
+ <nd ref='-31727' />
+ <nd ref='-31729' />
+ <nd ref='-31735' />
+ <nd ref='-37299' />
+ <tag k='ISO3166-1:alpha2' v='GE' />
+ <tag k='name:en' v='Georgia' />
+ </way>
+ <way id='-57611'>
+ <nd ref='-39769' />
+ <nd ref='-39771' />
+ <nd ref='-39773' />
+ <nd ref='-39775' />
+ <nd ref='-39777' />
+ <nd ref='-47985' />
+ <nd ref='-39779' />
+ <nd ref='-39781' />
+ <nd ref='-39783' />
+ <nd ref='-39785' />
+ <nd ref='-39787' />
+ <nd ref='-39789' />
+ <nd ref='-39791' />
+ <nd ref='-39793' />
+ <nd ref='-39795' />
+ <nd ref='-47987' />
+ <nd ref='-48103' />
+ <nd ref='-48109' />
+ <nd ref='-48105' />
+ <nd ref='-48107' />
+ <nd ref='-48057' />
+ <nd ref='-48077' />
+ <nd ref='-48075' />
+ <nd ref='-48073' />
+ <nd ref='-48071' />
+ <nd ref='-48069' />
+ <nd ref='-48079' />
+ <nd ref='-48081' />
+ <nd ref='-48083' />
+ <nd ref='-48085' />
+ <nd ref='-48087' />
+ <nd ref='-48089' />
+ <nd ref='-48091' />
+ <nd ref='-48093' />
+ <nd ref='-48095' />
+ <nd ref='-48101' />
+ <nd ref='-48099' />
+ <nd ref='-48097' />
+ <nd ref='-48059' />
+ <nd ref='-48065' />
+ <nd ref='-48067' />
+ <nd ref='-48063' />
+ <nd ref='-48061' />
+ <nd ref='-48045' />
+ <nd ref='-48055' />
+ <nd ref='-48053' />
+ <nd ref='-48047' />
+ <nd ref='-48051' />
+ <nd ref='-48049' />
+ <nd ref='-47989' />
+ <nd ref='-48037' />
+ <nd ref='-48043' />
+ <nd ref='-48041' />
+ <nd ref='-48039' />
+ <nd ref='-48035' />
+ <nd ref='-48033' />
+ <nd ref='-48031' />
+ <nd ref='-48027' />
+ <nd ref='-48029' />
+ <nd ref='-48025' />
+ <nd ref='-47991' />
+ <nd ref='-47997' />
+ <nd ref='-47995' />
+ <nd ref='-47999' />
+ <nd ref='-47993' />
+ <nd ref='-48021' />
+ <nd ref='-48023' />
+ <nd ref='-48019' />
+ <nd ref='-48015' />
+ <nd ref='-48017' />
+ <nd ref='-48011' />
+ <nd ref='-48013' />
+ <nd ref='-48001' />
+ <nd ref='-48003' />
+ <nd ref='-48007' />
+ <nd ref='-48009' />
+ <nd ref='-48005' />
+ <nd ref='-39797' />
+ <nd ref='-42903' />
+ <nd ref='-39799' />
+ <nd ref='-42905' />
+ <nd ref='-38747' />
+ <nd ref='-42893' />
+ <nd ref='-42895' />
+ <nd ref='-42901' />
+ <nd ref='-42897' />
+ <nd ref='-42899' />
+ <nd ref='-38745' />
+ <nd ref='-47949' />
+ <nd ref='-47947' />
+ <nd ref='-47945' />
+ <nd ref='-47943' />
+ <nd ref='-47953' />
+ <nd ref='-47957' />
+ <nd ref='-47955' />
+ <nd ref='-47951' />
+ <nd ref='-47939' />
+ <nd ref='-47941' />
+ <nd ref='-47959' />
+ <nd ref='-47919' />
+ <nd ref='-47921' />
+ <nd ref='-47923' />
+ <nd ref='-47925' />
+ <nd ref='-47929' />
+ <nd ref='-47931' />
+ <nd ref='-47933' />
+ <nd ref='-47927' />
+ <nd ref='-47935' />
+ <nd ref='-47937' />
+ <nd ref='-38743' />
+ <nd ref='-47911' />
+ <nd ref='-47915' />
+ <nd ref='-47913' />
+ <nd ref='-47917' />
+ <nd ref='-38741' />
+ <nd ref='-47965' />
+ <nd ref='-47967' />
+ <nd ref='-47963' />
+ <nd ref='-47961' />
+ <nd ref='-37639' />
+ <nd ref='-47969' />
+ <nd ref='-47973' />
+ <nd ref='-47983' />
+ <nd ref='-47977' />
+ <nd ref='-47979' />
+ <nd ref='-47981' />
+ <nd ref='-47975' />
+ <nd ref='-47971' />
+ <nd ref='-39769' />
+ <tag k='ISO3166-1:alpha2' v='GH' />
+ <tag k='name:en' v='Ghana' />
+ </way>
+ <way id='-57613'>
+ <nd ref='-39801' />
+ <nd ref='-33925' />
+ <nd ref='-33923' />
+ <nd ref='-33921' />
+ <nd ref='-33919' />
+ <nd ref='-33917' />
+ <nd ref='-33915' />
+ <nd ref='-33913' />
+ <nd ref='-33911' />
+ <nd ref='-33909' />
+ <nd ref='-33907' />
+ <nd ref='-33905' />
+ <nd ref='-33903' />
+ <nd ref='-33901' />
+ <nd ref='-33899' />
+ <nd ref='-33897' />
+ <nd ref='-33895' />
+ <nd ref='-31977' />
+ <nd ref='-31975' />
+ <nd ref='-33893' />
+ <nd ref='-33891' />
+ <nd ref='-33889' />
+ <nd ref='-39803' />
+ <nd ref='-33839' />
+ <nd ref='-33841' />
+ <nd ref='-33843' />
+ <nd ref='-33845' />
+ <nd ref='-33847' />
+ <nd ref='-33849' />
+ <nd ref='-33851' />
+ <nd ref='-33853' />
+ <nd ref='-33855' />
+ <nd ref='-33857' />
+ <nd ref='-33859' />
+ <nd ref='-33861' />
+ <nd ref='-33863' />
+ <nd ref='-33865' />
+ <nd ref='-33887' />
+ <nd ref='-33885' />
+ <nd ref='-33873' />
+ <nd ref='-33871' />
+ <nd ref='-33867' />
+ <nd ref='-33869' />
+ <nd ref='-33875' />
+ <nd ref='-33877' />
+ <nd ref='-33879' />
+ <nd ref='-33881' />
+ <nd ref='-33883' />
+ <nd ref='-38753' />
+ <nd ref='-33791' />
+ <nd ref='-33793' />
+ <nd ref='-33797' />
+ <nd ref='-33795' />
+ <nd ref='-33803' />
+ <nd ref='-33807' />
+ <nd ref='-33805' />
+ <nd ref='-33809' />
+ <nd ref='-33801' />
+ <nd ref='-33799' />
+ <nd ref='-33811' />
+ <nd ref='-33813' />
+ <nd ref='-33815' />
+ <nd ref='-33817' />
+ <nd ref='-33819' />
+ <nd ref='-33821' />
+ <nd ref='-33823' />
+ <nd ref='-33825' />
+ <nd ref='-33827' />
+ <nd ref='-33829' />
+ <nd ref='-33831' />
+ <nd ref='-33833' />
+ <nd ref='-33835' />
+ <nd ref='-33837' />
+ <nd ref='-39805' />
+ <nd ref='-34205' />
+ <nd ref='-34207' />
+ <nd ref='-34203' />
+ <nd ref='-34211' />
+ <nd ref='-34209' />
+ <nd ref='-34213' />
+ <nd ref='-34215' />
+ <nd ref='-34217' />
+ <nd ref='-34219' />
+ <nd ref='-34221' />
+ <nd ref='-34223' />
+ <nd ref='-39807' />
+ <nd ref='-41905' />
+ <nd ref='-41903' />
+ <nd ref='-39809' />
+ <nd ref='-41901' />
+ <nd ref='-34243' />
+ <nd ref='-34245' />
+ <nd ref='-34247' />
+ <nd ref='-34249' />
+ <nd ref='-39811' />
+ <nd ref='-39813' />
+ <nd ref='-39815' />
+ <nd ref='-39817' />
+ <nd ref='-35025' />
+ <nd ref='-35023' />
+ <nd ref='-39841' />
+ <nd ref='-39839' />
+ <nd ref='-39837' />
+ <nd ref='-35045' />
+ <nd ref='-35041' />
+ <nd ref='-35043' />
+ <nd ref='-35039' />
+ <nd ref='-35027' />
+ <nd ref='-35029' />
+ <nd ref='-35031' />
+ <nd ref='-35035' />
+ <nd ref='-35033' />
+ <nd ref='-35037' />
+ <nd ref='-39847' />
+ <nd ref='-34271' />
+ <nd ref='-34269' />
+ <nd ref='-34265' />
+ <nd ref='-34267' />
+ <nd ref='-34263' />
+ <nd ref='-34261' />
+ <nd ref='-39801' />
+ <tag k='ISO3166-1:alpha2' v='GN' />
+ <tag k='name:en' v='Guinea' />
+ </way>
+ <way id='-57615'>
+ <nd ref='-39819' />
+ <nd ref='-39821' />
+ <nd ref='-39823' />
+ <nd ref='-39825' />
+ <nd ref='-39827' />
+ <nd ref='-39829' />
+ <nd ref='-41867' />
+ <nd ref='-39831' />
+ <nd ref='-39833' />
+ <nd ref='-39835' />
+ <nd ref='-35061' />
+ <nd ref='-35057' />
+ <nd ref='-35055' />
+ <nd ref='-35053' />
+ <nd ref='-35059' />
+ <nd ref='-39819' />
+ <tag k='ISO3166-1:alpha2' v='GM' />
+ <tag k='name:en' v='Gambia, The' />
+ </way>
+ <way id='-57617'>
+ <nd ref='-39837' />
+ <nd ref='-39839' />
+ <nd ref='-39841' />
+ <nd ref='-35023' />
+ <nd ref='-35025' />
+ <nd ref='-39817' />
+ <nd ref='-39815' />
+ <nd ref='-41865' />
+ <nd ref='-39843' />
+ <nd ref='-35051' />
+ <nd ref='-35049' />
+ <nd ref='-35047' />
+ <nd ref='-39845' />
+ <nd ref='-39847' />
+ <nd ref='-35037' />
+ <nd ref='-35033' />
+ <nd ref='-35035' />
+ <nd ref='-35031' />
+ <nd ref='-35029' />
+ <nd ref='-35027' />
+ <nd ref='-35039' />
+ <nd ref='-35043' />
+ <nd ref='-35041' />
+ <nd ref='-35045' />
+ <nd ref='-39837' />
+ <tag k='ISO3166-1:alpha2' v='GW' />
+ <tag k='name:en' v='Guinea-Bissau' />
+ </way>
+ <way id='-57619'>
+ <nd ref='-39849' />
+ <nd ref='-38789' />
+ <nd ref='-36871' />
+ <nd ref='-39851' />
+ <nd ref='-36867' />
+ <nd ref='-36869' />
+ <nd ref='-39853' />
+ <nd ref='-39855' />
+ <nd ref='-38787' />
+ <nd ref='-39735' />
+ <nd ref='-39733' />
+ <nd ref='-39731' />
+ <nd ref='-39729' />
+ <nd ref='-39727' />
+ <nd ref='-39725' />
+ <nd ref='-39723' />
+ <nd ref='-39721' />
+ <nd ref='-39719' />
+ <nd ref='-39717' />
+ <nd ref='-39715' />
+ <nd ref='-39713' />
+ <nd ref='-39711' />
+ <nd ref='-36881' />
+ <nd ref='-36861' />
+ <nd ref='-36859' />
+ <nd ref='-36865' />
+ <nd ref='-36863' />
+ <nd ref='-36877' />
+ <nd ref='-36875' />
+ <nd ref='-36855' />
+ <nd ref='-38791' />
+ <nd ref='-36857' />
+ <nd ref='-39849' />
+ <tag k='ISO3166-1:alpha2' v='GQ' />
+ <tag k='name:en' v='Equatorial Guinea' />
+ </way>
+ <way id='-57621'>
+ <nd ref='-39863' />
+ <nd ref='-36781' />
+ <nd ref='-39865' />
+ <nd ref='-36785' />
+ <nd ref='-36783' />
+ <nd ref='-36771' />
+ <nd ref='-36773' />
+ <nd ref='-39867' />
+ <nd ref='-39911' />
+ <nd ref='-35767' />
+ <nd ref='-35769' />
+ <nd ref='-35771' />
+ <nd ref='-39909' />
+ <nd ref='-35755' />
+ <nd ref='-35751' />
+ <nd ref='-35753' />
+ <nd ref='-35757' />
+ <nd ref='-35759' />
+ <nd ref='-35761' />
+ <nd ref='-35763' />
+ <nd ref='-35765' />
+ <nd ref='-39907' />
+ <nd ref='-35725' />
+ <nd ref='-35727' />
+ <nd ref='-35729' />
+ <nd ref='-35731' />
+ <nd ref='-35733' />
+ <nd ref='-35735' />
+ <nd ref='-35737' />
+ <nd ref='-35739' />
+ <nd ref='-35741' />
+ <nd ref='-35743' />
+ <nd ref='-35745' />
+ <nd ref='-35747' />
+ <nd ref='-35749' />
+ <nd ref='-36787' />
+ <nd ref='-41913' />
+ <nd ref='-41077' />
+ <nd ref='-41075' />
+ <nd ref='-43453' />
+ <nd ref='-43451' />
+ <nd ref='-43455' />
+ <nd ref='-43449' />
+ <nd ref='-41073' />
+ <nd ref='-41071' />
+ <nd ref='-39869' />
+ <nd ref='-39871' />
+ <nd ref='-43457' />
+ <nd ref='-41069' />
+ <nd ref='-41067' />
+ <nd ref='-43459' />
+ <nd ref='-41065' />
+ <nd ref='-41063' />
+ <nd ref='-41061' />
+ <nd ref='-39863' />
+ <tag k='ISO3166-1:alpha2' v='GT' />
+ <tag k='name:en' v='Guatemala' />
+ </way>
+ <way id='-57623'>
+ <nd ref='-39873' />
+ <nd ref='-43495' />
+ <nd ref='-43497' />
+ <nd ref='-41967' />
+ <nd ref='-39875' />
+ <nd ref='-43499' />
+ <nd ref='-39877' />
+ <nd ref='-41965' />
+ <nd ref='-43501' />
+ <nd ref='-37897' />
+ <nd ref='-35495' />
+ <nd ref='-35493' />
+ <nd ref='-35487' />
+ <nd ref='-35485' />
+ <nd ref='-35489' />
+ <nd ref='-35491' />
+ <nd ref='-35497' />
+ <nd ref='-35479' />
+ <nd ref='-35481' />
+ <nd ref='-35483' />
+ <nd ref='-35499' />
+ <nd ref='-35501' />
+ <nd ref='-35503' />
+ <nd ref='-35505' />
+ <nd ref='-35507' />
+ <nd ref='-35509' />
+ <nd ref='-35511' />
+ <nd ref='-35513' />
+ <nd ref='-35515' />
+ <nd ref='-35517' />
+ <nd ref='-35519' />
+ <nd ref='-35523' />
+ <nd ref='-35521' />
+ <nd ref='-37895' />
+ <nd ref='-35601' />
+ <nd ref='-35603' />
+ <nd ref='-35605' />
+ <nd ref='-35607' />
+ <nd ref='-35609' />
+ <nd ref='-35611' />
+ <nd ref='-37941' />
+ <nd ref='-39879' />
+ <nd ref='-35617' />
+ <nd ref='-35615' />
+ <nd ref='-35613' />
+ <nd ref='-39881' />
+ <nd ref='-39883' />
+ <nd ref='-35619' />
+ <nd ref='-35621' />
+ <nd ref='-35623' />
+ <nd ref='-35625' />
+ <nd ref='-35627' />
+ <nd ref='-35629' />
+ <nd ref='-35631' />
+ <nd ref='-35633' />
+ <nd ref='-35635' />
+ <nd ref='-35637' />
+ <nd ref='-35639' />
+ <nd ref='-35641' />
+ <nd ref='-35643' />
+ <nd ref='-39885' />
+ <nd ref='-39887' />
+ <nd ref='-36365' />
+ <nd ref='-39873' />
+ <tag k='ISO3166-1:alpha2' v='GY' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Guyana' />
+ </way>
+ <way id='-57625'>
+ <nd ref='-39889' />
+ <nd ref='-36767' />
+ <nd ref='-41501' />
+ <nd ref='-39891' />
+ <nd ref='-39893' />
+ <nd ref='-35645' />
+ <nd ref='-35651' />
+ <nd ref='-35647' />
+ <nd ref='-35649' />
+ <nd ref='-35653' />
+ <nd ref='-35655' />
+ <nd ref='-35657' />
+ <nd ref='-35659' />
+ <nd ref='-35661' />
+ <nd ref='-35663' />
+ <nd ref='-35665' />
+ <nd ref='-39895' />
+ <nd ref='-35689' />
+ <nd ref='-35687' />
+ <nd ref='-35685' />
+ <nd ref='-35683' />
+ <nd ref='-35681' />
+ <nd ref='-35679' />
+ <nd ref='-35677' />
+ <nd ref='-35675' />
+ <nd ref='-35673' />
+ <nd ref='-35671' />
+ <nd ref='-35667' />
+ <nd ref='-35669' />
+ <nd ref='-39897' />
+ <nd ref='-41509' />
+ <nd ref='-39899' />
+ <nd ref='-39901' />
+ <nd ref='-41909' />
+ <nd ref='-41907' />
+ <nd ref='-36779' />
+ <nd ref='-36777' />
+ <nd ref='-39903' />
+ <nd ref='-39905' />
+ <nd ref='-35691' />
+ <nd ref='-35693' />
+ <nd ref='-35695' />
+ <nd ref='-35697' />
+ <nd ref='-35699' />
+ <nd ref='-35701' />
+ <nd ref='-35703' />
+ <nd ref='-35705' />
+ <nd ref='-35707' />
+ <nd ref='-35709' />
+ <nd ref='-35711' />
+ <nd ref='-35713' />
+ <nd ref='-35715' />
+ <nd ref='-35717' />
+ <nd ref='-35719' />
+ <nd ref='-35721' />
+ <nd ref='-35723' />
+ <nd ref='-39907' />
+ <nd ref='-35765' />
+ <nd ref='-35763' />
+ <nd ref='-35761' />
+ <nd ref='-35759' />
+ <nd ref='-35757' />
+ <nd ref='-35753' />
+ <nd ref='-35751' />
+ <nd ref='-35755' />
+ <nd ref='-39909' />
+ <nd ref='-35771' />
+ <nd ref='-35769' />
+ <nd ref='-35767' />
+ <nd ref='-39911' />
+ <nd ref='-39867' />
+ <nd ref='-39889' />
+ <tag k='ISO3166-1:alpha2' v='HN' />
+ <tag k='name:en' v='Honduras' />
+ </way>
+ <way id='-57627'>
+ <nd ref='-39925' />
+ <nd ref='-49691' />
+ <nd ref='-49695' />
+ <nd ref='-49693' />
+ <nd ref='-49697' />
+ <nd ref='-49689' />
+ <nd ref='-49687' />
+ <nd ref='-37789' />
+ <nd ref='-36483' />
+ <nd ref='-36481' />
+ <nd ref='-41181' />
+ <nd ref='-36531' />
+ <nd ref='-36529' />
+ <nd ref='-36527' />
+ <nd ref='-41975' />
+ <nd ref='-39927' />
+ <nd ref='-39929' />
+ <nd ref='-41973' />
+ <nd ref='-32615' />
+ <nd ref='-32589' />
+ <nd ref='-32585' />
+ <nd ref='-32583' />
+ <nd ref='-32581' />
+ <nd ref='-32587' />
+ <nd ref='-32611' />
+ <nd ref='-32609' />
+ <nd ref='-32605' />
+ <nd ref='-32607' />
+ <nd ref='-32603' />
+ <nd ref='-32601' />
+ <nd ref='-32599' />
+ <nd ref='-32597' />
+ <nd ref='-32591' />
+ <nd ref='-32595' />
+ <nd ref='-32593' />
+ <nd ref='-32613' />
+ <nd ref='-32579' />
+ <nd ref='-32577' />
+ <nd ref='-32575' />
+ <nd ref='-32573' />
+ <nd ref='-32565' />
+ <nd ref='-32567' />
+ <nd ref='-32563' />
+ <nd ref='-32561' />
+ <nd ref='-32569' />
+ <nd ref='-32557' />
+ <nd ref='-32555' />
+ <nd ref='-32559' />
+ <nd ref='-32551' />
+ <nd ref='-32549' />
+ <nd ref='-32553' />
+ <nd ref='-32547' />
+ <nd ref='-32541' />
+ <nd ref='-32539' />
+ <nd ref='-32543' />
+ <nd ref='-32545' />
+ <nd ref='-32571' />
+ <nd ref='-32617' />
+ <nd ref='-32531' />
+ <nd ref='-32529' />
+ <nd ref='-32535' />
+ <nd ref='-32533' />
+ <nd ref='-32537' />
+ <nd ref='-32515' />
+ <nd ref='-32517' />
+ <nd ref='-32519' />
+ <nd ref='-32527' />
+ <nd ref='-32521' />
+ <nd ref='-32523' />
+ <nd ref='-32525' />
+ <nd ref='-32511' />
+ <nd ref='-32513' />
+ <nd ref='-32509' />
+ <nd ref='-32507' />
+ <nd ref='-32505' />
+ <nd ref='-39931' />
+ <nd ref='-32619' />
+ <nd ref='-32621' />
+ <nd ref='-32623' />
+ <nd ref='-32625' />
+ <nd ref='-39951' />
+ <nd ref='-49857' />
+ <nd ref='-49859' />
+ <nd ref='-49861' />
+ <nd ref='-39913' />
+ <nd ref='-49855' />
+ <nd ref='-49851' />
+ <nd ref='-49853' />
+ <nd ref='-39949' />
+ <nd ref='-49845' />
+ <nd ref='-49843' />
+ <nd ref='-49849' />
+ <nd ref='-49847' />
+ <nd ref='-49841' />
+ <nd ref='-49839' />
+ <nd ref='-49837' />
+ <nd ref='-49835' />
+ <nd ref='-39915' />
+ <nd ref='-49833' />
+ <nd ref='-49831' />
+ <nd ref='-39917' />
+ <nd ref='-49825' />
+ <nd ref='-49827' />
+ <nd ref='-49829' />
+ <nd ref='-49823' />
+ <nd ref='-49821' />
+ <nd ref='-39919' />
+ <nd ref='-49817' />
+ <nd ref='-49815' />
+ <nd ref='-49819' />
+ <nd ref='-49813' />
+ <nd ref='-49811' />
+ <nd ref='-49809' />
+ <nd ref='-39921' />
+ <nd ref='-49807' />
+ <nd ref='-49805' />
+ <nd ref='-49803' />
+ <nd ref='-49801' />
+ <nd ref='-49799' />
+ <nd ref='-37781' />
+ <nd ref='-37779' />
+ <nd ref='-37777' />
+ <nd ref='-49795' />
+ <nd ref='-49793' />
+ <nd ref='-49785' />
+ <nd ref='-49787' />
+ <nd ref='-49789' />
+ <nd ref='-49791' />
+ <nd ref='-37775' />
+ <nd ref='-49783' />
+ <nd ref='-37773' />
+ <nd ref='-49775' />
+ <nd ref='-49781' />
+ <nd ref='-49779' />
+ <nd ref='-49777' />
+ <nd ref='-49773' />
+ <nd ref='-49771' />
+ <nd ref='-49763' />
+ <nd ref='-49765' />
+ <nd ref='-49769' />
+ <nd ref='-49767' />
+ <nd ref='-49761' />
+ <nd ref='-49759' />
+ <nd ref='-49757' />
+ <nd ref='-37807' />
+ <nd ref='-49755' />
+ <nd ref='-49753' />
+ <nd ref='-49751' />
+ <nd ref='-49749' />
+ <nd ref='-49743' />
+ <nd ref='-49747' />
+ <nd ref='-49745' />
+ <nd ref='-49741' />
+ <nd ref='-37805' />
+ <nd ref='-37803' />
+ <nd ref='-49733' />
+ <nd ref='-49735' />
+ <nd ref='-49739' />
+ <nd ref='-49737' />
+ <nd ref='-49723' />
+ <nd ref='-49725' />
+ <nd ref='-49731' />
+ <nd ref='-49729' />
+ <nd ref='-49727' />
+ <nd ref='-37801' />
+ <nd ref='-49721' />
+ <nd ref='-49719' />
+ <nd ref='-37799' />
+ <nd ref='-49711' />
+ <nd ref='-49715' />
+ <nd ref='-49717' />
+ <nd ref='-49713' />
+ <nd ref='-37797' />
+ <nd ref='-49709' />
+ <nd ref='-49701' />
+ <nd ref='-49705' />
+ <nd ref='-49707' />
+ <nd ref='-49703' />
+ <nd ref='-49699' />
+ <nd ref='-37795' />
+ <nd ref='-37793' />
+ <nd ref='-37791' />
+ <nd ref='-39923' />
+ <nd ref='-39925' />
+ <tag k='ISO3166-1:alpha2' v='HR' />
+ <tag k='name:en' v='Croatia' />
+ </way>
+ <way id='-57629'>
+ <nd ref='-39933' />
+ <nd ref='-51153' />
+ <nd ref='-51155' />
+ <nd ref='-39935' />
+ <nd ref='-51015' />
+ <nd ref='-51017' />
+ <nd ref='-51021' />
+ <nd ref='-51023' />
+ <nd ref='-51019' />
+ <nd ref='-51031' />
+ <nd ref='-51033' />
+ <nd ref='-51025' />
+ <nd ref='-51029' />
+ <nd ref='-51027' />
+ <nd ref='-39937' />
+ <nd ref='-51035' />
+ <nd ref='-51039' />
+ <nd ref='-51041' />
+ <nd ref='-51037' />
+ <nd ref='-51049' />
+ <nd ref='-51047' />
+ <nd ref='-51045' />
+ <nd ref='-51043' />
+ <nd ref='-51059' />
+ <nd ref='-51057' />
+ <nd ref='-51055' />
+ <nd ref='-51053' />
+ <nd ref='-51051' />
+ <nd ref='-51077' />
+ <nd ref='-51079' />
+ <nd ref='-51073' />
+ <nd ref='-51075' />
+ <nd ref='-51065' />
+ <nd ref='-51067' />
+ <nd ref='-51069' />
+ <nd ref='-51071' />
+ <nd ref='-51063' />
+ <nd ref='-51061' />
+ <nd ref='-39939' />
+ <nd ref='-51091' />
+ <nd ref='-51089' />
+ <nd ref='-51087' />
+ <nd ref='-51085' />
+ <nd ref='-51083' />
+ <nd ref='-51093' />
+ <nd ref='-51081' />
+ <nd ref='-51103' />
+ <nd ref='-51101' />
+ <nd ref='-51099' />
+ <nd ref='-51097' />
+ <nd ref='-39941' />
+ <nd ref='-51095' />
+ <nd ref='-39943' />
+ <nd ref='-39945' />
+ <nd ref='-50047' />
+ <nd ref='-50045' />
+ <nd ref='-50043' />
+ <nd ref='-50041' />
+ <nd ref='-50039' />
+ <nd ref='-41937' />
+ <nd ref='-50049' />
+ <nd ref='-50051' />
+ <nd ref='-39947' />
+ <nd ref='-50053' />
+ <nd ref='-39915' />
+ <nd ref='-49835' />
+ <nd ref='-49837' />
+ <nd ref='-49839' />
+ <nd ref='-49841' />
+ <nd ref='-49847' />
+ <nd ref='-49849' />
+ <nd ref='-49843' />
+ <nd ref='-49845' />
+ <nd ref='-39949' />
+ <nd ref='-49853' />
+ <nd ref='-49851' />
+ <nd ref='-49855' />
+ <nd ref='-39913' />
+ <nd ref='-49861' />
+ <nd ref='-49859' />
+ <nd ref='-49857' />
+ <nd ref='-39951' />
+ <nd ref='-32627' />
+ <nd ref='-39953' />
+ <nd ref='-39955' />
+ <nd ref='-32629' />
+ <nd ref='-32631' />
+ <nd ref='-32633' />
+ <nd ref='-32637' />
+ <nd ref='-32635' />
+ <nd ref='-32639' />
+ <nd ref='-32641' />
+ <nd ref='-32643' />
+ <nd ref='-32645' />
+ <nd ref='-32647' />
+ <nd ref='-32649' />
+ <nd ref='-32651' />
+ <nd ref='-37215' />
+ <nd ref='-49683' />
+ <nd ref='-49685' />
+ <nd ref='-37213' />
+ <nd ref='-49667' />
+ <nd ref='-49669' />
+ <nd ref='-49671' />
+ <nd ref='-49673' />
+ <nd ref='-49675' />
+ <nd ref='-49677' />
+ <nd ref='-49681' />
+ <nd ref='-49679' />
+ <nd ref='-37211' />
+ <nd ref='-49663' />
+ <nd ref='-49665' />
+ <nd ref='-49661' />
+ <nd ref='-37209' />
+ <nd ref='-37207' />
+ <nd ref='-37205' />
+ <nd ref='-49659' />
+ <nd ref='-49657' />
+ <nd ref='-49655' />
+ <nd ref='-49649' />
+ <nd ref='-49651' />
+ <nd ref='-49653' />
+ <nd ref='-37203' />
+ <nd ref='-49633' />
+ <nd ref='-49635' />
+ <nd ref='-49639' />
+ <nd ref='-49643' />
+ <nd ref='-49641' />
+ <nd ref='-49637' />
+ <nd ref='-49645' />
+ <nd ref='-49647' />
+ <nd ref='-49627' />
+ <nd ref='-49629' />
+ <nd ref='-49631' />
+ <nd ref='-49625' />
+ <nd ref='-37201' />
+ <nd ref='-51105' />
+ <nd ref='-51107' />
+ <nd ref='-51109' />
+ <nd ref='-51111' />
+ <nd ref='-51115' />
+ <nd ref='-51117' />
+ <nd ref='-51119' />
+ <nd ref='-51113' />
+ <nd ref='-51121' />
+ <nd ref='-51125' />
+ <nd ref='-51123' />
+ <nd ref='-51133' />
+ <nd ref='-51127' />
+ <nd ref='-51129' />
+ <nd ref='-51131' />
+ <nd ref='-51135' />
+ <nd ref='-51137' />
+ <nd ref='-51139' />
+ <nd ref='-51141' />
+ <nd ref='-51143' />
+ <nd ref='-39957' />
+ <nd ref='-39959' />
+ <nd ref='-51145' />
+ <nd ref='-51147' />
+ <nd ref='-51149' />
+ <nd ref='-51151' />
+ <nd ref='-39933' />
+ <tag k='ISO3166-1:alpha2' v='HU' />
+ <tag k='maxspeed:motorway' v='130' />
+ <tag k='maxspeed:rural' v='90' />
+ <tag k='maxspeed:source' v='http://ec.europa.eu/transport/road_safety/going_abroad/hungary/speed_limits_en.htm' />
+ <tag k='maxspeed:trunk' v='110' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Hungary' />
+ </way>
+ <way id='-57631'>
+ <nd ref='-38523' />
+ <nd ref='-53157' />
+ <nd ref='-53155' />
+ <nd ref='-53159' />
+ <nd ref='-53161' />
+ <nd ref='-53165' />
+ <nd ref='-53167' />
+ <nd ref='-53163' />
+ <nd ref='-53169' />
+ <nd ref='-38521' />
+ <nd ref='-53195' />
+ <nd ref='-53193' />
+ <nd ref='-53191' />
+ <nd ref='-53187' />
+ <nd ref='-53189' />
+ <nd ref='-53185' />
+ <nd ref='-53183' />
+ <nd ref='-53181' />
+ <nd ref='-53179' />
+ <nd ref='-53177' />
+ <nd ref='-53175' />
+ <nd ref='-53173' />
+ <nd ref='-53171' />
+ <nd ref='-38519' />
+ <nd ref='-53197' />
+ <nd ref='-53205' />
+ <nd ref='-53203' />
+ <nd ref='-53201' />
+ <nd ref='-53199' />
+ <nd ref='-38517' />
+ <nd ref='-53207' />
+ <nd ref='-53209' />
+ <nd ref='-53211' />
+ <nd ref='-53213' />
+ <nd ref='-53219' />
+ <nd ref='-53221' />
+ <nd ref='-53217' />
+ <nd ref='-53215' />
+ <nd ref='-38515' />
+ <nd ref='-38513' />
+ <nd ref='-38511' />
+ <nd ref='-53225' />
+ <nd ref='-53223' />
+ <nd ref='-53235' />
+ <nd ref='-53229' />
+ <nd ref='-53227' />
+ <nd ref='-53233' />
+ <nd ref='-53231' />
+ <nd ref='-38509' />
+ <nd ref='-53239' />
+ <nd ref='-53237' />
+ <nd ref='-38507' />
+ <nd ref='-53241' />
+ <nd ref='-53243' />
+ <nd ref='-53245' />
+ <nd ref='-53247' />
+ <nd ref='-53249' />
+ <nd ref='-53253' />
+ <nd ref='-53257' />
+ <nd ref='-53255' />
+ <nd ref='-53251' />
+ <nd ref='-53261' />
+ <nd ref='-53269' />
+ <nd ref='-53271' />
+ <nd ref='-53263' />
+ <nd ref='-53267' />
+ <nd ref='-53265' />
+ <nd ref='-53259' />
+ <nd ref='-53273' />
+ <nd ref='-53275' />
+ <nd ref='-53277' />
+ <nd ref='-53279' />
+ <nd ref='-53281' />
+ <nd ref='-53283' />
+ <nd ref='-53285' />
+ <nd ref='-53287' />
+ <nd ref='-53289' />
+ <nd ref='-53291' />
+ <nd ref='-53305' />
+ <nd ref='-53303' />
+ <nd ref='-53301' />
+ <nd ref='-53299' />
+ <nd ref='-53295' />
+ <nd ref='-53297' />
+ <nd ref='-53293' />
+ <nd ref='-41547' />
+ <nd ref='-32143' />
+ <nd ref='-32141' />
+ <nd ref='-32139' />
+ <nd ref='-32137' />
+ <nd ref='-32133' />
+ <nd ref='-32135' />
+ <nd ref='-32127' />
+ <nd ref='-32131' />
+ <nd ref='-32129' />
+ <nd ref='-32145' />
+ <nd ref='-32125' />
+ <nd ref='-32123' />
+ <nd ref='-32121' />
+ <nd ref='-32109' />
+ <nd ref='-32113' />
+ <nd ref='-32111' />
+ <nd ref='-32115' />
+ <nd ref='-32117' />
+ <nd ref='-32119' />
+ <nd ref='-41545' />
+ <nd ref='-32105' />
+ <nd ref='-32103' />
+ <nd ref='-32107' />
+ <nd ref='-32149' />
+ <nd ref='-32147' />
+ <nd ref='-32153' />
+ <nd ref='-32151' />
+ <nd ref='-32163' />
+ <nd ref='-32157' />
+ <nd ref='-32155' />
+ <nd ref='-32159' />
+ <nd ref='-32161' />
+ <nd ref='-32195' />
+ <nd ref='-32193' />
+ <nd ref='-32187' />
+ <nd ref='-32189' />
+ <nd ref='-32191' />
+ <nd ref='-32185' />
+ <nd ref='-32183' />
+ <nd ref='-32181' />
+ <nd ref='-32179' />
+ <nd ref='-32177' />
+ <nd ref='-32169' />
+ <nd ref='-32167' />
+ <nd ref='-32165' />
+ <nd ref='-32171' />
+ <nd ref='-32175' />
+ <nd ref='-32173' />
+ <nd ref='-32309' />
+ <nd ref='-32205' />
+ <nd ref='-32207' />
+ <nd ref='-32209' />
+ <nd ref='-32203' />
+ <nd ref='-32201' />
+ <nd ref='-32197' />
+ <nd ref='-32199' />
+ <nd ref='-32211' />
+ <nd ref='-32215' />
+ <nd ref='-32213' />
+ <nd ref='-32239' />
+ <nd ref='-32225' />
+ <nd ref='-32221' />
+ <nd ref='-32223' />
+ <nd ref='-32219' />
+ <nd ref='-32217' />
+ <nd ref='-32227' />
+ <nd ref='-32229' />
+ <nd ref='-32233' />
+ <nd ref='-32231' />
+ <nd ref='-32237' />
+ <nd ref='-32235' />
+ <nd ref='-32307' />
+ <nd ref='-32247' />
+ <nd ref='-32249' />
+ <nd ref='-32241' />
+ <nd ref='-32243' />
+ <nd ref='-32245' />
+ <nd ref='-32273' />
+ <nd ref='-32271' />
+ <nd ref='-32269' />
+ <nd ref='-32265' />
+ <nd ref='-32267' />
+ <nd ref='-32251' />
+ <nd ref='-32255' />
+ <nd ref='-32257' />
+ <nd ref='-32253' />
+ <nd ref='-32263' />
+ <nd ref='-32261' />
+ <nd ref='-32259' />
+ <nd ref='-32305' />
+ <nd ref='-32301' />
+ <nd ref='-32299' />
+ <nd ref='-32297' />
+ <nd ref='-32295' />
+ <nd ref='-32303' />
+ <nd ref='-32293' />
+ <nd ref='-32291' />
+ <nd ref='-32275' />
+ <nd ref='-32289' />
+ <nd ref='-32277' />
+ <nd ref='-32285' />
+ <nd ref='-32283' />
+ <nd ref='-32281' />
+ <nd ref='-32279' />
+ <nd ref='-32287' />
+ <nd ref='-39979' />
+ <nd ref='-32325' />
+ <nd ref='-32323' />
+ <nd ref='-32321' />
+ <nd ref='-32319' />
+ <nd ref='-32327' />
+ <nd ref='-32313' />
+ <nd ref='-32315' />
+ <nd ref='-32311' />
+ <nd ref='-32317' />
+ <nd ref='-41543' />
+ <nd ref='-38505' />
+ <nd ref='-52725' />
+ <nd ref='-52731' />
+ <nd ref='-52721' />
+ <nd ref='-52723' />
+ <nd ref='-52729' />
+ <nd ref='-52727' />
+ <nd ref='-37985' />
+ <nd ref='-32739' />
+ <nd ref='-32741' />
+ <nd ref='-32743' />
+ <nd ref='-32733' />
+ <nd ref='-32737' />
+ <nd ref='-32735' />
+ <nd ref='-32745' />
+ <nd ref='-37983' />
+ <nd ref='-32747' />
+ <nd ref='-32751' />
+ <nd ref='-32749' />
+ <nd ref='-32753' />
+ <nd ref='-32755' />
+ <nd ref='-37981' />
+ <nd ref='-32757' />
+ <nd ref='-37979' />
+ <nd ref='-37977' />
+ <nd ref='-53117' />
+ <nd ref='-53119' />
+ <nd ref='-53129' />
+ <nd ref='-53127' />
+ <nd ref='-53131' />
+ <nd ref='-53133' />
+ <nd ref='-53125' />
+ <nd ref='-53123' />
+ <nd ref='-53121' />
+ <nd ref='-38503' />
+ <nd ref='-53115' />
+ <nd ref='-53113' />
+ <nd ref='-53111' />
+ <nd ref='-53109' />
+ <nd ref='-38501' />
+ <nd ref='-38499' />
+ <nd ref='-53107' />
+ <nd ref='-53105' />
+ <nd ref='-38497' />
+ <nd ref='-53079' />
+ <nd ref='-53083' />
+ <nd ref='-53101' />
+ <nd ref='-53103' />
+ <nd ref='-53081' />
+ <nd ref='-53085' />
+ <nd ref='-53091' />
+ <nd ref='-53093' />
+ <nd ref='-53095' />
+ <nd ref='-53087' />
+ <nd ref='-53089' />
+ <nd ref='-53097' />
+ <nd ref='-53099' />
+ <nd ref='-38495' />
+ <nd ref='-53059' />
+ <nd ref='-53075' />
+ <nd ref='-53077' />
+ <nd ref='-53073' />
+ <nd ref='-53071' />
+ <nd ref='-53069' />
+ <nd ref='-53061' />
+ <nd ref='-53065' />
+ <nd ref='-53063' />
+ <nd ref='-53067' />
+ <nd ref='-38493' />
+ <nd ref='-53043' />
+ <nd ref='-53041' />
+ <nd ref='-53045' />
+ <nd ref='-53039' />
+ <nd ref='-53047' />
+ <nd ref='-53053' />
+ <nd ref='-53055' />
+ <nd ref='-53057' />
+ <nd ref='-53051' />
+ <nd ref='-53049' />
+ <nd ref='-38491' />
+ <nd ref='-53031' />
+ <nd ref='-53035' />
+ <nd ref='-53037' />
+ <nd ref='-53033' />
+ <nd ref='-53029' />
+ <nd ref='-39981' />
+ <nd ref='-39983' />
+ <nd ref='-53027' />
+ <nd ref='-53015' />
+ <nd ref='-53017' />
+ <nd ref='-53023' />
+ <nd ref='-53025' />
+ <nd ref='-53021' />
+ <nd ref='-53019' />
+ <nd ref='-39985' />
+ <nd ref='-53009' />
+ <nd ref='-53013' />
+ <nd ref='-53011' />
+ <nd ref='-53007' />
+ <nd ref='-53005' />
+ <nd ref='-39987' />
+ <nd ref='-53003' />
+ <nd ref='-53001' />
+ <nd ref='-52999' />
+ <nd ref='-52997' />
+ <nd ref='-39989' />
+ <nd ref='-52995' />
+ <nd ref='-39991' />
+ <nd ref='-52991' />
+ <nd ref='-52993' />
+ <nd ref='-52989' />
+ <nd ref='-52987' />
+ <nd ref='-52973' />
+ <nd ref='-52975' />
+ <nd ref='-52983' />
+ <nd ref='-52985' />
+ <nd ref='-52981' />
+ <nd ref='-52979' />
+ <nd ref='-52977' />
+ <nd ref='-39993' />
+ <nd ref='-52971' />
+ <nd ref='-39995' />
+ <nd ref='-52969' />
+ <nd ref='-52967' />
+ <nd ref='-52965' />
+ <nd ref='-39997' />
+ <nd ref='-39999' />
+ <nd ref='-52963' />
+ <nd ref='-52961' />
+ <nd ref='-52959' />
+ <nd ref='-40001' />
+ <nd ref='-52951' />
+ <nd ref='-52949' />
+ <nd ref='-52947' />
+ <nd ref='-52955' />
+ <nd ref='-52953' />
+ <nd ref='-52957' />
+ <nd ref='-40003' />
+ <nd ref='-40005' />
+ <nd ref='-52945' />
+ <nd ref='-52939' />
+ <nd ref='-52933' />
+ <nd ref='-52937' />
+ <nd ref='-52935' />
+ <nd ref='-52943' />
+ <nd ref='-52941' />
+ <nd ref='-52907' />
+ <nd ref='-52931' />
+ <nd ref='-52929' />
+ <nd ref='-52927' />
+ <nd ref='-52925' />
+ <nd ref='-52923' />
+ <nd ref='-52921' />
+ <nd ref='-52919' />
+ <nd ref='-52917' />
+ <nd ref='-52915' />
+ <nd ref='-52913' />
+ <nd ref='-52909' />
+ <nd ref='-52911' />
+ <nd ref='-37693' />
+ <nd ref='-50483' />
+ <nd ref='-37691' />
+ <nd ref='-50481' />
+ <nd ref='-50479' />
+ <nd ref='-50471' />
+ <nd ref='-50473' />
+ <nd ref='-50477' />
+ <nd ref='-50475' />
+ <nd ref='-50467' />
+ <nd ref='-50469' />
+ <nd ref='-37689' />
+ <nd ref='-37687' />
+ <nd ref='-50465' />
+ <nd ref='-37685' />
+ <nd ref='-50463' />
+ <nd ref='-50461' />
+ <nd ref='-50459' />
+ <nd ref='-50457' />
+ <nd ref='-50455' />
+ <nd ref='-37683' />
+ <nd ref='-50447' />
+ <nd ref='-50449' />
+ <nd ref='-50451' />
+ <nd ref='-50453' />
+ <nd ref='-37681' />
+ <nd ref='-50433' />
+ <nd ref='-50435' />
+ <nd ref='-50437' />
+ <nd ref='-50439' />
+ <nd ref='-50445' />
+ <nd ref='-50443' />
+ <nd ref='-50441' />
+ <nd ref='-37679' />
+ <nd ref='-50431' />
+ <nd ref='-37677' />
+ <nd ref='-50425' />
+ <nd ref='-50427' />
+ <nd ref='-50429' />
+ <nd ref='-50423' />
+ <nd ref='-50421' />
+ <nd ref='-37675' />
+ <nd ref='-50417' />
+ <nd ref='-50419' />
+ <nd ref='-50415' />
+ <nd ref='-37673' />
+ <nd ref='-50413' />
+ <nd ref='-37671' />
+ <nd ref='-50409' />
+ <nd ref='-50411' />
+ <nd ref='-50407' />
+ <nd ref='-50405' />
+ <nd ref='-50403' />
+ <nd ref='-50401' />
+ <nd ref='-37669' />
+ <nd ref='-50395' />
+ <nd ref='-50393' />
+ <nd ref='-50391' />
+ <nd ref='-50389' />
+ <nd ref='-50399' />
+ <nd ref='-50397' />
+ <nd ref='-50387' />
+ <nd ref='-50385' />
+ <nd ref='-50383' />
+ <nd ref='-50369' />
+ <nd ref='-50371' />
+ <nd ref='-50373' />
+ <nd ref='-50375' />
+ <nd ref='-50377' />
+ <nd ref='-50379' />
+ <nd ref='-50381' />
+ <nd ref='-37725' />
+ <nd ref='-37723' />
+ <nd ref='-37721' />
+ <nd ref='-37719' />
+ <nd ref='-37717' />
+ <nd ref='-37715' />
+ <nd ref='-50367' />
+ <nd ref='-50365' />
+ <nd ref='-50363' />
+ <nd ref='-50361' />
+ <nd ref='-50359' />
+ <nd ref='-50357' />
+ <nd ref='-50355' />
+ <nd ref='-50341' />
+ <nd ref='-50339' />
+ <nd ref='-50353' />
+ <nd ref='-50351' />
+ <nd ref='-50349' />
+ <nd ref='-50347' />
+ <nd ref='-50343' />
+ <nd ref='-50345' />
+ <nd ref='-37713' />
+ <nd ref='-37711' />
+ <nd ref='-37709' />
+ <nd ref='-50331' />
+ <nd ref='-50335' />
+ <nd ref='-50333' />
+ <nd ref='-50337' />
+ <nd ref='-50329' />
+ <nd ref='-37707' />
+ <nd ref='-50327' />
+ <nd ref='-37705' />
+ <nd ref='-50321' />
+ <nd ref='-50319' />
+ <nd ref='-50323' />
+ <nd ref='-50325' />
+ <nd ref='-37703' />
+ <nd ref='-37701' />
+ <nd ref='-50317' />
+ <nd ref='-40007' />
+ <nd ref='-37699' />
+ <nd ref='-40009' />
+ <nd ref='-42909' />
+ <nd ref='-42911' />
+ <nd ref='-42913' />
+ <nd ref='-42781' />
+ <nd ref='-42783' />
+ <nd ref='-42511' />
+ <nd ref='-42513' />
+ <nd ref='-40011' />
+ <nd ref='-42505' />
+ <nd ref='-40013' />
+ <nd ref='-42589' />
+ <nd ref='-42585' />
+ <nd ref='-42587' />
+ <nd ref='-40015' />
+ <nd ref='-40017' />
+ <nd ref='-40019' />
+ <nd ref='-40021' />
+ <nd ref='-40023' />
+ <nd ref='-40025' />
+ <nd ref='-40027' />
+ <nd ref='-40029' />
+ <nd ref='-40031' />
+ <nd ref='-40033' />
+ <nd ref='-40035' />
+ <nd ref='-40037' />
+ <nd ref='-40039' />
+ <nd ref='-40041' />
+ <nd ref='-40043' />
+ <nd ref='-40045' />
+ <nd ref='-40047' />
+ <nd ref='-40049' />
+ <nd ref='-40051' />
+ <nd ref='-40053' />
+ <nd ref='-40055' />
+ <nd ref='-40057' />
+ <nd ref='-40059' />
+ <nd ref='-40061' />
+ <nd ref='-40063' />
+ <nd ref='-40065' />
+ <nd ref='-40067' />
+ <nd ref='-40069' />
+ <nd ref='-40071' />
+ <nd ref='-40073' />
+ <nd ref='-40075' />
+ <nd ref='-40077' />
+ <nd ref='-40079' />
+ <nd ref='-40081' />
+ <nd ref='-40083' />
+ <nd ref='-40085' />
+ <nd ref='-40087' />
+ <nd ref='-40089' />
+ <nd ref='-36359' />
+ <nd ref='-36357' />
+ <nd ref='-36355' />
+ <nd ref='-36353' />
+ <nd ref='-36351' />
+ <nd ref='-40091' />
+ <nd ref='-36349' />
+ <nd ref='-36347' />
+ <nd ref='-36345' />
+ <nd ref='-36343' />
+ <nd ref='-36341' />
+ <nd ref='-36339' />
+ <nd ref='-36337' />
+ <nd ref='-36335' />
+ <nd ref='-40093' />
+ <nd ref='-40095' />
+ <nd ref='-40097' />
+ <nd ref='-53307' />
+ <nd ref='-53309' />
+ <nd ref='-53311' />
+ <nd ref='-53313' />
+ <nd ref='-53315' />
+ <nd ref='-53317' />
+ <nd ref='-53319' />
+ <nd ref='-53321' />
+ <nd ref='-53323' />
+ <nd ref='-40099' />
+ <nd ref='-40101' />
+ <nd ref='-40103' />
+ <nd ref='-53325' />
+ <nd ref='-53327' />
+ <nd ref='-53331' />
+ <nd ref='-53329' />
+ <nd ref='-53333' />
+ <nd ref='-53335' />
+ <nd ref='-53337' />
+ <nd ref='-53345' />
+ <nd ref='-53343' />
+ <nd ref='-53341' />
+ <nd ref='-53339' />
+ <nd ref='-40105' />
+ <nd ref='-40107' />
+ <nd ref='-53347' />
+ <nd ref='-53349' />
+ <nd ref='-53351' />
+ <nd ref='-53353' />
+ <nd ref='-53363' />
+ <nd ref='-53361' />
+ <nd ref='-53359' />
+ <nd ref='-53357' />
+ <nd ref='-53355' />
+ <nd ref='-40109' />
+ <nd ref='-53365' />
+ <nd ref='-53371' />
+ <nd ref='-53373' />
+ <nd ref='-53375' />
+ <nd ref='-53369' />
+ <nd ref='-53367' />
+ <nd ref='-40111' />
+ <nd ref='-40113' />
+ <nd ref='-40115' />
+ <nd ref='-40117' />
+ <nd ref='-40119' />
+ <nd ref='-40121' />
+ <nd ref='-53377' />
+ <nd ref='-53379' />
+ <nd ref='-53381' />
+ <nd ref='-40123' />
+ <nd ref='-40125' />
+ <nd ref='-53385' />
+ <nd ref='-53387' />
+ <nd ref='-53383' />
+ <nd ref='-40127' />
+ <nd ref='-40129' />
+ <nd ref='-40131' />
+ <nd ref='-40133' />
+ <nd ref='-40135' />
+ <nd ref='-40137' />
+ <nd ref='-40139' />
+ <nd ref='-40141' />
+ <nd ref='-40143' />
+ <nd ref='-40145' />
+ <nd ref='-40147' />
+ <nd ref='-40149' />
+ <nd ref='-40151' />
+ <nd ref='-40153' />
+ <nd ref='-53389' />
+ <nd ref='-40155' />
+ <nd ref='-40157' />
+ <nd ref='-53395' />
+ <nd ref='-53393' />
+ <nd ref='-53399' />
+ <nd ref='-53401' />
+ <nd ref='-53397' />
+ <nd ref='-53391' />
+ <nd ref='-40159' />
+ <nd ref='-40161' />
+ <nd ref='-53403' />
+ <nd ref='-53405' />
+ <nd ref='-40163' />
+ <nd ref='-53407' />
+ <nd ref='-53409' />
+ <nd ref='-53413' />
+ <nd ref='-53415' />
+ <nd ref='-53417' />
+ <nd ref='-53419' />
+ <nd ref='-53411' />
+ <nd ref='-40165' />
+ <nd ref='-53425' />
+ <nd ref='-53423' />
+ <nd ref='-53421' />
+ <nd ref='-53427' />
+ <nd ref='-40167' />
+ <nd ref='-40169' />
+ <nd ref='-40171' />
+ <nd ref='-40173' />
+ <nd ref='-53431' />
+ <nd ref='-53439' />
+ <nd ref='-53437' />
+ <nd ref='-53435' />
+ <nd ref='-53433' />
+ <nd ref='-53429' />
+ <nd ref='-53443' />
+ <nd ref='-53441' />
+ <nd ref='-53445' />
+ <nd ref='-53447' />
+ <nd ref='-40175' />
+ <nd ref='-53449' />
+ <nd ref='-53451' />
+ <nd ref='-53453' />
+ <nd ref='-53455' />
+ <nd ref='-40177' />
+ <nd ref='-40179' />
+ <nd ref='-40181' />
+ <nd ref='-53457' />
+ <nd ref='-53463' />
+ <nd ref='-53465' />
+ <nd ref='-53467' />
+ <nd ref='-53469' />
+ <nd ref='-53471' />
+ <nd ref='-53461' />
+ <nd ref='-53459' />
+ <nd ref='-53473' />
+ <nd ref='-53475' />
+ <nd ref='-53477' />
+ <nd ref='-53481' />
+ <nd ref='-53479' />
+ <nd ref='-53483' />
+ <nd ref='-53485' />
+ <nd ref='-53489' />
+ <nd ref='-53493' />
+ <nd ref='-53491' />
+ <nd ref='-53487' />
+ <nd ref='-40183' />
+ <nd ref='-40185' />
+ <nd ref='-53495' />
+ <nd ref='-40187' />
+ <nd ref='-53497' />
+ <nd ref='-53501' />
+ <nd ref='-53499' />
+ <nd ref='-40189' />
+ <nd ref='-53513' />
+ <nd ref='-53509' />
+ <nd ref='-53511' />
+ <nd ref='-53503' />
+ <nd ref='-53505' />
+ <nd ref='-53507' />
+ <nd ref='-40191' />
+ <nd ref='-40193' />
+ <nd ref='-53515' />
+ <nd ref='-40195' />
+ <nd ref='-53525' />
+ <nd ref='-53527' />
+ <nd ref='-53529' />
+ <nd ref='-53523' />
+ <nd ref='-53521' />
+ <nd ref='-53519' />
+ <nd ref='-53517' />
+ <nd ref='-38525' />
+ <nd ref='-53135' />
+ <nd ref='-53137' />
+ <nd ref='-53145' />
+ <nd ref='-53141' />
+ <nd ref='-53143' />
+ <nd ref='-53139' />
+ <nd ref='-53147' />
+ <nd ref='-53149' />
+ <nd ref='-53153' />
+ <nd ref='-53151' />
+ <nd ref='-38523' />
+ <tag k='ISO3166-1:alpha2' v='IN' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='India' />
+ </way>
+ <way id='-57633'>
+ <nd ref='-37261' />
+ <nd ref='-47729' />
+ <nd ref='-47731' />
+ <nd ref='-47733' />
+ <nd ref='-47735' />
+ <nd ref='-47749' />
+ <nd ref='-47751' />
+ <nd ref='-47739' />
+ <nd ref='-47741' />
+ <nd ref='-47743' />
+ <nd ref='-47745' />
+ <nd ref='-47747' />
+ <nd ref='-47737' />
+ <nd ref='-37259' />
+ <nd ref='-47665' />
+ <nd ref='-47667' />
+ <nd ref='-37145' />
+ <nd ref='-47753' />
+ <nd ref='-47755' />
+ <nd ref='-47757' />
+ <nd ref='-47759' />
+ <nd ref='-47761' />
+ <nd ref='-47763' />
+ <nd ref='-37291' />
+ <nd ref='-37289' />
+ <nd ref='-37287' />
+ <nd ref='-47765' />
+ <nd ref='-47767' />
+ <nd ref='-47769' />
+ <nd ref='-47771' />
+ <nd ref='-37285' />
+ <nd ref='-47773' />
+ <nd ref='-37283' />
+ <nd ref='-47775' />
+ <nd ref='-37281' />
+ <nd ref='-37279' />
+ <nd ref='-37277' />
+ <nd ref='-37275' />
+ <nd ref='-37273' />
+ <nd ref='-47777' />
+ <nd ref='-47779' />
+ <nd ref='-47781' />
+ <nd ref='-47783' />
+ <nd ref='-37271' />
+ <nd ref='-37269' />
+ <nd ref='-40199' />
+ <nd ref='-40201' />
+ <nd ref='-50189' />
+ <nd ref='-50187' />
+ <nd ref='-40203' />
+ <nd ref='-50177' />
+ <nd ref='-50185' />
+ <nd ref='-50183' />
+ <nd ref='-50181' />
+ <nd ref='-50179' />
+ <nd ref='-40205' />
+ <nd ref='-50171' />
+ <nd ref='-50173' />
+ <nd ref='-50175' />
+ <nd ref='-50155' />
+ <nd ref='-50157' />
+ <nd ref='-50159' />
+ <nd ref='-50167' />
+ <nd ref='-50169' />
+ <nd ref='-50163' />
+ <nd ref='-50165' />
+ <nd ref='-50161' />
+ <nd ref='-40207' />
+ <nd ref='-50153' />
+ <nd ref='-40209' />
+ <nd ref='-40211' />
+ <nd ref='-50151' />
+ <nd ref='-50141' />
+ <nd ref='-50143' />
+ <nd ref='-50147' />
+ <nd ref='-50149' />
+ <nd ref='-50145' />
+ <nd ref='-40213' />
+ <nd ref='-50133' />
+ <nd ref='-50137' />
+ <nd ref='-50135' />
+ <nd ref='-50139' />
+ <nd ref='-40215' />
+ <nd ref='-40217' />
+ <nd ref='-40219' />
+ <nd ref='-50131' />
+ <nd ref='-50129' />
+ <nd ref='-50121' />
+ <nd ref='-50119' />
+ <nd ref='-50123' />
+ <nd ref='-50127' />
+ <nd ref='-50125' />
+ <nd ref='-36947' />
+ <nd ref='-50117' />
+ <nd ref='-40221' />
+ <nd ref='-50115' />
+ <nd ref='-50113' />
+ <nd ref='-50111' />
+ <nd ref='-50109' />
+ <nd ref='-40223' />
+ <nd ref='-36945' />
+ <nd ref='-36943' />
+ <nd ref='-50105' />
+ <nd ref='-50107' />
+ <nd ref='-40225' />
+ <nd ref='-50099' />
+ <nd ref='-50101' />
+ <nd ref='-50103' />
+ <nd ref='-40227' />
+ <nd ref='-40229' />
+ <nd ref='-36941' />
+ <nd ref='-40231' />
+ <nd ref='-36939' />
+ <nd ref='-36937' />
+ <nd ref='-50089' />
+ <nd ref='-50091' />
+ <nd ref='-50093' />
+ <nd ref='-50097' />
+ <nd ref='-50095' />
+ <nd ref='-40233' />
+ <nd ref='-36935' />
+ <nd ref='-50055' />
+ <nd ref='-40235' />
+ <nd ref='-50057' />
+ <nd ref='-50059' />
+ <nd ref='-40237' />
+ <nd ref='-50061' />
+ <nd ref='-50063' />
+ <nd ref='-40239' />
+ <nd ref='-50065' />
+ <nd ref='-40241' />
+ <nd ref='-40243' />
+ <nd ref='-50067' />
+ <nd ref='-50071' />
+ <nd ref='-50069' />
+ <nd ref='-50075' />
+ <nd ref='-50073' />
+ <nd ref='-40245' />
+ <nd ref='-50079' />
+ <nd ref='-50077' />
+ <nd ref='-40247' />
+ <nd ref='-50081' />
+ <nd ref='-40249' />
+ <nd ref='-50083' />
+ <nd ref='-50085' />
+ <nd ref='-40251' />
+ <nd ref='-50087' />
+ <nd ref='-40253' />
+ <nd ref='-40255' />
+ <nd ref='-40257' />
+ <nd ref='-37027' />
+ <nd ref='-36323' />
+ <nd ref='-41569' />
+ <nd ref='-41567' />
+ <nd ref='-37053' />
+ <nd ref='-34477' />
+ <nd ref='-40259' />
+ <nd ref='-40261' />
+ <nd ref='-40263' />
+ <nd ref='-47395' />
+ <nd ref='-47393' />
+ <nd ref='-47391' />
+ <nd ref='-40265' />
+ <nd ref='-47389' />
+ <nd ref='-47387' />
+ <nd ref='-47385' />
+ <nd ref='-47383' />
+ <nd ref='-47381' />
+ <nd ref='-47379' />
+ <nd ref='-47377' />
+ <nd ref='-47375' />
+ <nd ref='-47373' />
+ <nd ref='-47371' />
+ <nd ref='-47369' />
+ <nd ref='-47367' />
+ <nd ref='-47365' />
+ <nd ref='-47399' />
+ <nd ref='-47397' />
+ <nd ref='-47409' />
+ <nd ref='-47407' />
+ <nd ref='-47405' />
+ <nd ref='-47403' />
+ <nd ref='-47401' />
+ <nd ref='-47411' />
+ <nd ref='-47439' />
+ <nd ref='-47437' />
+ <nd ref='-47435' />
+ <nd ref='-47433' />
+ <nd ref='-47431' />
+ <nd ref='-47429' />
+ <nd ref='-47427' />
+ <nd ref='-47425' />
+ <nd ref='-47423' />
+ <nd ref='-47421' />
+ <nd ref='-47419' />
+ <nd ref='-47417' />
+ <nd ref='-47441' />
+ <nd ref='-47443' />
+ <nd ref='-47445' />
+ <nd ref='-47415' />
+ <nd ref='-47447' />
+ <nd ref='-47449' />
+ <nd ref='-47451' />
+ <nd ref='-47453' />
+ <nd ref='-47455' />
+ <nd ref='-47459' />
+ <nd ref='-47457' />
+ <nd ref='-47461' />
+ <nd ref='-47463' />
+ <nd ref='-47465' />
+ <nd ref='-47413' />
+ <nd ref='-47489' />
+ <nd ref='-47491' />
+ <nd ref='-47493' />
+ <nd ref='-47485' />
+ <nd ref='-47487' />
+ <nd ref='-47483' />
+ <nd ref='-47481' />
+ <nd ref='-47479' />
+ <nd ref='-47477' />
+ <nd ref='-47475' />
+ <nd ref='-47473' />
+ <nd ref='-47471' />
+ <nd ref='-47469' />
+ <nd ref='-47467' />
+ <nd ref='-47495' />
+ <nd ref='-47517' />
+ <nd ref='-47515' />
+ <nd ref='-47513' />
+ <nd ref='-47511' />
+ <nd ref='-47509' />
+ <nd ref='-47507' />
+ <nd ref='-47505' />
+ <nd ref='-47503' />
+ <nd ref='-47501' />
+ <nd ref='-47499' />
+ <nd ref='-47497' />
+ <nd ref='-47523' />
+ <nd ref='-47525' />
+ <nd ref='-47527' />
+ <nd ref='-47529' />
+ <nd ref='-47521' />
+ <nd ref='-47519' />
+ <nd ref='-47539' />
+ <nd ref='-47541' />
+ <nd ref='-47537' />
+ <nd ref='-47535' />
+ <nd ref='-47533' />
+ <nd ref='-47531' />
+ <nd ref='-47543' />
+ <nd ref='-47545' />
+ <nd ref='-47547' />
+ <nd ref='-47549' />
+ <nd ref='-47551' />
+ <nd ref='-40267' />
+ <nd ref='-47361' />
+ <nd ref='-31613' />
+ <nd ref='-31615' />
+ <nd ref='-31621' />
+ <nd ref='-31619' />
+ <nd ref='-31617' />
+ <nd ref='-31629' />
+ <nd ref='-31625' />
+ <nd ref='-31627' />
+ <nd ref='-31623' />
+ <nd ref='-31653' />
+ <nd ref='-31635' />
+ <nd ref='-31651' />
+ <nd ref='-31633' />
+ <nd ref='-31631' />
+ <nd ref='-31649' />
+ <nd ref='-31647' />
+ <nd ref='-31645' />
+ <nd ref='-31637' />
+ <nd ref='-31643' />
+ <nd ref='-31639' />
+ <nd ref='-31641' />
+ <nd ref='-40269' />
+ <nd ref='-31667' />
+ <nd ref='-31657' />
+ <nd ref='-31659' />
+ <nd ref='-31655' />
+ <nd ref='-31665' />
+ <nd ref='-31663' />
+ <nd ref='-31661' />
+ <nd ref='-40271' />
+ <nd ref='-31673' />
+ <nd ref='-31671' />
+ <nd ref='-31669' />
+ <nd ref='-37263' />
+ <nd ref='-47727' />
+ <nd ref='-37261' />
+ <tag k='ISO3166-1:alpha2' v='IR' />
+ <tag k='name:en' v='Iran, Islamic Rep.' />
+ </way>
+ <way id='-57635'>
+ <nd ref='-40273' />
+ <nd ref='-40275' />
+ <nd ref='-47313' />
+ <nd ref='-47315' />
+ <nd ref='-47317' />
+ <nd ref='-47319' />
+ <nd ref='-47321' />
+ <nd ref='-47323' />
+ <nd ref='-47325' />
+ <nd ref='-47327' />
+ <nd ref='-47329' />
+ <nd ref='-47331' />
+ <nd ref='-47333' />
+ <nd ref='-47335' />
+ <nd ref='-47337' />
+ <nd ref='-47339' />
+ <nd ref='-47347' />
+ <nd ref='-47345' />
+ <nd ref='-47343' />
+ <nd ref='-47349' />
+ <nd ref='-47341' />
+ <nd ref='-47359' />
+ <nd ref='-47357' />
+ <nd ref='-47355' />
+ <nd ref='-47353' />
+ <nd ref='-47351' />
+ <nd ref='-47363' />
+ <nd ref='-40267' />
+ <nd ref='-47551' />
+ <nd ref='-47549' />
+ <nd ref='-47547' />
+ <nd ref='-47545' />
+ <nd ref='-47543' />
+ <nd ref='-47531' />
+ <nd ref='-47533' />
+ <nd ref='-47535' />
+ <nd ref='-47537' />
+ <nd ref='-47541' />
+ <nd ref='-47539' />
+ <nd ref='-47519' />
+ <nd ref='-47521' />
+ <nd ref='-47529' />
+ <nd ref='-47527' />
+ <nd ref='-47525' />
+ <nd ref='-47523' />
+ <nd ref='-47497' />
+ <nd ref='-47499' />
+ <nd ref='-47501' />
+ <nd ref='-47503' />
+ <nd ref='-47505' />
+ <nd ref='-47507' />
+ <nd ref='-47509' />
+ <nd ref='-47511' />
+ <nd ref='-47513' />
+ <nd ref='-47515' />
+ <nd ref='-47517' />
+ <nd ref='-47495' />
+ <nd ref='-47467' />
+ <nd ref='-47469' />
+ <nd ref='-47471' />
+ <nd ref='-47473' />
+ <nd ref='-47475' />
+ <nd ref='-47477' />
+ <nd ref='-47479' />
+ <nd ref='-47481' />
+ <nd ref='-47483' />
+ <nd ref='-47487' />
+ <nd ref='-47485' />
+ <nd ref='-47493' />
+ <nd ref='-47491' />
+ <nd ref='-47489' />
+ <nd ref='-47413' />
+ <nd ref='-47465' />
+ <nd ref='-47463' />
+ <nd ref='-47461' />
+ <nd ref='-47457' />
+ <nd ref='-47459' />
+ <nd ref='-47455' />
+ <nd ref='-47453' />
+ <nd ref='-47451' />
+ <nd ref='-47449' />
+ <nd ref='-47447' />
+ <nd ref='-47415' />
+ <nd ref='-47445' />
+ <nd ref='-47443' />
+ <nd ref='-47441' />
+ <nd ref='-47417' />
+ <nd ref='-47419' />
+ <nd ref='-47421' />
+ <nd ref='-47423' />
+ <nd ref='-47425' />
+ <nd ref='-47427' />
+ <nd ref='-47429' />
+ <nd ref='-47431' />
+ <nd ref='-47433' />
+ <nd ref='-47435' />
+ <nd ref='-47437' />
+ <nd ref='-47439' />
+ <nd ref='-47411' />
+ <nd ref='-47401' />
+ <nd ref='-47403' />
+ <nd ref='-47405' />
+ <nd ref='-47407' />
+ <nd ref='-47409' />
+ <nd ref='-47397' />
+ <nd ref='-47399' />
+ <nd ref='-47365' />
+ <nd ref='-47367' />
+ <nd ref='-47369' />
+ <nd ref='-47371' />
+ <nd ref='-47373' />
+ <nd ref='-47375' />
+ <nd ref='-47377' />
+ <nd ref='-47379' />
+ <nd ref='-47381' />
+ <nd ref='-47383' />
+ <nd ref='-47385' />
+ <nd ref='-47387' />
+ <nd ref='-47389' />
+ <nd ref='-40265' />
+ <nd ref='-47391' />
+ <nd ref='-47393' />
+ <nd ref='-47395' />
+ <nd ref='-40263' />
+ <nd ref='-40277' />
+ <nd ref='-34379' />
+ <nd ref='-40719' />
+ <nd ref='-40279' />
+ <nd ref='-40281' />
+ <nd ref='-40283' />
+ <nd ref='-40285' />
+ <nd ref='-34377' />
+ <nd ref='-34375' />
+ <nd ref='-40287' />
+ <nd ref='-40289' />
+ <nd ref='-40291' />
+ <nd ref='-36331' />
+ <nd ref='-40293' />
+ <nd ref='-40295' />
+ <nd ref='-40297' />
+ <nd ref='-40369' />
+ <nd ref='-40367' />
+ <nd ref='-40387' />
+ <nd ref='-40385' />
+ <nd ref='-40383' />
+ <nd ref='-40299' />
+ <nd ref='-40301' />
+ <nd ref='-40303' />
+ <nd ref='-47241' />
+ <nd ref='-40305' />
+ <nd ref='-40307' />
+ <nd ref='-40309' />
+ <nd ref='-40311' />
+ <nd ref='-40313' />
+ <nd ref='-40315' />
+ <nd ref='-40317' />
+ <nd ref='-40319' />
+ <nd ref='-40321' />
+ <nd ref='-40323' />
+ <nd ref='-40325' />
+ <nd ref='-40273' />
+ <tag k='ISO3166-1:alpha2' v='IQ' />
+ <tag k='name:en' v='Iraq' />
+ </way>
+ <way id='-57637'>
+ <nd ref='-53713' />
+ <nd ref='-40331' />
+ <nd ref='-40737' />
+ <nd ref='-40333' />
+ <nd ref='-33651' />
+ <nd ref='-33649' />
+ <nd ref='-33647' />
+ <nd ref='-33645' />
+ <nd ref='-33643' />
+ <nd ref='-33641' />
+ <nd ref='-33639' />
+ <nd ref='-33637' />
+ <nd ref='-40735' />
+ <nd ref='-33673' />
+ <nd ref='-33671' />
+ <nd ref='-33669' />
+ <nd ref='-33667' />
+ <nd ref='-33665' />
+ <nd ref='-33663' />
+ <nd ref='-33661' />
+ <nd ref='-33659' />
+ <nd ref='-33657' />
+ <nd ref='-40733' />
+ <nd ref='-40335' />
+ <nd ref='-33675' />
+ <nd ref='-33677' />
+ <nd ref='-33685' />
+ <nd ref='-33679' />
+ <nd ref='-33681' />
+ <nd ref='-33683' />
+ <nd ref='-33687' />
+ <nd ref='-40327' />
+ <nd ref='-33699' />
+ <nd ref='-33697' />
+ <nd ref='-33693' />
+ <nd ref='-33691' />
+ <nd ref='-33689' />
+ <nd ref='-33695' />
+ <nd ref='-40379' />
+ <nd ref='-33701' />
+ <nd ref='-33703' />
+ <nd ref='-33705' />
+ <nd ref='-53829' />
+ <nd ref='-53827' />
+ <nd ref='-53825' />
+ <nd ref='-53823' />
+ <nd ref='-53821' />
+ <nd ref='-53819' />
+ <nd ref='-53817' />
+ <nd ref='-53815' />
+ <nd ref='-53813' />
+ <nd ref='-53811' />
+ <nd ref='-53809' />
+ <nd ref='-53807' />
+ <nd ref='-53805' />
+ <nd ref='-53803' />
+ <nd ref='-53801' />
+ <nd ref='-53799' />
+ <nd ref='-53797' />
+ <nd ref='-53795' />
+ <nd ref='-53793' />
+ <nd ref='-53791' />
+ <nd ref='-53789' />
+ <nd ref='-53787' />
+ <nd ref='-53785' />
+ <nd ref='-53783' />
+ <nd ref='-53781' />
+ <nd ref='-53779' />
+ <nd ref='-53777' />
+ <nd ref='-53775' />
+ <nd ref='-53773' />
+ <nd ref='-53771' />
+ <nd ref='-53769' />
+ <nd ref='-53767' />
+ <nd ref='-53765' />
+ <nd ref='-53763' />
+ <nd ref='-53761' />
+ <nd ref='-53759' />
+ <nd ref='-53757' />
+ <nd ref='-53755' />
+ <nd ref='-53753' />
+ <nd ref='-53751' />
+ <nd ref='-53749' />
+ <nd ref='-53747' />
+ <nd ref='-53745' />
+ <nd ref='-53743' />
+ <nd ref='-53741' />
+ <nd ref='-53739' />
+ <nd ref='-53737' />
+ <nd ref='-53735' />
+ <nd ref='-53733' />
+ <nd ref='-53731' />
+ <nd ref='-53729' />
+ <nd ref='-53727' />
+ <nd ref='-53725' />
+ <nd ref='-33731' />
+ <nd ref='-33715' />
+ <nd ref='-33717' />
+ <nd ref='-33719' />
+ <nd ref='-33721' />
+ <nd ref='-33723' />
+ <nd ref='-33727' />
+ <nd ref='-33725' />
+ <nd ref='-33729' />
+ <nd ref='-40377' />
+ <nd ref='-53723' />
+ <nd ref='-53721' />
+ <nd ref='-53719' />
+ <nd ref='-53717' />
+ <nd ref='-53715' />
+ <nd ref='-53713' />
+ <tag k='ISO3166-1:alpha2' v='IL' />
+ <tag k='name:en' v='Israel' />
+ </way>
+ <way id='-57639'>
+ <nd ref='-40359' />
+ <nd ref='-40361' />
+ <nd ref='-40363' />
+ <nd ref='-40365' />
+ <nd ref='-40359' />
+ <tag k='ISO3166-1:alpha2' v='JM' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Jamaica' />
+ </way>
+ <way id='-57641'>
+ <nd ref='-40367' />
+ <nd ref='-40369' />
+ <nd ref='-40297' />
+ <nd ref='-41843' />
+ <nd ref='-41841' />
+ <nd ref='-40371' />
+ <nd ref='-41839' />
+ <nd ref='-41837' />
+ <nd ref='-41835' />
+ <nd ref='-40373' />
+ <nd ref='-41833' />
+ <nd ref='-36329' />
+ <nd ref='-40375' />
+ <nd ref='-40377' />
+ <nd ref='-33729' />
+ <nd ref='-33725' />
+ <nd ref='-33727' />
+ <nd ref='-33723' />
+ <nd ref='-33721' />
+ <nd ref='-33719' />
+ <nd ref='-33717' />
+ <nd ref='-33715' />
+ <nd ref='-33731' />
+ <nd ref='-53725' />
+ <nd ref='-40329' />
+ <nd ref='-33713' />
+ <nd ref='-33711' />
+ <nd ref='-33709' />
+ <nd ref='-33707' />
+ <nd ref='-53829' />
+ <nd ref='-33705' />
+ <nd ref='-33703' />
+ <nd ref='-33701' />
+ <nd ref='-40379' />
+ <nd ref='-33635' />
+ <nd ref='-33633' />
+ <nd ref='-33631' />
+ <nd ref='-33629' />
+ <nd ref='-33627' />
+ <nd ref='-33625' />
+ <nd ref='-40381' />
+ <nd ref='-40383' />
+ <nd ref='-40385' />
+ <nd ref='-40387' />
+ <nd ref='-40367' />
+ <tag k='ISO3166-1:alpha2' v='JO' />
+ <tag k='name:en' v='Jordan' />
+ </way>
+ <way id='-57643'>
+ <nd ref='-40389' />
+ <nd ref='-40391' />
+ <nd ref='-45581' />
+ <nd ref='-45583' />
+ <nd ref='-40393' />
+ <nd ref='-45587' />
+ <nd ref='-45589' />
+ <nd ref='-45591' />
+ <nd ref='-45585' />
+ <nd ref='-45593' />
+ <nd ref='-45595' />
+ <nd ref='-45597' />
+ <nd ref='-45599' />
+ <nd ref='-45601' />
+ <nd ref='-45603' />
+ <nd ref='-45605' />
+ <nd ref='-45607' />
+ <nd ref='-45609' />
+ <nd ref='-40395' />
+ <nd ref='-40397' />
+ <nd ref='-45611' />
+ <nd ref='-45613' />
+ <nd ref='-45615' />
+ <nd ref='-40399' />
+ <nd ref='-40401' />
+ <nd ref='-43053' />
+ <nd ref='-43055' />
+ <nd ref='-45617' />
+ <nd ref='-45619' />
+ <nd ref='-45621' />
+ <nd ref='-45623' />
+ <nd ref='-45625' />
+ <nd ref='-45627' />
+ <nd ref='-45629' />
+ <nd ref='-45631' />
+ <nd ref='-45633' />
+ <nd ref='-45635' />
+ <nd ref='-45637' />
+ <nd ref='-45639' />
+ <nd ref='-45641' />
+ <nd ref='-45643' />
+ <nd ref='-45645' />
+ <nd ref='-45647' />
+ <nd ref='-45649' />
+ <nd ref='-45651' />
+ <nd ref='-45653' />
+ <nd ref='-40403' />
+ <nd ref='-40405' />
+ <nd ref='-38583' />
+ <nd ref='-38581' />
+ <nd ref='-45769' />
+ <nd ref='-45767' />
+ <nd ref='-45765' />
+ <nd ref='-45763' />
+ <nd ref='-45761' />
+ <nd ref='-45753' />
+ <nd ref='-45751' />
+ <nd ref='-45757' />
+ <nd ref='-45759' />
+ <nd ref='-45755' />
+ <nd ref='-45749' />
+ <nd ref='-45747' />
+ <nd ref='-45745' />
+ <nd ref='-45743' />
+ <nd ref='-45741' />
+ <nd ref='-45739' />
+ <nd ref='-45737' />
+ <nd ref='-45735' />
+ <nd ref='-45733' />
+ <nd ref='-45731' />
+ <nd ref='-38579' />
+ <nd ref='-38577' />
+ <nd ref='-38575' />
+ <nd ref='-38573' />
+ <nd ref='-38571' />
+ <nd ref='-45729' />
+ <nd ref='-38569' />
+ <nd ref='-38567' />
+ <nd ref='-38565' />
+ <nd ref='-38563' />
+ <nd ref='-38561' />
+ <nd ref='-38559' />
+ <nd ref='-40627' />
+ <nd ref='-40625' />
+ <nd ref='-45725' />
+ <nd ref='-45723' />
+ <nd ref='-45721' />
+ <nd ref='-45719' />
+ <nd ref='-40659' />
+ <nd ref='-45717' />
+ <nd ref='-45711' />
+ <nd ref='-45709' />
+ <nd ref='-45713' />
+ <nd ref='-45715' />
+ <nd ref='-40407' />
+ <nd ref='-45695' />
+ <nd ref='-40409' />
+ <nd ref='-45693' />
+ <nd ref='-45691' />
+ <nd ref='-45689' />
+ <nd ref='-45687' />
+ <nd ref='-45685' />
+ <nd ref='-40411' />
+ <nd ref='-45683' />
+ <nd ref='-45681' />
+ <nd ref='-45679' />
+ <nd ref='-45677' />
+ <nd ref='-45675' />
+ <nd ref='-45673' />
+ <nd ref='-45671' />
+ <nd ref='-45669' />
+ <nd ref='-42709' />
+ <nd ref='-42707' />
+ <nd ref='-42705' />
+ <nd ref='-45667' />
+ <nd ref='-40413' />
+ <nd ref='-45665' />
+ <nd ref='-45663' />
+ <nd ref='-42703' />
+ <nd ref='-42701' />
+ <nd ref='-42699' />
+ <nd ref='-42697' />
+ <nd ref='-42695' />
+ <nd ref='-40415' />
+ <nd ref='-40417' />
+ <nd ref='-40419' />
+ <nd ref='-40421' />
+ <nd ref='-40423' />
+ <nd ref='-40425' />
+ <nd ref='-40427' />
+ <nd ref='-40429' />
+ <nd ref='-40431' />
+ <nd ref='-40433' />
+ <nd ref='-40435' />
+ <nd ref='-40437' />
+ <nd ref='-40439' />
+ <nd ref='-40441' />
+ <nd ref='-40443' />
+ <nd ref='-40445' />
+ <nd ref='-40447' />
+ <nd ref='-40449' />
+ <nd ref='-40451' />
+ <nd ref='-40453' />
+ <nd ref='-40455' />
+ <nd ref='-40457' />
+ <nd ref='-40459' />
+ <nd ref='-40461' />
+ <nd ref='-40463' />
+ <nd ref='-40465' />
+ <nd ref='-40467' />
+ <nd ref='-40469' />
+ <nd ref='-40471' />
+ <nd ref='-40473' />
+ <nd ref='-40475' />
+ <nd ref='-40477' />
+ <nd ref='-40479' />
+ <nd ref='-40481' />
+ <nd ref='-40483' />
+ <nd ref='-40485' />
+ <nd ref='-40487' />
+ <nd ref='-40489' />
+ <nd ref='-40491' />
+ <nd ref='-40493' />
+ <nd ref='-40495' />
+ <nd ref='-40497' />
+ <nd ref='-40499' />
+ <nd ref='-40501' />
+ <nd ref='-40503' />
+ <nd ref='-40505' />
+ <nd ref='-40507' />
+ <nd ref='-40509' />
+ <nd ref='-40511' />
+ <nd ref='-40513' />
+ <nd ref='-40515' />
+ <nd ref='-40517' />
+ <nd ref='-40519' />
+ <nd ref='-40521' />
+ <nd ref='-40523' />
+ <nd ref='-40525' />
+ <nd ref='-40527' />
+ <nd ref='-40529' />
+ <nd ref='-40531' />
+ <nd ref='-40533' />
+ <nd ref='-40535' />
+ <nd ref='-40537' />
+ <nd ref='-40539' />
+ <nd ref='-45707' />
+ <nd ref='-45705' />
+ <nd ref='-45703' />
+ <nd ref='-45701' />
+ <nd ref='-40541' />
+ <nd ref='-40543' />
+ <nd ref='-42987' />
+ <nd ref='-40545' />
+ <nd ref='-40547' />
+ <nd ref='-45387' />
+ <nd ref='-45389' />
+ <nd ref='-45391' />
+ <nd ref='-45385' />
+ <nd ref='-45393' />
+ <nd ref='-40549' />
+ <nd ref='-45395' />
+ <nd ref='-40551' />
+ <nd ref='-45397' />
+ <nd ref='-45399' />
+ <nd ref='-45403' />
+ <nd ref='-45401' />
+ <nd ref='-40553' />
+ <nd ref='-40555' />
+ <nd ref='-45407' />
+ <nd ref='-45409' />
+ <nd ref='-45411' />
+ <nd ref='-45405' />
+ <nd ref='-40557' />
+ <nd ref='-40559' />
+ <nd ref='-45413' />
+ <nd ref='-45415' />
+ <nd ref='-45417' />
+ <nd ref='-45419' />
+ <nd ref='-40561' />
+ <nd ref='-45421' />
+ <nd ref='-45423' />
+ <nd ref='-40563' />
+ <nd ref='-45425' />
+ <nd ref='-45427' />
+ <nd ref='-45437' />
+ <nd ref='-45435' />
+ <nd ref='-45429' />
+ <nd ref='-45431' />
+ <nd ref='-45433' />
+ <nd ref='-45439' />
+ <nd ref='-45441' />
+ <nd ref='-45443' />
+ <nd ref='-45445' />
+ <nd ref='-45447' />
+ <nd ref='-45449' />
+ <nd ref='-45451' />
+ <nd ref='-45453' />
+ <nd ref='-45455' />
+ <nd ref='-40565' />
+ <nd ref='-45457' />
+ <nd ref='-45459' />
+ <nd ref='-45461' />
+ <nd ref='-45463' />
+ <nd ref='-45465' />
+ <nd ref='-45467' />
+ <nd ref='-40567' />
+ <nd ref='-45469' />
+ <nd ref='-45471' />
+ <nd ref='-45473' />
+ <nd ref='-45475' />
+ <nd ref='-45477' />
+ <nd ref='-45479' />
+ <nd ref='-45481' />
+ <nd ref='-40569' />
+ <nd ref='-45483' />
+ <nd ref='-45485' />
+ <nd ref='-45487' />
+ <nd ref='-45489' />
+ <nd ref='-45491' />
+ <nd ref='-40571' />
+ <nd ref='-40573' />
+ <nd ref='-40575' />
+ <nd ref='-45493' />
+ <nd ref='-45501' />
+ <nd ref='-45503' />
+ <nd ref='-45499' />
+ <nd ref='-45497' />
+ <nd ref='-45495' />
+ <nd ref='-45505' />
+ <nd ref='-45517' />
+ <nd ref='-45515' />
+ <nd ref='-45513' />
+ <nd ref='-45507' />
+ <nd ref='-45509' />
+ <nd ref='-45511' />
+ <nd ref='-45519' />
+ <nd ref='-45521' />
+ <nd ref='-45523' />
+ <nd ref='-45525' />
+ <nd ref='-45527' />
+ <nd ref='-45529' />
+ <nd ref='-45531' />
+ <nd ref='-45533' />
+ <nd ref='-40577' />
+ <nd ref='-45535' />
+ <nd ref='-45537' />
+ <nd ref='-45539' />
+ <nd ref='-45541' />
+ <nd ref='-45543' />
+ <nd ref='-45545' />
+ <nd ref='-45555' />
+ <nd ref='-45553' />
+ <nd ref='-45547' />
+ <nd ref='-45549' />
+ <nd ref='-45551' />
+ <nd ref='-45557' />
+ <nd ref='-45559' />
+ <nd ref='-45561' />
+ <nd ref='-45563' />
+ <nd ref='-40579' />
+ <nd ref='-45565' />
+ <nd ref='-45567' />
+ <nd ref='-45569' />
+ <nd ref='-45571' />
+ <nd ref='-45573' />
+ <nd ref='-40581' />
+ <nd ref='-40583' />
+ <nd ref='-45575' />
+ <nd ref='-45577' />
+ <nd ref='-40585' />
+ <nd ref='-40587' />
+ <nd ref='-40589' />
+ <nd ref='-40591' />
+ <nd ref='-40593' />
+ <nd ref='-45579' />
+ <nd ref='-40389' />
+ <tag k='ISO3166-1:alpha2' v='KZ' />
+ <tag k='name:en' v='Kazakhstan' />
+ </way>
+ <way id='-57645'>
+ <nd ref='-40595' />
+ <nd ref='-31107' />
+ <nd ref='-39575' />
+ <nd ref='-40597' />
+ <nd ref='-31105' />
+ <nd ref='-40599' />
+ <nd ref='-39573' />
+ <nd ref='-31089' />
+ <nd ref='-31087' />
+ <nd ref='-31085' />
+ <nd ref='-31083' />
+ <nd ref='-31091' />
+ <nd ref='-31093' />
+ <nd ref='-31095' />
+ <nd ref='-31099' />
+ <nd ref='-31097' />
+ <nd ref='-31101' />
+ <nd ref='-31103' />
+ <nd ref='-31081' />
+ <nd ref='-39571' />
+ <nd ref='-40601' />
+ <nd ref='-40603' />
+ <nd ref='-40605' />
+ <nd ref='-40607' />
+ <nd ref='-40609' />
+ <nd ref='-40611' />
+ <nd ref='-34647' />
+ <nd ref='-40613' />
+ <nd ref='-34643' />
+ <nd ref='-40615' />
+ <nd ref='-34651' />
+ <nd ref='-34649' />
+ <nd ref='-34653' />
+ <nd ref='-40617' />
+ <nd ref='-40619' />
+ <nd ref='-34657' />
+ <nd ref='-34655' />
+ <nd ref='-34659' />
+ <nd ref='-40621' />
+ <nd ref='-31207' />
+ <nd ref='-31209' />
+ <nd ref='-31211' />
+ <nd ref='-31205' />
+ <nd ref='-31203' />
+ <nd ref='-31197' />
+ <nd ref='-31199' />
+ <nd ref='-31195' />
+ <nd ref='-31201' />
+ <nd ref='-31193' />
+ <nd ref='-31191' />
+ <nd ref='-31189' />
+ <nd ref='-31213' />
+ <nd ref='-31173' />
+ <nd ref='-31171' />
+ <nd ref='-31175' />
+ <nd ref='-31167' />
+ <nd ref='-31169' />
+ <nd ref='-31183' />
+ <nd ref='-31181' />
+ <nd ref='-31177' />
+ <nd ref='-31179' />
+ <nd ref='-31185' />
+ <nd ref='-31187' />
+ <nd ref='-31163' />
+ <nd ref='-31161' />
+ <nd ref='-31159' />
+ <nd ref='-31157' />
+ <nd ref='-31155' />
+ <nd ref='-31165' />
+ <nd ref='-31147' />
+ <nd ref='-31149' />
+ <nd ref='-31151' />
+ <nd ref='-31141' />
+ <nd ref='-31143' />
+ <nd ref='-31145' />
+ <nd ref='-31153' />
+ <nd ref='-31139' />
+ <nd ref='-31133' />
+ <nd ref='-31135' />
+ <nd ref='-31137' />
+ <nd ref='-31131' />
+ <nd ref='-31129' />
+ <nd ref='-31127' />
+ <nd ref='-42249' />
+ <nd ref='-40623' />
+ <nd ref='-31123' />
+ <nd ref='-31117' />
+ <nd ref='-31119' />
+ <nd ref='-31121' />
+ <nd ref='-31125' />
+ <nd ref='-40595' />
+ <tag k='ISO3166-1:alpha2' v='KE' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Kenya' />
+ </way>
+ <way id='-57647'>
+ <nd ref='-40659' />
+ <nd ref='-45719' />
+ <nd ref='-45721' />
+ <nd ref='-45723' />
+ <nd ref='-45725' />
+ <nd ref='-40625' />
+ <nd ref='-40627' />
+ <nd ref='-38559' />
+ <nd ref='-40629' />
+ <nd ref='-45727' />
+ <nd ref='-40631' />
+ <nd ref='-52281' />
+ <nd ref='-52279' />
+ <nd ref='-52277' />
+ <nd ref='-52275' />
+ <nd ref='-52285' />
+ <nd ref='-52287' />
+ <nd ref='-52283' />
+ <nd ref='-52273' />
+ <nd ref='-52271' />
+ <nd ref='-52269' />
+ <nd ref='-52295' />
+ <nd ref='-52297' />
+ <nd ref='-52301' />
+ <nd ref='-52299' />
+ <nd ref='-52293' />
+ <nd ref='-52291' />
+ <nd ref='-52289' />
+ <nd ref='-52319' />
+ <nd ref='-52317' />
+ <nd ref='-52315' />
+ <nd ref='-52321' />
+ <nd ref='-52313' />
+ <nd ref='-52311' />
+ <nd ref='-52309' />
+ <nd ref='-52307' />
+ <nd ref='-52303' />
+ <nd ref='-52305' />
+ <nd ref='-52205' />
+ <nd ref='-52203' />
+ <nd ref='-52201' />
+ <nd ref='-52199' />
+ <nd ref='-52197' />
+ <nd ref='-38557' />
+ <nd ref='-40633' />
+ <nd ref='-38555' />
+ <nd ref='-38553' />
+ <nd ref='-38551' />
+ <nd ref='-40635' />
+ <nd ref='-38549' />
+ <nd ref='-38547' />
+ <nd ref='-38545' />
+ <nd ref='-52187' />
+ <nd ref='-52185' />
+ <nd ref='-52183' />
+ <nd ref='-42125' />
+ <nd ref='-40637' />
+ <nd ref='-52181' />
+ <nd ref='-52177' />
+ <nd ref='-52179' />
+ <nd ref='-52175' />
+ <nd ref='-52165' />
+ <nd ref='-52167' />
+ <nd ref='-52169' />
+ <nd ref='-52171' />
+ <nd ref='-52173' />
+ <nd ref='-52163' />
+ <nd ref='-40639' />
+ <nd ref='-52159' />
+ <nd ref='-52157' />
+ <nd ref='-52155' />
+ <nd ref='-52161' />
+ <nd ref='-52153' />
+ <nd ref='-52151' />
+ <nd ref='-52149' />
+ <nd ref='-42123' />
+ <nd ref='-52143' />
+ <nd ref='-52141' />
+ <nd ref='-52147' />
+ <nd ref='-52145' />
+ <nd ref='-52139' />
+ <nd ref='-42121' />
+ <nd ref='-40641' />
+ <nd ref='-42119' />
+ <nd ref='-52137' />
+ <nd ref='-42117' />
+ <nd ref='-40643' />
+ <nd ref='-40645' />
+ <nd ref='-52133' />
+ <nd ref='-52135' />
+ <nd ref='-40647' />
+ <nd ref='-42115' />
+ <nd ref='-42113' />
+ <nd ref='-42111' />
+ <nd ref='-40649' />
+ <nd ref='-40651' />
+ <nd ref='-42109' />
+ <nd ref='-52061' />
+ <nd ref='-42321' />
+ <nd ref='-42319' />
+ <nd ref='-52033' />
+ <nd ref='-52035' />
+ <nd ref='-52041' />
+ <nd ref='-52037' />
+ <nd ref='-52039' />
+ <nd ref='-52043' />
+ <nd ref='-52045' />
+ <nd ref='-52047' />
+ <nd ref='-52049' />
+ <nd ref='-52009' />
+ <nd ref='-52031' />
+ <nd ref='-52029' />
+ <nd ref='-52011' />
+ <nd ref='-52021' />
+ <nd ref='-52019' />
+ <nd ref='-52017' />
+ <nd ref='-52023' />
+ <nd ref='-52013' />
+ <nd ref='-52015' />
+ <nd ref='-52025' />
+ <nd ref='-52027' />
+ <nd ref='-40653' />
+ <nd ref='-52001' />
+ <nd ref='-52005' />
+ <nd ref='-52003' />
+ <nd ref='-52007' />
+ <nd ref='-42317' />
+ <nd ref='-51999' />
+ <nd ref='-51997' />
+ <nd ref='-51995' />
+ <nd ref='-51993' />
+ <nd ref='-51991' />
+ <nd ref='-51989' />
+ <nd ref='-51987' />
+ <nd ref='-51985' />
+ <nd ref='-51983' />
+ <nd ref='-51977' />
+ <nd ref='-51979' />
+ <nd ref='-51981' />
+ <nd ref='-51975' />
+ <nd ref='-51973' />
+ <nd ref='-51971' />
+ <nd ref='-51969' />
+ <nd ref='-51967' />
+ <nd ref='-51965' />
+ <nd ref='-51963' />
+ <nd ref='-51961' />
+ <nd ref='-51959' />
+ <nd ref='-51957' />
+ <nd ref='-51953' />
+ <nd ref='-51955' />
+ <nd ref='-51951' />
+ <nd ref='-51949' />
+ <nd ref='-40655' />
+ <nd ref='-45699' />
+ <nd ref='-45697' />
+ <nd ref='-40657' />
+ <nd ref='-40409' />
+ <nd ref='-45695' />
+ <nd ref='-40407' />
+ <nd ref='-45715' />
+ <nd ref='-45713' />
+ <nd ref='-45709' />
+ <nd ref='-45711' />
+ <nd ref='-45717' />
+ <nd ref='-40659' />
+ </way>
+ <way id='-57649'>
+ <nd ref='-40671' />
+ <nd ref='-33541' />
+ <nd ref='-33543' />
+ <nd ref='-33539' />
+ <nd ref='-33523' />
+ <nd ref='-33525' />
+ <nd ref='-33527' />
+ <nd ref='-33529' />
+ <nd ref='-33531' />
+ <nd ref='-33533' />
+ <nd ref='-33535' />
+ <nd ref='-33537' />
+ <nd ref='-40673' />
+ <nd ref='-40675' />
+ <nd ref='-33545' />
+ <nd ref='-33547' />
+ <nd ref='-33553' />
+ <nd ref='-33549' />
+ <nd ref='-33551' />
+ <nd ref='-33561' />
+ <nd ref='-33559' />
+ <nd ref='-33557' />
+ <nd ref='-33555' />
+ <nd ref='-40677' />
+ <nd ref='-40679' />
+ <nd ref='-40681' />
+ <nd ref='-42761' />
+ <nd ref='-42989' />
+ <nd ref='-40683' />
+ <nd ref='-40685' />
+ <nd ref='-32843' />
+ <nd ref='-32845' />
+ <nd ref='-32847' />
+ <nd ref='-32849' />
+ <nd ref='-32855' />
+ <nd ref='-32853' />
+ <nd ref='-32851' />
+ <nd ref='-32857' />
+ <nd ref='-32859' />
+ <nd ref='-32861' />
+ <nd ref='-32875' />
+ <nd ref='-32873' />
+ <nd ref='-32871' />
+ <nd ref='-32869' />
+ <nd ref='-32867' />
+ <nd ref='-32865' />
+ <nd ref='-32863' />
+ <nd ref='-32877' />
+ <nd ref='-32841' />
+ <nd ref='-32837' />
+ <nd ref='-32835' />
+ <nd ref='-32833' />
+ <nd ref='-32831' />
+ <nd ref='-32829' />
+ <nd ref='-32839' />
+ <nd ref='-32825' />
+ <nd ref='-32823' />
+ <nd ref='-32821' />
+ <nd ref='-32819' />
+ <nd ref='-32827' />
+ <nd ref='-32817' />
+ <nd ref='-32815' />
+ <nd ref='-32813' />
+ <nd ref='-32811' />
+ <nd ref='-32809' />
+ <nd ref='-32807' />
+ <nd ref='-32805' />
+ <nd ref='-32803' />
+ <nd ref='-32799' />
+ <nd ref='-32801' />
+ <nd ref='-40687' />
+ <nd ref='-32971' />
+ <nd ref='-32969' />
+ <nd ref='-32965' />
+ <nd ref='-32967' />
+ <nd ref='-32963' />
+ <nd ref='-32961' />
+ <nd ref='-32959' />
+ <nd ref='-32957' />
+ <nd ref='-32955' />
+ <nd ref='-32953' />
+ <nd ref='-32951' />
+ <nd ref='-32949' />
+ <nd ref='-32947' />
+ <nd ref='-32945' />
+ <nd ref='-32939' />
+ <nd ref='-32941' />
+ <nd ref='-32943' />
+ <nd ref='-32937' />
+ <nd ref='-32935' />
+ <nd ref='-32933' />
+ <nd ref='-32931' />
+ <nd ref='-32929' />
+ <nd ref='-32927' />
+ <nd ref='-32925' />
+ <nd ref='-32923' />
+ <nd ref='-32921' />
+ <nd ref='-32919' />
+ <nd ref='-32917' />
+ <nd ref='-32915' />
+ <nd ref='-32913' />
+ <nd ref='-32911' />
+ <nd ref='-32879' />
+ <nd ref='-32881' />
+ <nd ref='-32885' />
+ <nd ref='-32883' />
+ <nd ref='-32887' />
+ <nd ref='-32909' />
+ <nd ref='-32889' />
+ <nd ref='-32891' />
+ <nd ref='-32893' />
+ <nd ref='-32897' />
+ <nd ref='-32895' />
+ <nd ref='-32907' />
+ <nd ref='-32901' />
+ <nd ref='-32899' />
+ <nd ref='-32903' />
+ <nd ref='-32905' />
+ <nd ref='-40725' />
+ <nd ref='-33503' />
+ <nd ref='-33501' />
+ <nd ref='-33499' />
+ <nd ref='-33505' />
+ <nd ref='-33487' />
+ <nd ref='-33489' />
+ <nd ref='-33491' />
+ <nd ref='-33493' />
+ <nd ref='-33495' />
+ <nd ref='-33497' />
+ <nd ref='-33507' />
+ <nd ref='-33511' />
+ <nd ref='-33509' />
+ <nd ref='-33513' />
+ <nd ref='-33515' />
+ <nd ref='-33517' />
+ <nd ref='-33519' />
+ <nd ref='-33521' />
+ <nd ref='-33479' />
+ <nd ref='-33477' />
+ <nd ref='-33475' />
+ <nd ref='-33483' />
+ <nd ref='-33481' />
+ <nd ref='-33485' />
+ <nd ref='-33461' />
+ <nd ref='-33463' />
+ <nd ref='-33465' />
+ <nd ref='-33467' />
+ <nd ref='-33469' />
+ <nd ref='-33471' />
+ <nd ref='-33473' />
+ <nd ref='-33459' />
+ <nd ref='-33457' />
+ <nd ref='-33455' />
+ <nd ref='-33453' />
+ <nd ref='-33451' />
+ <nd ref='-33449' />
+ <nd ref='-33447' />
+ <nd ref='-33445' />
+ <nd ref='-33441' />
+ <nd ref='-33443' />
+ <nd ref='-33439' />
+ <nd ref='-33437' />
+ <nd ref='-33435' />
+ <nd ref='-33431' />
+ <nd ref='-33433' />
+ <nd ref='-33429' />
+ <nd ref='-33423' />
+ <nd ref='-33425' />
+ <nd ref='-33427' />
+ <nd ref='-40671' />
+ <tag k='ISO3166-1:alpha2' v='KH' />
+ <tag k='name:en' v='Cambodia' />
+ </way>
+ <way id='-57651'>
+ <nd ref='-36891' />
+ <nd ref='-36401' />
+ <nd ref='-40689' />
+ <nd ref='-39623' />
+ <nd ref='-36891' />
+ <tag k='ISO3166-1:alpha2' v='KN' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='St. Kitts and Nevis' />
+ </way>
+ <way id='-57653'>
+ <nd ref='-42721' />
+ <nd ref='-42719' />
+ <nd ref='-42717' />
+ <nd ref='-42723' />
+ <nd ref='-42725' />
+ <nd ref='-42731' />
+ <nd ref='-41655' />
+ <nd ref='-42733' />
+ <nd ref='-41653' />
+ <nd ref='-41651' />
+ <nd ref='-42729' />
+ <nd ref='-40691' />
+ <nd ref='-41649' />
+ <nd ref='-42727' />
+ <nd ref='-41647' />
+ <nd ref='-41645' />
+ <nd ref='-40693' />
+ <nd ref='-35089' />
+ <nd ref='-35087' />
+ <nd ref='-35085' />
+ <nd ref='-40695' />
+ <nd ref='-35083' />
+ <nd ref='-35081' />
+ <nd ref='-35079' />
+ <nd ref='-40697' />
+ <nd ref='-40699' />
+ <nd ref='-40701' />
+ <nd ref='-40703' />
+ <nd ref='-40705' />
+ <nd ref='-40707' />
+ <nd ref='-40709' />
+ <nd ref='-41643' />
+ <nd ref='-41641' />
+ <nd ref='-42721' />
+ <tag k='ISO3166-1:alpha2' v='KR' />
+ <tag k='name:en' v='Korea, Rep.' />
+ </way>
+ <way id='-57655'>
+ <nd ref='-41955' />
+ <nd ref='-46705' />
+ <nd ref='-46703' />
+ <nd ref='-46699' />
+ <nd ref='-46701' />
+ <nd ref='-46707' />
+ <nd ref='-46711' />
+ <nd ref='-46709' />
+ <nd ref='-46713' />
+ <nd ref='-46715' />
+ <nd ref='-46717' />
+ <nd ref='-46719' />
+ <nd ref='-46721' />
+ <nd ref='-41085' />
+ <nd ref='-46745' />
+ <nd ref='-46747' />
+ <nd ref='-46743' />
+ <nd ref='-46741' />
+ <nd ref='-46739' />
+ <nd ref='-46737' />
+ <nd ref='-46735' />
+ <nd ref='-46733' />
+ <nd ref='-46731' />
+ <nd ref='-46729' />
+ <nd ref='-46727' />
+ <nd ref='-46725' />
+ <nd ref='-46723' />
+ <nd ref='-36995' />
+ <nd ref='-46749' />
+ <nd ref='-46765' />
+ <nd ref='-46763' />
+ <nd ref='-46761' />
+ <nd ref='-46759' />
+ <nd ref='-46757' />
+ <nd ref='-46755' />
+ <nd ref='-46751' />
+ <nd ref='-46753' />
+ <nd ref='-36993' />
+ <nd ref='-46767' />
+ <nd ref='-46769' />
+ <nd ref='-46771' />
+ <nd ref='-46773' />
+ <nd ref='-46775' />
+ <nd ref='-46777' />
+ <nd ref='-41957' />
+ <nd ref='-46653' />
+ <nd ref='-46655' />
+ <nd ref='-46651' />
+ <nd ref='-46657' />
+ <nd ref='-46659' />
+ <nd ref='-46661' />
+ <nd ref='-46663' />
+ <nd ref='-46665' />
+ <nd ref='-46667' />
+ <nd ref='-46669' />
+ <nd ref='-46671' />
+ <nd ref='-46673' />
+ <nd ref='-46675' />
+ <nd ref='-46677' />
+ <nd ref='-46693' />
+ <nd ref='-46691' />
+ <nd ref='-46679' />
+ <nd ref='-46689' />
+ <nd ref='-46681' />
+ <nd ref='-46683' />
+ <nd ref='-46685' />
+ <nd ref='-46695' />
+ <nd ref='-46697' />
+ <nd ref='-46687' />
+ <nd ref='-41955' />
+ <tag k='ISO3166-2' v='RS-KM' />
+ <tag k='name:en' v='Kosovo' />
+ <tag k='note' v='Self admin.; Claimed by Serbia' />
+ </way>
+ <way id='-57657'>
+ <nd ref='-40711' />
+ <nd ref='-40713' />
+ <nd ref='-40715' />
+ <nd ref='-36325' />
+ <nd ref='-36327' />
+ <nd ref='-40717' />
+ <nd ref='-40287' />
+ <nd ref='-34375' />
+ <nd ref='-34377' />
+ <nd ref='-40285' />
+ <nd ref='-40283' />
+ <nd ref='-40281' />
+ <nd ref='-40279' />
+ <nd ref='-40719' />
+ <nd ref='-34379' />
+ <nd ref='-40277' />
+ <nd ref='-40711' />
+ <tag k='ISO3166-1:alpha2' v='KW' />
+ <tag k='name:en' v='Kuwait' />
+ </way>
+ <way id='-57659'>
+ <nd ref='-40721' />
+ <nd ref='-40723' />
+ <nd ref='-33397' />
+ <nd ref='-33395' />
+ <nd ref='-33393' />
+ <nd ref='-33391' />
+ <nd ref='-33389' />
+ <nd ref='-33387' />
+ <nd ref='-33383' />
+ <nd ref='-33385' />
+ <nd ref='-33411' />
+ <nd ref='-33409' />
+ <nd ref='-33407' />
+ <nd ref='-33405' />
+ <nd ref='-33403' />
+ <nd ref='-33401' />
+ <nd ref='-33399' />
+ <nd ref='-33415' />
+ <nd ref='-33413' />
+ <nd ref='-33417' />
+ <nd ref='-33419' />
+ <nd ref='-33421' />
+ <nd ref='-33377' />
+ <nd ref='-33375' />
+ <nd ref='-33373' />
+ <nd ref='-33379' />
+ <nd ref='-33371' />
+ <nd ref='-33369' />
+ <nd ref='-33365' />
+ <nd ref='-33367' />
+ <nd ref='-33363' />
+ <nd ref='-33361' />
+ <nd ref='-33351' />
+ <nd ref='-33359' />
+ <nd ref='-33357' />
+ <nd ref='-33355' />
+ <nd ref='-33353' />
+ <nd ref='-33343' />
+ <nd ref='-33341' />
+ <nd ref='-33339' />
+ <nd ref='-33337' />
+ <nd ref='-33335' />
+ <nd ref='-33333' />
+ <nd ref='-33345' />
+ <nd ref='-33347' />
+ <nd ref='-33349' />
+ <nd ref='-33321' />
+ <nd ref='-33381' />
+ <nd ref='-33323' />
+ <nd ref='-33325' />
+ <nd ref='-33327' />
+ <nd ref='-33329' />
+ <nd ref='-33319' />
+ <nd ref='-33317' />
+ <nd ref='-33315' />
+ <nd ref='-33331' />
+ <nd ref='-33311' />
+ <nd ref='-33313' />
+ <nd ref='-33309' />
+ <nd ref='-33307' />
+ <nd ref='-33305' />
+ <nd ref='-33303' />
+ <nd ref='-42345' />
+ <nd ref='-33299' />
+ <nd ref='-33297' />
+ <nd ref='-33295' />
+ <nd ref='-33291' />
+ <nd ref='-33293' />
+ <nd ref='-33301' />
+ <nd ref='-33287' />
+ <nd ref='-33285' />
+ <nd ref='-33283' />
+ <nd ref='-33281' />
+ <nd ref='-33289' />
+ <nd ref='-33279' />
+ <nd ref='-33277' />
+ <nd ref='-33275' />
+ <nd ref='-33273' />
+ <nd ref='-33271' />
+ <nd ref='-33269' />
+ <nd ref='-33267' />
+ <nd ref='-33265' />
+ <nd ref='-33263' />
+ <nd ref='-33261' />
+ <nd ref='-33259' />
+ <nd ref='-33257' />
+ <nd ref='-33255' />
+ <nd ref='-33253' />
+ <nd ref='-33251' />
+ <nd ref='-33247' />
+ <nd ref='-33249' />
+ <nd ref='-33243' />
+ <nd ref='-33245' />
+ <nd ref='-33241' />
+ <nd ref='-33239' />
+ <nd ref='-33237' />
+ <nd ref='-33235' />
+ <nd ref='-33233' />
+ <nd ref='-33231' />
+ <nd ref='-33229' />
+ <nd ref='-33227' />
+ <nd ref='-33225' />
+ <nd ref='-33223' />
+ <nd ref='-33221' />
+ <nd ref='-33217' />
+ <nd ref='-33219' />
+ <nd ref='-33215' />
+ <nd ref='-33213' />
+ <nd ref='-33209' />
+ <nd ref='-33211' />
+ <nd ref='-40725' />
+ <nd ref='-32905' />
+ <nd ref='-32903' />
+ <nd ref='-32899' />
+ <nd ref='-32901' />
+ <nd ref='-32907' />
+ <nd ref='-32895' />
+ <nd ref='-32897' />
+ <nd ref='-32893' />
+ <nd ref='-32891' />
+ <nd ref='-32889' />
+ <nd ref='-32909' />
+ <nd ref='-32887' />
+ <nd ref='-32883' />
+ <nd ref='-32885' />
+ <nd ref='-32881' />
+ <nd ref='-32879' />
+ <nd ref='-32911' />
+ <nd ref='-32913' />
+ <nd ref='-32915' />
+ <nd ref='-32917' />
+ <nd ref='-32919' />
+ <nd ref='-32921' />
+ <nd ref='-32923' />
+ <nd ref='-32925' />
+ <nd ref='-32927' />
+ <nd ref='-32929' />
+ <nd ref='-32931' />
+ <nd ref='-32933' />
+ <nd ref='-32935' />
+ <nd ref='-32937' />
+ <nd ref='-32943' />
+ <nd ref='-32941' />
+ <nd ref='-32939' />
+ <nd ref='-32945' />
+ <nd ref='-32947' />
+ <nd ref='-32949' />
+ <nd ref='-32951' />
+ <nd ref='-32953' />
+ <nd ref='-32955' />
+ <nd ref='-32957' />
+ <nd ref='-32959' />
+ <nd ref='-32961' />
+ <nd ref='-32963' />
+ <nd ref='-32967' />
+ <nd ref='-32965' />
+ <nd ref='-32969' />
+ <nd ref='-32971' />
+ <nd ref='-40687' />
+ <nd ref='-49371' />
+ <nd ref='-49329' />
+ <nd ref='-49369' />
+ <nd ref='-49367' />
+ <nd ref='-49363' />
+ <nd ref='-49365' />
+ <nd ref='-49353' />
+ <nd ref='-49361' />
+ <nd ref='-49359' />
+ <nd ref='-49357' />
+ <nd ref='-49355' />
+ <nd ref='-49347' />
+ <nd ref='-49349' />
+ <nd ref='-49351' />
+ <nd ref='-49333' />
+ <nd ref='-49335' />
+ <nd ref='-49345' />
+ <nd ref='-49337' />
+ <nd ref='-49341' />
+ <nd ref='-49339' />
+ <nd ref='-49343' />
+ <nd ref='-49331' />
+ <nd ref='-49381' />
+ <nd ref='-49379' />
+ <nd ref='-49377' />
+ <nd ref='-49375' />
+ <nd ref='-49383' />
+ <nd ref='-49399' />
+ <nd ref='-49411' />
+ <nd ref='-49409' />
+ <nd ref='-49401' />
+ <nd ref='-49403' />
+ <nd ref='-49407' />
+ <nd ref='-49405' />
+ <nd ref='-49397' />
+ <nd ref='-49395' />
+ <nd ref='-49393' />
+ <nd ref='-49385' />
+ <nd ref='-49387' />
+ <nd ref='-49389' />
+ <nd ref='-49391' />
+ <nd ref='-49373' />
+ <nd ref='-49419' />
+ <nd ref='-49421' />
+ <nd ref='-49425' />
+ <nd ref='-49427' />
+ <nd ref='-49423' />
+ <nd ref='-49417' />
+ <nd ref='-49415' />
+ <nd ref='-49413' />
+ <nd ref='-49437' />
+ <nd ref='-49439' />
+ <nd ref='-49435' />
+ <nd ref='-49433' />
+ <nd ref='-49431' />
+ <nd ref='-49429' />
+ <nd ref='-49449' />
+ <nd ref='-49447' />
+ <nd ref='-49445' />
+ <nd ref='-49443' />
+ <nd ref='-49441' />
+ <nd ref='-40727' />
+ <nd ref='-49453' />
+ <nd ref='-49451' />
+ <nd ref='-49457' />
+ <nd ref='-49459' />
+ <nd ref='-49461' />
+ <nd ref='-49463' />
+ <nd ref='-49465' />
+ <nd ref='-49467' />
+ <nd ref='-49455' />
+ <nd ref='-49469' />
+ <nd ref='-49471' />
+ <nd ref='-49477' />
+ <nd ref='-41107' />
+ <nd ref='-49473' />
+ <nd ref='-49475' />
+ <nd ref='-49479' />
+ <nd ref='-49481' />
+ <nd ref='-40729' />
+ <nd ref='-40731' />
+ <nd ref='-49487' />
+ <nd ref='-49489' />
+ <nd ref='-49491' />
+ <nd ref='-49493' />
+ <nd ref='-49495' />
+ <nd ref='-49497' />
+ <nd ref='-49501' />
+ <nd ref='-49503' />
+ <nd ref='-49505' />
+ <nd ref='-49499' />
+ <nd ref='-49507' />
+ <nd ref='-49509' />
+ <nd ref='-49513' />
+ <nd ref='-49515' />
+ <nd ref='-49517' />
+ <nd ref='-49511' />
+ <nd ref='-49485' />
+ <nd ref='-49483' />
+ <nd ref='-49521' />
+ <nd ref='-49529' />
+ <nd ref='-49531' />
+ <nd ref='-49519' />
+ <nd ref='-49543' />
+ <nd ref='-49525' />
+ <nd ref='-49527' />
+ <nd ref='-49523' />
+ <nd ref='-49533' />
+ <nd ref='-49541' />
+ <nd ref='-49539' />
+ <nd ref='-49537' />
+ <nd ref='-49535' />
+ <nd ref='-40721' />
+ <tag k='ISO3166-1:alpha2' v='LA' />
+ <tag k='name:en' v='Lao PDR' />
+ </way>
+ <way id='-57661'>
+ <nd ref='-42013' />
+ <nd ref='-33653' />
+ <nd ref='-42011' />
+ <nd ref='-33655' />
+ <nd ref='-40733' />
+ <nd ref='-33657' />
+ <nd ref='-33659' />
+ <nd ref='-33661' />
+ <nd ref='-33663' />
+ <nd ref='-33665' />
+ <nd ref='-33667' />
+ <nd ref='-33669' />
+ <nd ref='-33671' />
+ <nd ref='-33673' />
+ <nd ref='-40735' />
+ <nd ref='-33637' />
+ <nd ref='-33639' />
+ <nd ref='-33641' />
+ <nd ref='-33643' />
+ <nd ref='-33645' />
+ <nd ref='-33647' />
+ <nd ref='-33649' />
+ <nd ref='-33651' />
+ <nd ref='-40333' />
+ <nd ref='-40737' />
+ <nd ref='-40739' />
+ <nd ref='-40741' />
+ <nd ref='-42015' />
+ <nd ref='-33623' />
+ <nd ref='-33621' />
+ <nd ref='-33619' />
+ <nd ref='-33617' />
+ <nd ref='-33615' />
+ <nd ref='-33613' />
+ <nd ref='-33611' />
+ <nd ref='-33609' />
+ <nd ref='-33607' />
+ <nd ref='-33605' />
+ <nd ref='-33603' />
+ <nd ref='-33601' />
+ <nd ref='-33585' />
+ <nd ref='-33599' />
+ <nd ref='-33597' />
+ <nd ref='-33595' />
+ <nd ref='-33593' />
+ <nd ref='-33591' />
+ <nd ref='-33589' />
+ <nd ref='-33587' />
+ <nd ref='-33579' />
+ <nd ref='-33577' />
+ <nd ref='-33581' />
+ <nd ref='-33583' />
+ <nd ref='-33573' />
+ <nd ref='-33575' />
+ <nd ref='-33571' />
+ <nd ref='-33569' />
+ <nd ref='-33567' />
+ <nd ref='-33565' />
+ <nd ref='-33563' />
+ <nd ref='-42013' />
+ <tag k='ISO3166-1:alpha2' v='LB' />
+ <tag k='name:en' v='Lebanon' />
+ </way>
+ <way id='-57663'>
+ <nd ref='-38753' />
+ <nd ref='-33785' />
+ <nd ref='-33783' />
+ <nd ref='-33787' />
+ <nd ref='-33789' />
+ <nd ref='-38751' />
+ <nd ref='-33737' />
+ <nd ref='-33735' />
+ <nd ref='-33733' />
+ <nd ref='-33739' />
+ <nd ref='-33763' />
+ <nd ref='-33761' />
+ <nd ref='-33759' />
+ <nd ref='-33757' />
+ <nd ref='-33755' />
+ <nd ref='-33753' />
+ <nd ref='-33751' />
+ <nd ref='-33747' />
+ <nd ref='-33745' />
+ <nd ref='-33741' />
+ <nd ref='-33743' />
+ <nd ref='-33749' />
+ <nd ref='-33771' />
+ <nd ref='-33773' />
+ <nd ref='-33775' />
+ <nd ref='-33777' />
+ <nd ref='-33779' />
+ <nd ref='-33767' />
+ <nd ref='-33769' />
+ <nd ref='-33765' />
+ <nd ref='-33781' />
+ <nd ref='-38749' />
+ <nd ref='-40743' />
+ <nd ref='-40745' />
+ <nd ref='-34241' />
+ <nd ref='-34237' />
+ <nd ref='-34239' />
+ <nd ref='-40747' />
+ <nd ref='-41899' />
+ <nd ref='-41897' />
+ <nd ref='-34235' />
+ <nd ref='-34225' />
+ <nd ref='-34233' />
+ <nd ref='-34227' />
+ <nd ref='-34229' />
+ <nd ref='-34231' />
+ <nd ref='-39805' />
+ <nd ref='-33837' />
+ <nd ref='-33835' />
+ <nd ref='-33833' />
+ <nd ref='-33831' />
+ <nd ref='-33829' />
+ <nd ref='-33827' />
+ <nd ref='-33825' />
+ <nd ref='-33823' />
+ <nd ref='-33821' />
+ <nd ref='-33819' />
+ <nd ref='-33817' />
+ <nd ref='-33815' />
+ <nd ref='-33813' />
+ <nd ref='-33811' />
+ <nd ref='-33799' />
+ <nd ref='-33801' />
+ <nd ref='-33809' />
+ <nd ref='-33805' />
+ <nd ref='-33807' />
+ <nd ref='-33803' />
+ <nd ref='-33795' />
+ <nd ref='-33797' />
+ <nd ref='-33793' />
+ <nd ref='-33791' />
+ <nd ref='-38753' />
+ <tag k='ISO3166-1:alpha2' v='LR' />
+ <tag k='name:en' v='Liberia' />
+ </way>
+ <way id='-57665'>
+ <nd ref='-36615' />
+ <nd ref='-40749' />
+ <nd ref='-39311' />
+ <nd ref='-39309' />
+ <nd ref='-35017' />
+ <nd ref='-35019' />
+ <nd ref='-35021' />
+ <nd ref='-39307' />
+ <nd ref='-40751' />
+ <nd ref='-41853' />
+ <nd ref='-41851' />
+ <nd ref='-41849' />
+ <nd ref='-40753' />
+ <nd ref='-40755' />
+ <nd ref='-40757' />
+ <nd ref='-40759' />
+ <nd ref='-39237' />
+ <nd ref='-34101' />
+ <nd ref='-34085' />
+ <nd ref='-34087' />
+ <nd ref='-34089' />
+ <nd ref='-34091' />
+ <nd ref='-34093' />
+ <nd ref='-34095' />
+ <nd ref='-34083' />
+ <nd ref='-34097' />
+ <nd ref='-34099' />
+ <nd ref='-39235' />
+ <nd ref='-42199' />
+ <nd ref='-40761' />
+ <nd ref='-40763' />
+ <nd ref='-40765' />
+ <nd ref='-40767' />
+ <nd ref='-42197' />
+ <nd ref='-34115' />
+ <nd ref='-34113' />
+ <nd ref='-34111' />
+ <nd ref='-34109' />
+ <nd ref='-34107' />
+ <nd ref='-34105' />
+ <nd ref='-34103' />
+ <nd ref='-42195' />
+ <nd ref='-40769' />
+ <nd ref='-42193' />
+ <nd ref='-42191' />
+ <nd ref='-36615' />
+ <tag k='ISO3166-1:alpha2' v='LY' />
+ <tag k='name:en' v='Libya' />
+ </way>
+ <way id='-57667'>
+ <nd ref='-40771' />
+ <nd ref='-40773' />
+ <nd ref='-36405' />
+ <nd ref='-40775' />
+ <nd ref='-40771' />
+ <tag k='ISO3166-1:alpha2' v='LC' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='St. Lucia' />
+ </way>
+ <way id='-57669'>
+ <nd ref='-37227' />
+ <nd ref='-44721' />
+ <nd ref='-44719' />
+ <nd ref='-44717' />
+ <nd ref='-44723' />
+ <nd ref='-44725' />
+ <nd ref='-44727' />
+ <nd ref='-44729' />
+ <nd ref='-44731' />
+ <nd ref='-44733' />
+ <nd ref='-44737' />
+ <nd ref='-44735' />
+ <nd ref='-37229' />
+ <nd ref='-44711' />
+ <nd ref='-44709' />
+ <nd ref='-44715' />
+ <nd ref='-44713' />
+ <nd ref='-44701' />
+ <nd ref='-44703' />
+ <nd ref='-44707' />
+ <nd ref='-44705' />
+ <nd ref='-37227' />
+ <tag k='ISO3166-1:alpha2' v='LI' />
+ <tag k='name:en' v='Liechtenstein' />
+ </way>
+ <way id='-57671'>
+ <nd ref='-40777' />
+ <nd ref='-34737' />
+ <nd ref='-34739' />
+ <nd ref='-34765' />
+ <nd ref='-34761' />
+ <nd ref='-34763' />
+ <nd ref='-34767' />
+ <nd ref='-40779' />
+ <nd ref='-34769' />
+ <nd ref='-34759' />
+ <nd ref='-34773' />
+ <nd ref='-34757' />
+ <nd ref='-34755' />
+ <nd ref='-34771' />
+ <nd ref='-40781' />
+ <nd ref='-34753' />
+ <nd ref='-34751' />
+ <nd ref='-34749' />
+ <nd ref='-34747' />
+ <nd ref='-42373' />
+ <nd ref='-34745' />
+ <nd ref='-34743' />
+ <nd ref='-34741' />
+ <nd ref='-40777' />
+ <tag k='ISO3166-1:alpha2' v='LS' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Lesotho' />
+ </way>
+ <way id='-57673'>
+ <nd ref='-40887' />
+ <nd ref='-34895' />
+ <nd ref='-34901' />
+ <nd ref='-34897' />
+ <nd ref='-34899' />
+ <nd ref='-34903' />
+ <nd ref='-37847' />
+ <nd ref='-46595' />
+ <nd ref='-46597' />
+ <nd ref='-46599' />
+ <nd ref='-46601' />
+ <nd ref='-46603' />
+ <nd ref='-46605' />
+ <nd ref='-46607' />
+ <nd ref='-46609' />
+ <nd ref='-46611' />
+ <nd ref='-46613' />
+ <nd ref='-46615' />
+ <nd ref='-46619' />
+ <nd ref='-46621' />
+ <nd ref='-46617' />
+ <nd ref='-46593' />
+ <nd ref='-46591' />
+ <nd ref='-46589' />
+ <nd ref='-46587' />
+ <nd ref='-46585' />
+ <nd ref='-46583' />
+ <nd ref='-46581' />
+ <nd ref='-46579' />
+ <nd ref='-46577' />
+ <nd ref='-46531' />
+ <nd ref='-46575' />
+ <nd ref='-46571' />
+ <nd ref='-46573' />
+ <nd ref='-46569' />
+ <nd ref='-46567' />
+ <nd ref='-46565' />
+ <nd ref='-46563' />
+ <nd ref='-46561' />
+ <nd ref='-46559' />
+ <nd ref='-46557' />
+ <nd ref='-46555' />
+ <nd ref='-46553' />
+ <nd ref='-46551' />
+ <nd ref='-46549' />
+ <nd ref='-46547' />
+ <nd ref='-46543' />
+ <nd ref='-46545' />
+ <nd ref='-46541' />
+ <nd ref='-46539' />
+ <nd ref='-46537' />
+ <nd ref='-46535' />
+ <nd ref='-46533' />
+ <nd ref='-46503' />
+ <nd ref='-46529' />
+ <nd ref='-46527' />
+ <nd ref='-46525' />
+ <nd ref='-46523' />
+ <nd ref='-46507' />
+ <nd ref='-46511' />
+ <nd ref='-46509' />
+ <nd ref='-46513' />
+ <nd ref='-46515' />
+ <nd ref='-46521' />
+ <nd ref='-46517' />
+ <nd ref='-46519' />
+ <nd ref='-46505' />
+ <nd ref='-40783' />
+ <nd ref='-46649' />
+ <nd ref='-46647' />
+ <nd ref='-46645' />
+ <nd ref='-46643' />
+ <nd ref='-46641' />
+ <nd ref='-46639' />
+ <nd ref='-46637' />
+ <nd ref='-46635' />
+ <nd ref='-46633' />
+ <nd ref='-46631' />
+ <nd ref='-46629' />
+ <nd ref='-46627' />
+ <nd ref='-46625' />
+ <nd ref='-46623' />
+ <nd ref='-41619' />
+ <nd ref='-46453' />
+ <nd ref='-46455' />
+ <nd ref='-46457' />
+ <nd ref='-46459' />
+ <nd ref='-46461' />
+ <nd ref='-46463' />
+ <nd ref='-46465' />
+ <nd ref='-46467' />
+ <nd ref='-46469' />
+ <nd ref='-46471' />
+ <nd ref='-46473' />
+ <nd ref='-46477' />
+ <nd ref='-46475' />
+ <nd ref='-46479' />
+ <nd ref='-46481' />
+ <nd ref='-46483' />
+ <nd ref='-46485' />
+ <nd ref='-46487' />
+ <nd ref='-46489' />
+ <nd ref='-46491' />
+ <nd ref='-46493' />
+ <nd ref='-46495' />
+ <nd ref='-46497' />
+ <nd ref='-46501' />
+ <nd ref='-46499' />
+ <nd ref='-40785' />
+ <nd ref='-40787' />
+ <nd ref='-40789' />
+ <nd ref='-40791' />
+ <nd ref='-40793' />
+ <nd ref='-43047' />
+ <nd ref='-43049' />
+ <nd ref='-40891' />
+ <nd ref='-40889' />
+ <nd ref='-34873' />
+ <nd ref='-34871' />
+ <nd ref='-40795' />
+ <nd ref='-34889' />
+ <nd ref='-34891' />
+ <nd ref='-34893' />
+ <nd ref='-34887' />
+ <nd ref='-34877' />
+ <nd ref='-34875' />
+ <nd ref='-34883' />
+ <nd ref='-34881' />
+ <nd ref='-34879' />
+ <nd ref='-34885' />
+ <nd ref='-40887' />
+ <tag k='ISO3166-1:alpha2' v='LT' />
+ <tag k='maxspeed:motorway' v='120' />
+ <tag k='maxspeed:rural' v='90' />
+ <tag k='maxspeed:source' v='http://ec.europa.eu/transport/road_safety/going_abroad/lithuania/speed_limits_en.htm' />
+ <tag k='maxspeed:unpaved' v='70' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Lithuania' />
+ </way>
+ <way id='-57675'>
+ <nd ref='-40797' />
+ <nd ref='-40799' />
+ <nd ref='-39141' />
+ <nd ref='-45097' />
+ <nd ref='-39139' />
+ <nd ref='-39137' />
+ <nd ref='-40801' />
+ <nd ref='-39135' />
+ <nd ref='-39133' />
+ <nd ref='-40803' />
+ <nd ref='-40805' />
+ <nd ref='-39131' />
+ <nd ref='-39129' />
+ <nd ref='-39127' />
+ <nd ref='-40807' />
+ <nd ref='-40809' />
+ <nd ref='-45093' />
+ <nd ref='-45095' />
+ <nd ref='-40811' />
+ <nd ref='-39125' />
+ <nd ref='-45087' />
+ <nd ref='-45089' />
+ <nd ref='-45091' />
+ <nd ref='-39123' />
+ <nd ref='-39121' />
+ <nd ref='-45077' />
+ <nd ref='-45079' />
+ <nd ref='-45081' />
+ <nd ref='-45083' />
+ <nd ref='-45085' />
+ <nd ref='-40813' />
+ <nd ref='-39119' />
+ <nd ref='-39117' />
+ <nd ref='-45075' />
+ <nd ref='-39115' />
+ <nd ref='-45071' />
+ <nd ref='-45073' />
+ <nd ref='-39113' />
+ <nd ref='-40815' />
+ <nd ref='-45067' />
+ <nd ref='-45069' />
+ <nd ref='-45065' />
+ <nd ref='-40817' />
+ <nd ref='-45055' />
+ <nd ref='-45053' />
+ <nd ref='-45051' />
+ <nd ref='-45057' />
+ <nd ref='-45059' />
+ <nd ref='-45061' />
+ <nd ref='-45063' />
+ <nd ref='-39111' />
+ <nd ref='-45033' />
+ <nd ref='-45037' />
+ <nd ref='-45035' />
+ <nd ref='-45039' />
+ <nd ref='-45031' />
+ <nd ref='-45043' />
+ <nd ref='-45045' />
+ <nd ref='-45041' />
+ <nd ref='-45049' />
+ <nd ref='-45047' />
+ <nd ref='-39109' />
+ <nd ref='-45029' />
+ <nd ref='-39107' />
+ <nd ref='-39105' />
+ <nd ref='-45027' />
+ <nd ref='-39103' />
+ <nd ref='-39101' />
+ <nd ref='-39099' />
+ <nd ref='-39097' />
+ <nd ref='-40819' />
+ <nd ref='-45025' />
+ <nd ref='-45023' />
+ <nd ref='-40821' />
+ <nd ref='-39095' />
+ <nd ref='-45021' />
+ <nd ref='-39093' />
+ <nd ref='-40823' />
+ <nd ref='-40825' />
+ <nd ref='-39091' />
+ <nd ref='-40827' />
+ <nd ref='-40829' />
+ <nd ref='-45019' />
+ <nd ref='-45017' />
+ <nd ref='-39647' />
+ <nd ref='-45015' />
+ <nd ref='-45013' />
+ <nd ref='-45011' />
+ <nd ref='-45009' />
+ <nd ref='-45007' />
+ <nd ref='-39645' />
+ <nd ref='-45003' />
+ <nd ref='-45005' />
+ <nd ref='-39643' />
+ <nd ref='-40831' />
+ <nd ref='-45001' />
+ <nd ref='-40833' />
+ <nd ref='-39641' />
+ <nd ref='-39639' />
+ <nd ref='-39637' />
+ <nd ref='-40835' />
+ <nd ref='-39635' />
+ <nd ref='-40837' />
+ <nd ref='-39633' />
+ <nd ref='-44999' />
+ <nd ref='-44997' />
+ <nd ref='-44995' />
+ <nd ref='-39631' />
+ <nd ref='-40839' />
+ <nd ref='-40841' />
+ <nd ref='-40843' />
+ <nd ref='-37531' />
+ <nd ref='-40845' />
+ <nd ref='-44993' />
+ <nd ref='-40847' />
+ <nd ref='-40849' />
+ <nd ref='-37529' />
+ <nd ref='-40851' />
+ <nd ref='-44991' />
+ <nd ref='-44989' />
+ <nd ref='-40853' />
+ <nd ref='-44987' />
+ <nd ref='-40855' />
+ <nd ref='-37527' />
+ <nd ref='-37525' />
+ <nd ref='-40857' />
+ <nd ref='-40859' />
+ <nd ref='-44985' />
+ <nd ref='-37523' />
+ <nd ref='-44983' />
+ <nd ref='-37521' />
+ <nd ref='-40861' />
+ <nd ref='-40863' />
+ <nd ref='-44981' />
+ <nd ref='-37519' />
+ <nd ref='-37517' />
+ <nd ref='-40865' />
+ <nd ref='-40867' />
+ <nd ref='-44979' />
+ <nd ref='-44977' />
+ <nd ref='-44975' />
+ <nd ref='-44971' />
+ <nd ref='-44973' />
+ <nd ref='-40869' />
+ <nd ref='-40871' />
+ <nd ref='-40873' />
+ <nd ref='-44965' />
+ <nd ref='-44967' />
+ <nd ref='-44969' />
+ <nd ref='-40875' />
+ <nd ref='-44961' />
+ <nd ref='-37515' />
+ <nd ref='-44963' />
+ <nd ref='-40877' />
+ <nd ref='-44959' />
+ <nd ref='-37513' />
+ <nd ref='-40879' />
+ <nd ref='-40881' />
+ <nd ref='-37511' />
+ <nd ref='-37509' />
+ <nd ref='-40883' />
+ <nd ref='-37507' />
+ <nd ref='-40885' />
+ <nd ref='-37505' />
+ <nd ref='-44955' />
+ <nd ref='-44957' />
+ <nd ref='-44953' />
+ <nd ref='-40797' />
+ <tag k='ISO3166-1:alpha2' v='LU' />
+ <tag k='name:en' v='Luxembourg' />
+ </way>
+ <way id='-57677'>
+ <nd ref='-39553' />
+ <nd ref='-34925' />
+ <nd ref='-34927' />
+ <nd ref='-34929' />
+ <nd ref='-34941' />
+ <nd ref='-34939' />
+ <nd ref='-34935' />
+ <nd ref='-34937' />
+ <nd ref='-34931' />
+ <nd ref='-34933' />
+ <nd ref='-34945' />
+ <nd ref='-34943' />
+ <nd ref='-37809' />
+ <nd ref='-34905' />
+ <nd ref='-34907' />
+ <nd ref='-34911' />
+ <nd ref='-34909' />
+ <nd ref='-34913' />
+ <nd ref='-34915' />
+ <nd ref='-34917' />
+ <nd ref='-34919' />
+ <nd ref='-34921' />
+ <nd ref='-34923' />
+ <nd ref='-37847' />
+ <nd ref='-34903' />
+ <nd ref='-34899' />
+ <nd ref='-34897' />
+ <nd ref='-34901' />
+ <nd ref='-34895' />
+ <nd ref='-40887' />
+ <nd ref='-34885' />
+ <nd ref='-34879' />
+ <nd ref='-34881' />
+ <nd ref='-34883' />
+ <nd ref='-34875' />
+ <nd ref='-34877' />
+ <nd ref='-34887' />
+ <nd ref='-34893' />
+ <nd ref='-34891' />
+ <nd ref='-34889' />
+ <nd ref='-40795' />
+ <nd ref='-34871' />
+ <nd ref='-34873' />
+ <nd ref='-40889' />
+ <nd ref='-40891' />
+ <nd ref='-40893' />
+ <nd ref='-43043' />
+ <nd ref='-43045' />
+ <nd ref='-40895' />
+ <nd ref='-39559' />
+ <nd ref='-39557' />
+ <nd ref='-39555' />
+ <nd ref='-34949' />
+ <nd ref='-34951' />
+ <nd ref='-34947' />
+ <nd ref='-34973' />
+ <nd ref='-34971' />
+ <nd ref='-34955' />
+ <nd ref='-34957' />
+ <nd ref='-34959' />
+ <nd ref='-34961' />
+ <nd ref='-34963' />
+ <nd ref='-34953' />
+ <nd ref='-34965' />
+ <nd ref='-34967' />
+ <nd ref='-34969' />
+ <nd ref='-34979' />
+ <nd ref='-34977' />
+ <nd ref='-34975' />
+ <nd ref='-34981' />
+ <nd ref='-34983' />
+ <nd ref='-39553' />
+ <tag k='ISO3166-1:alpha2' v='LV' />
+ <tag k='name:en' v='Latvia' />
+ </way>
+ <way id='-57679'>
+ <nd ref='-40903' />
+ <nd ref='-40905' />
+ <nd ref='-45099' />
+ <nd ref='-45101' />
+ <nd ref='-45105' />
+ <nd ref='-45103' />
+ <nd ref='-40907' />
+ <nd ref='-40909' />
+ <nd ref='-39281' />
+ <nd ref='-39279' />
+ <nd ref='-39277' />
+ <nd ref='-45107' />
+ <nd ref='-45109' />
+ <nd ref='-40911' />
+ <nd ref='-45111' />
+ <nd ref='-39275' />
+ <nd ref='-39273' />
+ <nd ref='-39271' />
+ <nd ref='-45113' />
+ <nd ref='-45117' />
+ <nd ref='-45115' />
+ <nd ref='-40913' />
+ <nd ref='-39269' />
+ <nd ref='-40915' />
+ <nd ref='-40917' />
+ <nd ref='-39267' />
+ <nd ref='-45119' />
+ <nd ref='-45121' />
+ <nd ref='-45123' />
+ <nd ref='-45125' />
+ <nd ref='-39265' />
+ <nd ref='-39263' />
+ <nd ref='-45127' />
+ <nd ref='-40919' />
+ <nd ref='-40921' />
+ <nd ref='-39261' />
+ <nd ref='-40923' />
+ <nd ref='-39259' />
+ <nd ref='-39257' />
+ <nd ref='-40925' />
+ <nd ref='-39255' />
+ <nd ref='-45129' />
+ <nd ref='-39253' />
+ <nd ref='-39251' />
+ <nd ref='-41821' />
+ <nd ref='-40927' />
+ <nd ref='-41819' />
+ <nd ref='-40929' />
+ <nd ref='-40931' />
+ <nd ref='-36307' />
+ <nd ref='-40933' />
+ <nd ref='-40935' />
+ <nd ref='-41817' />
+ <nd ref='-41815' />
+ <nd ref='-40937' />
+ <nd ref='-41813' />
+ <nd ref='-40939' />
+ <nd ref='-41811' />
+ <nd ref='-41809' />
+ <nd ref='-40941' />
+ <nd ref='-41807' />
+ <nd ref='-40943' />
+ <nd ref='-40945' />
+ <nd ref='-41805' />
+ <nd ref='-40947' />
+ <nd ref='-40949' />
+ <nd ref='-40951' />
+ <nd ref='-40953' />
+ <nd ref='-36457' />
+ <nd ref='-36459' />
+ <nd ref='-53851' />
+ <nd ref='-36833' />
+ <nd ref='-39519' />
+ <nd ref='-53855' />
+ <nd ref='-36463' />
+ <nd ref='-40903' />
+ </way>
+ <way id='-57681'>
+ <nd ref='-39685' />
+ <nd ref='-36493' />
+ <nd ref='-40955' />
+ <nd ref='-39687' />
+ <nd ref='-40957' />
+ <nd ref='-40959' />
+ <nd ref='-40961' />
+ <nd ref='-39685' />
+ <tag k='ISO3166-1:alpha2' v='MC' />
+ <tag k='name:en' v='Monaco' />
+ </way>
+ <way id='-57683'>
+ <nd ref='-40963' />
+ <nd ref='-40965' />
+ <nd ref='-50699' />
+ <nd ref='-50701' />
+ <nd ref='-50703' />
+ <nd ref='-50685' />
+ <nd ref='-50687' />
+ <nd ref='-50691' />
+ <nd ref='-50689' />
+ <nd ref='-50695' />
+ <nd ref='-50693' />
+ <nd ref='-50697' />
+ <nd ref='-50683' />
+ <nd ref='-50681' />
+ <nd ref='-50679' />
+ <nd ref='-40967' />
+ <nd ref='-50677' />
+ <nd ref='-50665' />
+ <nd ref='-50667' />
+ <nd ref='-50675' />
+ <nd ref='-50673' />
+ <nd ref='-50671' />
+ <nd ref='-50669' />
+ <nd ref='-50663' />
+ <nd ref='-40969' />
+ <nd ref='-50653' />
+ <nd ref='-50655' />
+ <nd ref='-50657' />
+ <nd ref='-50659' />
+ <nd ref='-50661' />
+ <nd ref='-50651' />
+ <nd ref='-50649' />
+ <nd ref='-50647' />
+ <nd ref='-40971' />
+ <nd ref='-40973' />
+ <nd ref='-40975' />
+ <nd ref='-50645' />
+ <nd ref='-50643' />
+ <nd ref='-50641' />
+ <nd ref='-50639' />
+ <nd ref='-50637' />
+ <nd ref='-50635' />
+ <nd ref='-50633' />
+ <nd ref='-50631' />
+ <nd ref='-50623' />
+ <nd ref='-50629' />
+ <nd ref='-50627' />
+ <nd ref='-50625' />
+ <nd ref='-40977' />
+ <nd ref='-40979' />
+ <nd ref='-50621' />
+ <nd ref='-50617' />
+ <nd ref='-50615' />
+ <nd ref='-50613' />
+ <nd ref='-50619' />
+ <nd ref='-50611' />
+ <nd ref='-50607' />
+ <nd ref='-50609' />
+ <nd ref='-50605' />
+ <nd ref='-50603' />
+ <nd ref='-40981' />
+ <nd ref='-50595' />
+ <nd ref='-40983' />
+ <nd ref='-50601' />
+ <nd ref='-50599' />
+ <nd ref='-50597' />
+ <nd ref='-50591' />
+ <nd ref='-50593' />
+ <nd ref='-50589' />
+ <nd ref='-50573' />
+ <nd ref='-50585' />
+ <nd ref='-50587' />
+ <nd ref='-50579' />
+ <nd ref='-50577' />
+ <nd ref='-50575' />
+ <nd ref='-50583' />
+ <nd ref='-50581' />
+ <nd ref='-40985' />
+ <nd ref='-41691' />
+ <nd ref='-41689' />
+ <nd ref='-50571' />
+ <nd ref='-40987' />
+ <nd ref='-50561' />
+ <nd ref='-50563' />
+ <nd ref='-50565' />
+ <nd ref='-50567' />
+ <nd ref='-50569' />
+ <nd ref='-41687' />
+ <nd ref='-50557' />
+ <nd ref='-50559' />
+ <nd ref='-41685' />
+ <nd ref='-50549' />
+ <nd ref='-50555' />
+ <nd ref='-50551' />
+ <nd ref='-50553' />
+ <nd ref='-40989' />
+ <nd ref='-50545' />
+ <nd ref='-41683' />
+ <nd ref='-50547' />
+ <nd ref='-41681' />
+ <nd ref='-50543' />
+ <nd ref='-40991' />
+ <nd ref='-50509' />
+ <nd ref='-50511' />
+ <nd ref='-50513' />
+ <nd ref='-50515' />
+ <nd ref='-50517' />
+ <nd ref='-50519' />
+ <nd ref='-50521' />
+ <nd ref='-50523' />
+ <nd ref='-50525' />
+ <nd ref='-50527' />
+ <nd ref='-40993' />
+ <nd ref='-40995' />
+ <nd ref='-50529' />
+ <nd ref='-50531' />
+ <nd ref='-50533' />
+ <nd ref='-50535' />
+ <nd ref='-50537' />
+ <nd ref='-50539' />
+ <nd ref='-50541' />
+ <nd ref='-40963' />
+ <tag k='ISO3166-1:alpha2' v='MD' />
+ <tag k='name:en' v='Moldova' />
+ </way>
+ <way id='-57685'>
+ <nd ref='-40997' />
+ <nd ref='-40999' />
+ <nd ref='-41001' />
+ <nd ref='-42647' />
+ <nd ref='-42645' />
+ <nd ref='-53835' />
+ <nd ref='-42643' />
+ <nd ref='-40997' />
+ <tag k='ISO3166-1:alpha2' v='MG' />
+ <tag k='name:en' v='Madagascar' />
+ </way>
+ <way id='-57687'>
+ <nd ref='-37751' />
+ <nd ref='-46799' />
+ <nd ref='-46797' />
+ <nd ref='-46801' />
+ <nd ref='-46803' />
+ <nd ref='-46805' />
+ <nd ref='-46795' />
+ <nd ref='-46807' />
+ <nd ref='-46809' />
+ <nd ref='-46811' />
+ <nd ref='-46813' />
+ <nd ref='-46815' />
+ <nd ref='-46817' />
+ <nd ref='-39861' />
+ <nd ref='-46865' />
+ <nd ref='-46863' />
+ <nd ref='-46861' />
+ <nd ref='-46859' />
+ <nd ref='-46853' />
+ <nd ref='-46857' />
+ <nd ref='-46855' />
+ <nd ref='-46847' />
+ <nd ref='-46851' />
+ <nd ref='-46849' />
+ <nd ref='-46845' />
+ <nd ref='-46829' />
+ <nd ref='-46831' />
+ <nd ref='-46833' />
+ <nd ref='-46835' />
+ <nd ref='-46843' />
+ <nd ref='-46841' />
+ <nd ref='-46839' />
+ <nd ref='-46837' />
+ <nd ref='-46823' />
+ <nd ref='-46827' />
+ <nd ref='-46825' />
+ <nd ref='-46821' />
+ <nd ref='-46819' />
+ <nd ref='-36997' />
+ <nd ref='-46911' />
+ <nd ref='-46913' />
+ <nd ref='-46909' />
+ <nd ref='-46907' />
+ <nd ref='-46901' />
+ <nd ref='-46905' />
+ <nd ref='-46903' />
+ <nd ref='-46893' />
+ <nd ref='-46897' />
+ <nd ref='-46895' />
+ <nd ref='-46899' />
+ <nd ref='-46883' />
+ <nd ref='-46885' />
+ <nd ref='-46887' />
+ <nd ref='-46889' />
+ <nd ref='-46891' />
+ <nd ref='-46867' />
+ <nd ref='-46869' />
+ <nd ref='-46871' />
+ <nd ref='-46881' />
+ <nd ref='-46879' />
+ <nd ref='-46877' />
+ <nd ref='-46873' />
+ <nd ref='-46875' />
+ <nd ref='-36995' />
+ <nd ref='-46723' />
+ <nd ref='-46725' />
+ <nd ref='-46727' />
+ <nd ref='-46729' />
+ <nd ref='-46731' />
+ <nd ref='-46733' />
+ <nd ref='-46735' />
+ <nd ref='-46737' />
+ <nd ref='-46739' />
+ <nd ref='-46741' />
+ <nd ref='-46743' />
+ <nd ref='-46747' />
+ <nd ref='-46745' />
+ <nd ref='-41085' />
+ <nd ref='-46789' />
+ <nd ref='-46793' />
+ <nd ref='-46791' />
+ <nd ref='-46787' />
+ <nd ref='-46783' />
+ <nd ref='-46785' />
+ <nd ref='-46781' />
+ <nd ref='-46779' />
+ <nd ref='-37751' />
+ <tag k='ISO3166-1:alpha2' v='MK' />
+ <tag k='name:en' v='Macedonia, FYR' />
+ </way>
+ <way id='-57689'>
+ <nd ref='-39249' />
+ <nd ref='-39247' />
+ <nd ref='-34075' />
+ <nd ref='-34077' />
+ <nd ref='-34079' />
+ <nd ref='-34081' />
+ <nd ref='-39245' />
+ <nd ref='-41087' />
+ <nd ref='-32101' />
+ <nd ref='-41089' />
+ <nd ref='-41091' />
+ <nd ref='-41093' />
+ <nd ref='-32099' />
+ <nd ref='-41095' />
+ <nd ref='-41097' />
+ <nd ref='-32097' />
+ <nd ref='-37625' />
+ <nd ref='-32091' />
+ <nd ref='-32093' />
+ <nd ref='-32095' />
+ <nd ref='-37667' />
+ <nd ref='-37665' />
+ <nd ref='-37663' />
+ <nd ref='-37661' />
+ <nd ref='-37659' />
+ <nd ref='-37657' />
+ <nd ref='-37655' />
+ <nd ref='-32083' />
+ <nd ref='-32087' />
+ <nd ref='-32085' />
+ <nd ref='-32089' />
+ <nd ref='-37653' />
+ <nd ref='-37651' />
+ <nd ref='-37649' />
+ <nd ref='-37647' />
+ <nd ref='-37645' />
+ <nd ref='-32075' />
+ <nd ref='-32081' />
+ <nd ref='-32077' />
+ <nd ref='-32079' />
+ <nd ref='-37643' />
+ <nd ref='-37641' />
+ <nd ref='-32073' />
+ <nd ref='-32069' />
+ <nd ref='-32071' />
+ <nd ref='-32057' />
+ <nd ref='-32059' />
+ <nd ref='-32061' />
+ <nd ref='-32063' />
+ <nd ref='-32065' />
+ <nd ref='-32067' />
+ <nd ref='-32055' />
+ <nd ref='-32053' />
+ <nd ref='-32047' />
+ <nd ref='-32051' />
+ <nd ref='-32049' />
+ <nd ref='-32045' />
+ <nd ref='-32035' />
+ <nd ref='-32031' />
+ <nd ref='-32033' />
+ <nd ref='-32037' />
+ <nd ref='-32039' />
+ <nd ref='-32041' />
+ <nd ref='-32043' />
+ <nd ref='-32025' />
+ <nd ref='-32027' />
+ <nd ref='-32029' />
+ <nd ref='-38739' />
+ <nd ref='-31991' />
+ <nd ref='-31993' />
+ <nd ref='-31995' />
+ <nd ref='-31999' />
+ <nd ref='-31997' />
+ <nd ref='-32019' />
+ <nd ref='-32013' />
+ <nd ref='-32015' />
+ <nd ref='-32017' />
+ <nd ref='-32011' />
+ <nd ref='-32021' />
+ <nd ref='-32001' />
+ <nd ref='-32003' />
+ <nd ref='-32005' />
+ <nd ref='-32007' />
+ <nd ref='-32009' />
+ <nd ref='-32023' />
+ <nd ref='-41099' />
+ <nd ref='-31979' />
+ <nd ref='-31981' />
+ <nd ref='-31983' />
+ <nd ref='-31985' />
+ <nd ref='-31987' />
+ <nd ref='-31989' />
+ <nd ref='-39803' />
+ <nd ref='-33889' />
+ <nd ref='-33891' />
+ <nd ref='-33893' />
+ <nd ref='-31975' />
+ <nd ref='-31977' />
+ <nd ref='-33895' />
+ <nd ref='-33897' />
+ <nd ref='-33899' />
+ <nd ref='-33901' />
+ <nd ref='-33903' />
+ <nd ref='-33905' />
+ <nd ref='-33907' />
+ <nd ref='-33909' />
+ <nd ref='-33911' />
+ <nd ref='-33913' />
+ <nd ref='-33915' />
+ <nd ref='-33917' />
+ <nd ref='-33919' />
+ <nd ref='-33921' />
+ <nd ref='-33923' />
+ <nd ref='-33925' />
+ <nd ref='-39801' />
+ <nd ref='-34251' />
+ <nd ref='-34253' />
+ <nd ref='-34257' />
+ <nd ref='-34259' />
+ <nd ref='-34255' />
+ <nd ref='-41341' />
+ <nd ref='-35065' />
+ <nd ref='-35063' />
+ <nd ref='-41339' />
+ <nd ref='-41337' />
+ <nd ref='-35067' />
+ <nd ref='-41101' />
+ <nd ref='-41335' />
+ <nd ref='-41333' />
+ <nd ref='-41103' />
+ <nd ref='-41331' />
+ <nd ref='-41329' />
+ <nd ref='-41327' />
+ <nd ref='-41325' />
+ <nd ref='-41105' />
+ <nd ref='-39249' />
+ <tag k='ISO3166-1:alpha2' v='ML' />
+ <tag k='name:en' v='Mali' />
+ </way>
+ <way id='-57691'>
+ <nd ref='-37695' />
+ <nd ref='-37693' />
+ <nd ref='-52911' />
+ <nd ref='-52909' />
+ <nd ref='-52913' />
+ <nd ref='-52915' />
+ <nd ref='-52917' />
+ <nd ref='-52919' />
+ <nd ref='-52921' />
+ <nd ref='-52923' />
+ <nd ref='-52925' />
+ <nd ref='-52927' />
+ <nd ref='-52929' />
+ <nd ref='-52931' />
+ <nd ref='-52907' />
+ <nd ref='-52941' />
+ <nd ref='-52943' />
+ <nd ref='-52935' />
+ <nd ref='-52937' />
+ <nd ref='-52933' />
+ <nd ref='-52939' />
+ <nd ref='-52945' />
+ <nd ref='-40005' />
+ <nd ref='-40003' />
+ <nd ref='-52957' />
+ <nd ref='-52953' />
+ <nd ref='-52955' />
+ <nd ref='-52947' />
+ <nd ref='-52949' />
+ <nd ref='-52951' />
+ <nd ref='-40001' />
+ <nd ref='-52959' />
+ <nd ref='-52961' />
+ <nd ref='-52963' />
+ <nd ref='-39999' />
+ <nd ref='-39997' />
+ <nd ref='-52965' />
+ <nd ref='-52967' />
+ <nd ref='-52969' />
+ <nd ref='-39995' />
+ <nd ref='-52971' />
+ <nd ref='-39993' />
+ <nd ref='-52977' />
+ <nd ref='-52979' />
+ <nd ref='-52981' />
+ <nd ref='-52985' />
+ <nd ref='-52983' />
+ <nd ref='-52975' />
+ <nd ref='-52973' />
+ <nd ref='-52987' />
+ <nd ref='-52989' />
+ <nd ref='-52993' />
+ <nd ref='-52991' />
+ <nd ref='-39991' />
+ <nd ref='-52995' />
+ <nd ref='-39989' />
+ <nd ref='-52997' />
+ <nd ref='-52999' />
+ <nd ref='-53001' />
+ <nd ref='-53003' />
+ <nd ref='-39987' />
+ <nd ref='-53005' />
+ <nd ref='-53007' />
+ <nd ref='-53011' />
+ <nd ref='-53013' />
+ <nd ref='-53009' />
+ <nd ref='-39985' />
+ <nd ref='-53019' />
+ <nd ref='-53021' />
+ <nd ref='-53025' />
+ <nd ref='-53023' />
+ <nd ref='-53017' />
+ <nd ref='-53015' />
+ <nd ref='-53027' />
+ <nd ref='-39983' />
+ <nd ref='-39981' />
+ <nd ref='-53029' />
+ <nd ref='-53033' />
+ <nd ref='-53037' />
+ <nd ref='-53035' />
+ <nd ref='-53031' />
+ <nd ref='-38491' />
+ <nd ref='-52893' />
+ <nd ref='-52895' />
+ <nd ref='-52897' />
+ <nd ref='-52891' />
+ <nd ref='-52901' />
+ <nd ref='-52899' />
+ <nd ref='-52903' />
+ <nd ref='-52905' />
+ <nd ref='-52881' />
+ <nd ref='-52883' />
+ <nd ref='-52885' />
+ <nd ref='-52887' />
+ <nd ref='-52889' />
+ <nd ref='-38489' />
+ <nd ref='-52879' />
+ <nd ref='-52877' />
+ <nd ref='-52875' />
+ <nd ref='-52873' />
+ <nd ref='-38487' />
+ <nd ref='-52871' />
+ <nd ref='-52869' />
+ <nd ref='-52867' />
+ <nd ref='-52865' />
+ <nd ref='-52863' />
+ <nd ref='-52859' />
+ <nd ref='-52857' />
+ <nd ref='-52861' />
+ <nd ref='-52855' />
+ <nd ref='-52853' />
+ <nd ref='-52851' />
+ <nd ref='-52849' />
+ <nd ref='-52847' />
+ <nd ref='-52843' />
+ <nd ref='-52845' />
+ <nd ref='-52841' />
+ <nd ref='-52839' />
+ <nd ref='-52837' />
+ <nd ref='-52835' />
+ <nd ref='-52833' />
+ <nd ref='-38485' />
+ <nd ref='-52831' />
+ <nd ref='-52815' />
+ <nd ref='-52817' />
+ <nd ref='-52827' />
+ <nd ref='-52829' />
+ <nd ref='-52819' />
+ <nd ref='-52825' />
+ <nd ref='-52821' />
+ <nd ref='-52823' />
+ <nd ref='-38483' />
+ <nd ref='-38481' />
+ <nd ref='-38479' />
+ <nd ref='-52813' />
+ <nd ref='-38477' />
+ <nd ref='-52809' />
+ <nd ref='-52811' />
+ <nd ref='-38475' />
+ <nd ref='-52807' />
+ <nd ref='-52805' />
+ <nd ref='-52787' />
+ <nd ref='-52789' />
+ <nd ref='-52795' />
+ <nd ref='-52791' />
+ <nd ref='-52797' />
+ <nd ref='-52793' />
+ <nd ref='-52801' />
+ <nd ref='-52799' />
+ <nd ref='-52803' />
+ <nd ref='-38473' />
+ <nd ref='-52779' />
+ <nd ref='-52783' />
+ <nd ref='-52785' />
+ <nd ref='-52781' />
+ <nd ref='-38471' />
+ <nd ref='-38469' />
+ <nd ref='-38467' />
+ <nd ref='-38465' />
+ <nd ref='-52771' />
+ <nd ref='-52777' />
+ <nd ref='-52773' />
+ <nd ref='-52775' />
+ <nd ref='-38463' />
+ <nd ref='-52765' />
+ <nd ref='-52767' />
+ <nd ref='-52769' />
+ <nd ref='-52733' />
+ <nd ref='-52739' />
+ <nd ref='-52737' />
+ <nd ref='-52735' />
+ <nd ref='-52741' />
+ <nd ref='-52743' />
+ <nd ref='-52745' />
+ <nd ref='-52747' />
+ <nd ref='-52761' />
+ <nd ref='-52763' />
+ <nd ref='-52759' />
+ <nd ref='-52757' />
+ <nd ref='-52753' />
+ <nd ref='-52755' />
+ <nd ref='-52749' />
+ <nd ref='-52751' />
+ <nd ref='-38461' />
+ <nd ref='-38459' />
+ <nd ref='-41107' />
+ <nd ref='-49477' />
+ <nd ref='-49471' />
+ <nd ref='-49469' />
+ <nd ref='-49455' />
+ <nd ref='-49467' />
+ <nd ref='-49465' />
+ <nd ref='-49463' />
+ <nd ref='-49461' />
+ <nd ref='-49459' />
+ <nd ref='-49457' />
+ <nd ref='-49451' />
+ <nd ref='-49453' />
+ <nd ref='-40727' />
+ <nd ref='-50315' />
+ <nd ref='-50313' />
+ <nd ref='-50311' />
+ <nd ref='-50309' />
+ <nd ref='-50307' />
+ <nd ref='-50305' />
+ <nd ref='-50303' />
+ <nd ref='-50301' />
+ <nd ref='-41109' />
+ <nd ref='-50299' />
+ <nd ref='-50297' />
+ <nd ref='-41111' />
+ <nd ref='-50295' />
+ <nd ref='-41113' />
+ <nd ref='-50293' />
+ <nd ref='-50289' />
+ <nd ref='-50291' />
+ <nd ref='-41115' />
+ <nd ref='-41117' />
+ <nd ref='-50287' />
+ <nd ref='-50285' />
+ <nd ref='-41119' />
+ <nd ref='-41121' />
+ <nd ref='-41123' />
+ <nd ref='-41125' />
+ <nd ref='-50283' />
+ <nd ref='-50281' />
+ <nd ref='-41127' />
+ <nd ref='-41129' />
+ <nd ref='-41131' />
+ <nd ref='-41133' />
+ <nd ref='-50277' />
+ <nd ref='-50279' />
+ <nd ref='-41135' />
+ <nd ref='-50271' />
+ <nd ref='-50273' />
+ <nd ref='-50275' />
+ <nd ref='-41137' />
+ <nd ref='-41139' />
+ <nd ref='-50269' />
+ <nd ref='-50267' />
+ <nd ref='-41141' />
+ <nd ref='-50265' />
+ <nd ref='-41143' />
+ <nd ref='-50257' />
+ <nd ref='-50259' />
+ <nd ref='-50261' />
+ <nd ref='-50263' />
+ <nd ref='-41145' />
+ <nd ref='-50255' />
+ <nd ref='-50249' />
+ <nd ref='-50253' />
+ <nd ref='-50251' />
+ <nd ref='-50247' />
+ <nd ref='-50239' />
+ <nd ref='-50241' />
+ <nd ref='-50243' />
+ <nd ref='-41147' />
+ <nd ref='-50245' />
+ <nd ref='-50237' />
+ <nd ref='-41149' />
+ <nd ref='-41151' />
+ <nd ref='-50235' />
+ <nd ref='-41153' />
+ <nd ref='-41155' />
+ <nd ref='-41157' />
+ <nd ref='-50233' />
+ <nd ref='-50229' />
+ <nd ref='-50231' />
+ <nd ref='-41159' />
+ <nd ref='-41161' />
+ <nd ref='-41163' />
+ <nd ref='-41165' />
+ <nd ref='-41167' />
+ <nd ref='-41169' />
+ <nd ref='-50227' />
+ <nd ref='-50225' />
+ <nd ref='-50223' />
+ <nd ref='-41171' />
+ <nd ref='-50221' />
+ <nd ref='-41173' />
+ <nd ref='-50215' />
+ <nd ref='-50217' />
+ <nd ref='-50219' />
+ <nd ref='-50211' />
+ <nd ref='-50213' />
+ <nd ref='-41175' />
+ <nd ref='-50209' />
+ <nd ref='-41177' />
+ <nd ref='-50203' />
+ <nd ref='-50205' />
+ <nd ref='-50207' />
+ <nd ref='-41179' />
+ <nd ref='-50201' />
+ <nd ref='-50199' />
+ <nd ref='-50197' />
+ <nd ref='-50195' />
+ <nd ref='-50193' />
+ <nd ref='-50191' />
+ <nd ref='-42915' />
+ <nd ref='-43009' />
+ <nd ref='-43011' />
+ <nd ref='-42917' />
+ <nd ref='-42919' />
+ <nd ref='-42921' />
+ <nd ref='-42923' />
+ <nd ref='-42913' />
+ <nd ref='-42911' />
+ <nd ref='-42909' />
+ <nd ref='-37697' />
+ <nd ref='-50491' />
+ <nd ref='-50489' />
+ <nd ref='-50487' />
+ <nd ref='-50485' />
+ <nd ref='-50493' />
+ <nd ref='-50497' />
+ <nd ref='-50495' />
+ <nd ref='-50505' />
+ <nd ref='-50507' />
+ <nd ref='-50499' />
+ <nd ref='-50501' />
+ <nd ref='-50503' />
+ <nd ref='-37695' />
+ <tag k='ISO3166-1:alpha2' v='MM' />
+ <tag k='name:en' v='Myanmar' />
+ </way>
+ <way id='-57693'>
+ <nd ref='-41959' />
+ <nd ref='-46991' />
+ <nd ref='-46993' />
+ <nd ref='-46995' />
+ <nd ref='-46997' />
+ <nd ref='-46999' />
+ <nd ref='-47017' />
+ <nd ref='-47019' />
+ <nd ref='-47021' />
+ <nd ref='-47023' />
+ <nd ref='-47025' />
+ <nd ref='-47005' />
+ <nd ref='-47007' />
+ <nd ref='-47009' />
+ <nd ref='-47011' />
+ <nd ref='-47013' />
+ <nd ref='-47003' />
+ <nd ref='-47015' />
+ <nd ref='-47001' />
+ <nd ref='-41957' />
+ <nd ref='-46777' />
+ <nd ref='-46775' />
+ <nd ref='-46773' />
+ <nd ref='-46771' />
+ <nd ref='-46769' />
+ <nd ref='-46767' />
+ <nd ref='-36993' />
+ <nd ref='-46937' />
+ <nd ref='-46935' />
+ <nd ref='-46933' />
+ <nd ref='-46931' />
+ <nd ref='-46929' />
+ <nd ref='-46927' />
+ <nd ref='-46925' />
+ <nd ref='-46923' />
+ <nd ref='-46921' />
+ <nd ref='-46919' />
+ <nd ref='-46915' />
+ <nd ref='-46917' />
+ <nd ref='-37011' />
+ <nd ref='-37009' />
+ <nd ref='-41181' />
+ <nd ref='-36481' />
+ <nd ref='-36483' />
+ <nd ref='-37789' />
+ <nd ref='-47029' />
+ <nd ref='-47031' />
+ <nd ref='-47039' />
+ <nd ref='-47033' />
+ <nd ref='-47035' />
+ <nd ref='-47037' />
+ <nd ref='-47027' />
+ <nd ref='-47045' />
+ <nd ref='-47047' />
+ <nd ref='-47049' />
+ <nd ref='-47051' />
+ <nd ref='-47043' />
+ <nd ref='-47041' />
+ <nd ref='-47053' />
+ <nd ref='-47055' />
+ <nd ref='-47057' />
+ <nd ref='-47059' />
+ <nd ref='-47061' />
+ <nd ref='-47063' />
+ <nd ref='-47065' />
+ <nd ref='-47067' />
+ <nd ref='-47069' />
+ <nd ref='-47071' />
+ <nd ref='-47073' />
+ <nd ref='-47075' />
+ <nd ref='-47077' />
+ <nd ref='-47079' />
+ <nd ref='-47081' />
+ <nd ref='-47091' />
+ <nd ref='-47093' />
+ <nd ref='-47089' />
+ <nd ref='-47087' />
+ <nd ref='-47085' />
+ <nd ref='-47083' />
+ <nd ref='-41959' />
+ <tag k='ISO3166-1:alpha2' v='ME' />
+ <tag k='name:en' v='Montenegro' />
+ </way>
+ <way id='-57695'>
+ <nd ref='-41719' />
+ <nd ref='-31379' />
+ <nd ref='-31377' />
+ <nd ref='-31375' />
+ <nd ref='-41183' />
+ <nd ref='-31373' />
+ <nd ref='-31371' />
+ <nd ref='-31369' />
+ <nd ref='-31365' />
+ <nd ref='-31367' />
+ <nd ref='-31363' />
+ <nd ref='-41185' />
+ <nd ref='-41187' />
+ <nd ref='-31361' />
+ <nd ref='-31359' />
+ <nd ref='-41717' />
+ <nd ref='-31355' />
+ <nd ref='-31353' />
+ <nd ref='-31351' />
+ <nd ref='-31357' />
+ <nd ref='-31349' />
+ <nd ref='-41189' />
+ <nd ref='-41191' />
+ <nd ref='-43833' />
+ <nd ref='-43839' />
+ <nd ref='-43841' />
+ <nd ref='-43843' />
+ <nd ref='-43835' />
+ <nd ref='-43837' />
+ <nd ref='-41193' />
+ <nd ref='-38651' />
+ <nd ref='-38649' />
+ <nd ref='-41195' />
+ <nd ref='-41197' />
+ <nd ref='-38647' />
+ <nd ref='-41199' />
+ <nd ref='-38645' />
+ <nd ref='-41201' />
+ <nd ref='-38643' />
+ <nd ref='-41203' />
+ <nd ref='-31611' />
+ <nd ref='-41205' />
+ <nd ref='-41207' />
+ <nd ref='-38641' />
+ <nd ref='-31609' />
+ <nd ref='-41209' />
+ <nd ref='-31607' />
+ <nd ref='-31603' />
+ <nd ref='-31601' />
+ <nd ref='-31605' />
+ <nd ref='-41211' />
+ <nd ref='-38639' />
+ <nd ref='-41213' />
+ <nd ref='-38637' />
+ <nd ref='-41215' />
+ <nd ref='-38635' />
+ <nd ref='-31589' />
+ <nd ref='-31587' />
+ <nd ref='-31585' />
+ <nd ref='-31583' />
+ <nd ref='-31581' />
+ <nd ref='-31579' />
+ <nd ref='-31591' />
+ <nd ref='-31595' />
+ <nd ref='-31593' />
+ <nd ref='-31597' />
+ <nd ref='-31599' />
+ <nd ref='-38633' />
+ <nd ref='-31555' />
+ <nd ref='-31557' />
+ <nd ref='-31559' />
+ <nd ref='-31569' />
+ <nd ref='-31565' />
+ <nd ref='-31563' />
+ <nd ref='-31561' />
+ <nd ref='-31567' />
+ <nd ref='-31571' />
+ <nd ref='-31573' />
+ <nd ref='-31575' />
+ <nd ref='-31577' />
+ <nd ref='-41217' />
+ <nd ref='-38631' />
+ <nd ref='-31553' />
+ <nd ref='-38629' />
+ <nd ref='-31551' />
+ <nd ref='-41219' />
+ <nd ref='-31549' />
+ <nd ref='-38627' />
+ <nd ref='-38625' />
+ <nd ref='-38623' />
+ <nd ref='-41221' />
+ <nd ref='-38621' />
+ <nd ref='-31547' />
+ <nd ref='-38619' />
+ <nd ref='-38617' />
+ <nd ref='-38615' />
+ <nd ref='-31541' />
+ <nd ref='-31543' />
+ <nd ref='-31545' />
+ <nd ref='-41223' />
+ <nd ref='-31537' />
+ <nd ref='-31539' />
+ <nd ref='-41225' />
+ <nd ref='-38613' />
+ <nd ref='-38611' />
+ <nd ref='-31535' />
+ <nd ref='-41227' />
+ <nd ref='-41229' />
+ <nd ref='-31529' />
+ <nd ref='-31531' />
+ <nd ref='-31527' />
+ <nd ref='-31533' />
+ <nd ref='-41231' />
+ <nd ref='-31521' />
+ <nd ref='-31523' />
+ <nd ref='-31525' />
+ <nd ref='-31519' />
+ <nd ref='-38609' />
+ <nd ref='-31515' />
+ <nd ref='-31511' />
+ <nd ref='-31513' />
+ <nd ref='-31517' />
+ <nd ref='-41233' />
+ <nd ref='-38607' />
+ <nd ref='-31509' />
+ <nd ref='-38605' />
+ <nd ref='-41235' />
+ <nd ref='-41237' />
+ <nd ref='-31503' />
+ <nd ref='-31507' />
+ <nd ref='-31501' />
+ <nd ref='-31505' />
+ <nd ref='-38603' />
+ <nd ref='-31497' />
+ <nd ref='-31499' />
+ <nd ref='-41239' />
+ <nd ref='-41241' />
+ <nd ref='-38601' />
+ <nd ref='-38599' />
+ <nd ref='-38597' />
+ <nd ref='-38595' />
+ <nd ref='-41243' />
+ <nd ref='-38593' />
+ <nd ref='-38591' />
+ <nd ref='-31491' />
+ <nd ref='-31493' />
+ <nd ref='-31495' />
+ <nd ref='-31489' />
+ <nd ref='-41245' />
+ <nd ref='-38589' />
+ <nd ref='-41247' />
+ <nd ref='-31485' />
+ <nd ref='-31487' />
+ <nd ref='-31483' />
+ <nd ref='-31479' />
+ <nd ref='-31477' />
+ <nd ref='-31481' />
+ <nd ref='-38587' />
+ <nd ref='-31465' />
+ <nd ref='-31463' />
+ <nd ref='-31467' />
+ <nd ref='-31469' />
+ <nd ref='-31471' />
+ <nd ref='-31473' />
+ <nd ref='-31475' />
+ <nd ref='-41249' />
+ <nd ref='-31453' />
+ <nd ref='-31451' />
+ <nd ref='-31455' />
+ <nd ref='-31457' />
+ <nd ref='-31459' />
+ <nd ref='-31461' />
+ <nd ref='-38585' />
+ <nd ref='-41251' />
+ <nd ref='-41253' />
+ <nd ref='-45659' />
+ <nd ref='-45661' />
+ <nd ref='-41721' />
+ <nd ref='-41255' />
+ <nd ref='-31447' />
+ <nd ref='-31449' />
+ <nd ref='-31445' />
+ <nd ref='-31443' />
+ <nd ref='-41257' />
+ <nd ref='-31437' />
+ <nd ref='-31439' />
+ <nd ref='-31441' />
+ <nd ref='-41259' />
+ <nd ref='-31435' />
+ <nd ref='-31429' />
+ <nd ref='-31431' />
+ <nd ref='-31427' />
+ <nd ref='-31425' />
+ <nd ref='-31423' />
+ <nd ref='-31421' />
+ <nd ref='-31419' />
+ <nd ref='-31433' />
+ <nd ref='-31411' />
+ <nd ref='-31409' />
+ <nd ref='-31407' />
+ <nd ref='-31415' />
+ <nd ref='-31413' />
+ <nd ref='-31417' />
+ <nd ref='-31397' />
+ <nd ref='-31399' />
+ <nd ref='-31401' />
+ <nd ref='-31403' />
+ <nd ref='-31405' />
+ <nd ref='-41261' />
+ <nd ref='-41263' />
+ <nd ref='-31395' />
+ <nd ref='-31393' />
+ <nd ref='-31389' />
+ <nd ref='-31391' />
+ <nd ref='-31385' />
+ <nd ref='-31387' />
+ <nd ref='-31383' />
+ <nd ref='-31381' />
+ <nd ref='-41719' />
+ <tag k='ISO3166-1:alpha2' v='MN' />
+ <tag k='name:en' v='Mongolia' />
+ </way>
+ <way id='-57697'>
+ <nd ref='-42237' />
+ <nd ref='-42635' />
+ <nd ref='-42641' />
+ <nd ref='-53837' />
+ <nd ref='-34719' />
+ <nd ref='-41265' />
+ <nd ref='-36719' />
+ <nd ref='-41267' />
+ <nd ref='-41269' />
+ <nd ref='-41271' />
+ <nd ref='-41273' />
+ <nd ref='-41275' />
+ <nd ref='-41999' />
+ <nd ref='-34721' />
+ <nd ref='-34723' />
+ <nd ref='-41277' />
+ <nd ref='-41997' />
+ <nd ref='-41279' />
+ <nd ref='-48357' />
+ <nd ref='-48359' />
+ <nd ref='-48361' />
+ <nd ref='-48363' />
+ <nd ref='-48365' />
+ <nd ref='-48355' />
+ <nd ref='-48353' />
+ <nd ref='-48343' />
+ <nd ref='-48347' />
+ <nd ref='-48351' />
+ <nd ref='-48349' />
+ <nd ref='-48345' />
+ <nd ref='-48341' />
+ <nd ref='-42403' />
+ <nd ref='-48315' />
+ <nd ref='-41281' />
+ <nd ref='-42401' />
+ <nd ref='-48537' />
+ <nd ref='-48539' />
+ <nd ref='-48541' />
+ <nd ref='-48543' />
+ <nd ref='-48545' />
+ <nd ref='-48553' />
+ <nd ref='-48555' />
+ <nd ref='-48551' />
+ <nd ref='-48549' />
+ <nd ref='-48547' />
+ <nd ref='-48559' />
+ <nd ref='-48557' />
+ <nd ref='-48561' />
+ <nd ref='-48563' />
+ <nd ref='-42399' />
+ <nd ref='-48565' />
+ <nd ref='-48569' />
+ <nd ref='-48567' />
+ <nd ref='-48571' />
+ <nd ref='-48573' />
+ <nd ref='-48575' />
+ <nd ref='-48577' />
+ <nd ref='-48579' />
+ <nd ref='-48581' />
+ <nd ref='-48583' />
+ <nd ref='-48585' />
+ <nd ref='-48587' />
+ <nd ref='-48589' />
+ <nd ref='-48595' />
+ <nd ref='-48593' />
+ <nd ref='-48591' />
+ <nd ref='-48601' />
+ <nd ref='-48599' />
+ <nd ref='-48603' />
+ <nd ref='-48605' />
+ <nd ref='-48597' />
+ <nd ref='-41283' />
+ <nd ref='-48617' />
+ <nd ref='-48615' />
+ <nd ref='-48619' />
+ <nd ref='-48613' />
+ <nd ref='-48611' />
+ <nd ref='-48621' />
+ <nd ref='-48609' />
+ <nd ref='-48623' />
+ <nd ref='-48607' />
+ <nd ref='-48637' />
+ <nd ref='-48635' />
+ <nd ref='-48633' />
+ <nd ref='-48631' />
+ <nd ref='-48629' />
+ <nd ref='-48627' />
+ <nd ref='-48625' />
+ <nd ref='-41285' />
+ <nd ref='-41287' />
+ <nd ref='-41289' />
+ <nd ref='-41377' />
+ <nd ref='-48705' />
+ <nd ref='-48707' />
+ <nd ref='-48711' />
+ <nd ref='-48709' />
+ <nd ref='-48717' />
+ <nd ref='-48715' />
+ <nd ref='-48713' />
+ <nd ref='-48741' />
+ <nd ref='-48739' />
+ <nd ref='-48721' />
+ <nd ref='-48723' />
+ <nd ref='-48729' />
+ <nd ref='-48727' />
+ <nd ref='-48725' />
+ <nd ref='-41291' />
+ <nd ref='-48719' />
+ <nd ref='-48731' />
+ <nd ref='-48733' />
+ <nd ref='-48737' />
+ <nd ref='-48735' />
+ <nd ref='-48745' />
+ <nd ref='-48743' />
+ <nd ref='-41293' />
+ <nd ref='-34711' />
+ <nd ref='-41295' />
+ <nd ref='-41297' />
+ <nd ref='-41299' />
+ <nd ref='-41301' />
+ <nd ref='-41303' />
+ <nd ref='-34713' />
+ <nd ref='-41305' />
+ <nd ref='-34715' />
+ <nd ref='-34717' />
+ <nd ref='-41307' />
+ <nd ref='-41309' />
+ <nd ref='-41311' />
+ <nd ref='-41313' />
+ <nd ref='-41315' />
+ <nd ref='-41317' />
+ <nd ref='-41319' />
+ <nd ref='-41321' />
+ <nd ref='-41375' />
+ <nd ref='-48751' />
+ <nd ref='-48749' />
+ <nd ref='-48753' />
+ <nd ref='-48755' />
+ <nd ref='-48757' />
+ <nd ref='-48759' />
+ <nd ref='-48761' />
+ <nd ref='-48763' />
+ <nd ref='-48747' />
+ <nd ref='-48769' />
+ <nd ref='-48767' />
+ <nd ref='-48765' />
+ <nd ref='-48773' />
+ <nd ref='-48771' />
+ <nd ref='-48777' />
+ <nd ref='-48775' />
+ <nd ref='-41323' />
+ <nd ref='-42237' />
+ <tag k='ISO3166-1:alpha2' v='MZ' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Mozambique' />
+ </way>
+ <way id='-57699'>
+ <nd ref='-41325' />
+ <nd ref='-41327' />
+ <nd ref='-41329' />
+ <nd ref='-41331' />
+ <nd ref='-41103' />
+ <nd ref='-41333' />
+ <nd ref='-41335' />
+ <nd ref='-41101' />
+ <nd ref='-35067' />
+ <nd ref='-41337' />
+ <nd ref='-41339' />
+ <nd ref='-35063' />
+ <nd ref='-35065' />
+ <nd ref='-41341' />
+ <nd ref='-41343' />
+ <nd ref='-35069' />
+ <nd ref='-41863' />
+ <nd ref='-41345' />
+ <nd ref='-35071' />
+ <nd ref='-35073' />
+ <nd ref='-35075' />
+ <nd ref='-35077' />
+ <nd ref='-41347' />
+ <nd ref='-41873' />
+ <nd ref='-41349' />
+ <nd ref='-41871' />
+ <nd ref='-41351' />
+ <nd ref='-41803' />
+ <nd ref='-41353' />
+ <nd ref='-41355' />
+ <nd ref='-41801' />
+ <nd ref='-41799' />
+ <nd ref='-41797' />
+ <nd ref='-41357' />
+ <nd ref='-41359' />
+ <nd ref='-41795' />
+ <nd ref='-41361' />
+ <nd ref='-41363' />
+ <nd ref='-41793' />
+ <nd ref='-41365' />
+ <nd ref='-41791' />
+ <nd ref='-41789' />
+ <nd ref='-41787' />
+ <nd ref='-41367' />
+ <nd ref='-41785' />
+ <nd ref='-39249' />
+ <nd ref='-41105' />
+ <nd ref='-41325' />
+ <tag k='ISO3166-1:alpha2' v='MR' />
+ <tag k='name:en' v='Mauritania' />
+ </way>
+ <way id='-57701'>
+ <nd ref='-41369' />
+ <nd ref='-31335' />
+ <nd ref='-31341' />
+ <nd ref='-31337' />
+ <nd ref='-31339' />
+ <nd ref='-31343' />
+ <nd ref='-31333' />
+ <nd ref='-41371' />
+ <nd ref='-31331' />
+ <nd ref='-31329' />
+ <nd ref='-31327' />
+ <nd ref='-41373' />
+ <nd ref='-31325' />
+ <nd ref='-31323' />
+ <nd ref='-31321' />
+ <nd ref='-41375' />
+ <nd ref='-41321' />
+ <nd ref='-41319' />
+ <nd ref='-41317' />
+ <nd ref='-41315' />
+ <nd ref='-41313' />
+ <nd ref='-41311' />
+ <nd ref='-41309' />
+ <nd ref='-41307' />
+ <nd ref='-34717' />
+ <nd ref='-34715' />
+ <nd ref='-41305' />
+ <nd ref='-34713' />
+ <nd ref='-41303' />
+ <nd ref='-41301' />
+ <nd ref='-41299' />
+ <nd ref='-41297' />
+ <nd ref='-41295' />
+ <nd ref='-34711' />
+ <nd ref='-41293' />
+ <nd ref='-48743' />
+ <nd ref='-48745' />
+ <nd ref='-48735' />
+ <nd ref='-48737' />
+ <nd ref='-48733' />
+ <nd ref='-48731' />
+ <nd ref='-48719' />
+ <nd ref='-41291' />
+ <nd ref='-48725' />
+ <nd ref='-48727' />
+ <nd ref='-48729' />
+ <nd ref='-48723' />
+ <nd ref='-48721' />
+ <nd ref='-48739' />
+ <nd ref='-48741' />
+ <nd ref='-48713' />
+ <nd ref='-48715' />
+ <nd ref='-48717' />
+ <nd ref='-48709' />
+ <nd ref='-48711' />
+ <nd ref='-48707' />
+ <nd ref='-48705' />
+ <nd ref='-41377' />
+ <nd ref='-48639' />
+ <nd ref='-48661' />
+ <nd ref='-48641' />
+ <nd ref='-48663' />
+ <nd ref='-48643' />
+ <nd ref='-42377' />
+ <nd ref='-48647' />
+ <nd ref='-48649' />
+ <nd ref='-48651' />
+ <nd ref='-48653' />
+ <nd ref='-48645' />
+ <nd ref='-48655' />
+ <nd ref='-48657' />
+ <nd ref='-48659' />
+ <nd ref='-41379' />
+ <nd ref='-31217' />
+ <nd ref='-31215' />
+ <nd ref='-31219' />
+ <nd ref='-31221' />
+ <nd ref='-31231' />
+ <nd ref='-31229' />
+ <nd ref='-31225' />
+ <nd ref='-31223' />
+ <nd ref='-31227' />
+ <nd ref='-31243' />
+ <nd ref='-31239' />
+ <nd ref='-31241' />
+ <nd ref='-31237' />
+ <nd ref='-31233' />
+ <nd ref='-31235' />
+ <nd ref='-31285' />
+ <nd ref='-31245' />
+ <nd ref='-31247' />
+ <nd ref='-31249' />
+ <nd ref='-31251' />
+ <nd ref='-31263' />
+ <nd ref='-31261' />
+ <nd ref='-31257' />
+ <nd ref='-31259' />
+ <nd ref='-31253' />
+ <nd ref='-31255' />
+ <nd ref='-31283' />
+ <nd ref='-31275' />
+ <nd ref='-31277' />
+ <nd ref='-31279' />
+ <nd ref='-31281' />
+ <nd ref='-31269' />
+ <nd ref='-31267' />
+ <nd ref='-31265' />
+ <nd ref='-31273' />
+ <nd ref='-31271' />
+ <nd ref='-42375' />
+ <nd ref='-41381' />
+ <nd ref='-31347' />
+ <nd ref='-31345' />
+ <nd ref='-41369' />
+ <tag k='ISO3166-1:alpha2' v='MW' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Malawi' />
+ </way>
+ <way id='-57703'>
+ <nd ref='-36981' />
+ <nd ref='-36979' />
+ <nd ref='-34813' />
+ <nd ref='-34811' />
+ <nd ref='-36977' />
+ <nd ref='-42391' />
+ <nd ref='-34799' />
+ <nd ref='-34797' />
+ <nd ref='-34795' />
+ <nd ref='-34793' />
+ <nd ref='-41417' />
+ <nd ref='-34809' />
+ <nd ref='-41419' />
+ <nd ref='-34807' />
+ <nd ref='-34803' />
+ <nd ref='-34805' />
+ <nd ref='-38001' />
+ <nd ref='-34783' />
+ <nd ref='-34785' />
+ <nd ref='-34787' />
+ <nd ref='-34791' />
+ <nd ref='-34789' />
+ <nd ref='-37999' />
+ <nd ref='-37997' />
+ <nd ref='-37995' />
+ <nd ref='-37993' />
+ <nd ref='-37991' />
+ <nd ref='-37989' />
+ <nd ref='-42367' />
+ <nd ref='-34775' />
+ <nd ref='-34777' />
+ <nd ref='-34779' />
+ <nd ref='-34781' />
+ <nd ref='-36715' />
+ <nd ref='-36717' />
+ <nd ref='-41421' />
+ <nd ref='-41423' />
+ <nd ref='-36983' />
+ <nd ref='-34825' />
+ <nd ref='-34815' />
+ <nd ref='-34823' />
+ <nd ref='-34821' />
+ <nd ref='-34819' />
+ <nd ref='-34817' />
+ <nd ref='-36981' />
+ <tag k='ISO3166-1:alpha2' v='NA' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Namibia' />
+ </way>
+ <way id='-57705'>
+ <nd ref='-40757' />
+ <nd ref='-40755' />
+ <nd ref='-41425' />
+ <nd ref='-41427' />
+ <nd ref='-41429' />
+ <nd ref='-41431' />
+ <nd ref='-31777' />
+ <nd ref='-41433' />
+ <nd ref='-41435' />
+ <nd ref='-41437' />
+ <nd ref='-41439' />
+ <nd ref='-41441' />
+ <nd ref='-41443' />
+ <nd ref='-41445' />
+ <nd ref='-41447' />
+ <nd ref='-41449' />
+ <nd ref='-41451' />
+ <nd ref='-31785' />
+ <nd ref='-31783' />
+ <nd ref='-31779' />
+ <nd ref='-31781' />
+ <nd ref='-31787' />
+ <nd ref='-41453' />
+ <nd ref='-41477' />
+ <nd ref='-31789' />
+ <nd ref='-31799' />
+ <nd ref='-31791' />
+ <nd ref='-31797' />
+ <nd ref='-31793' />
+ <nd ref='-31795' />
+ <nd ref='-31809' />
+ <nd ref='-31805' />
+ <nd ref='-31801' />
+ <nd ref='-31803' />
+ <nd ref='-31807' />
+ <nd ref='-31815' />
+ <nd ref='-31813' />
+ <nd ref='-31811' />
+ <nd ref='-31845' />
+ <nd ref='-31817' />
+ <nd ref='-31821' />
+ <nd ref='-31819' />
+ <nd ref='-31827' />
+ <nd ref='-31823' />
+ <nd ref='-31825' />
+ <nd ref='-31843' />
+ <nd ref='-31835' />
+ <nd ref='-31837' />
+ <nd ref='-31839' />
+ <nd ref='-31841' />
+ <nd ref='-31831' />
+ <nd ref='-31829' />
+ <nd ref='-31833' />
+ <nd ref='-31851' />
+ <nd ref='-31849' />
+ <nd ref='-31847' />
+ <nd ref='-41475' />
+ <nd ref='-41473' />
+ <nd ref='-41499' />
+ <nd ref='-31865' />
+ <nd ref='-31867' />
+ <nd ref='-41455' />
+ <nd ref='-31871' />
+ <nd ref='-31869' />
+ <nd ref='-41457' />
+ <nd ref='-41497' />
+ <nd ref='-41459' />
+ <nd ref='-41495' />
+ <nd ref='-41493' />
+ <nd ref='-41491' />
+ <nd ref='-41489' />
+ <nd ref='-41461' />
+ <nd ref='-41463' />
+ <nd ref='-41465' />
+ <nd ref='-41487' />
+ <nd ref='-41485' />
+ <nd ref='-41467' />
+ <nd ref='-41469' />
+ <nd ref='-41483' />
+ <nd ref='-41471' />
+ <nd ref='-41481' />
+ <nd ref='-31857' />
+ <nd ref='-31853' />
+ <nd ref='-31855' />
+ <nd ref='-31863' />
+ <nd ref='-31861' />
+ <nd ref='-37623' />
+ <nd ref='-31859' />
+ <nd ref='-31901' />
+ <nd ref='-37621' />
+ <nd ref='-37631' />
+ <nd ref='-37629' />
+ <nd ref='-31895' />
+ <nd ref='-31893' />
+ <nd ref='-31883' />
+ <nd ref='-31875' />
+ <nd ref='-31873' />
+ <nd ref='-31877' />
+ <nd ref='-31879' />
+ <nd ref='-31881' />
+ <nd ref='-31889' />
+ <nd ref='-31885' />
+ <nd ref='-31887' />
+ <nd ref='-31891' />
+ <nd ref='-31899' />
+ <nd ref='-31897' />
+ <nd ref='-37627' />
+ <nd ref='-37625' />
+ <nd ref='-32097' />
+ <nd ref='-41097' />
+ <nd ref='-41095' />
+ <nd ref='-32099' />
+ <nd ref='-41093' />
+ <nd ref='-41091' />
+ <nd ref='-41089' />
+ <nd ref='-32101' />
+ <nd ref='-41087' />
+ <nd ref='-39245' />
+ <nd ref='-39243' />
+ <nd ref='-39241' />
+ <nd ref='-39239' />
+ <nd ref='-39237' />
+ <nd ref='-40759' />
+ <nd ref='-40757' />
+ <tag k='ISO3166-1:alpha2' v='NE' />
+ <tag k='name:en' v='Niger' />
+ </way>
+ <way id='-57707'>
+ <nd ref='-41473' />
+ <nd ref='-41475' />
+ <nd ref='-31847' />
+ <nd ref='-31849' />
+ <nd ref='-31851' />
+ <nd ref='-31833' />
+ <nd ref='-31829' />
+ <nd ref='-31831' />
+ <nd ref='-31841' />
+ <nd ref='-31839' />
+ <nd ref='-31837' />
+ <nd ref='-31835' />
+ <nd ref='-31843' />
+ <nd ref='-31825' />
+ <nd ref='-31823' />
+ <nd ref='-31827' />
+ <nd ref='-31819' />
+ <nd ref='-31821' />
+ <nd ref='-31817' />
+ <nd ref='-31845' />
+ <nd ref='-31811' />
+ <nd ref='-31813' />
+ <nd ref='-31815' />
+ <nd ref='-31807' />
+ <nd ref='-31803' />
+ <nd ref='-31801' />
+ <nd ref='-31805' />
+ <nd ref='-31809' />
+ <nd ref='-31795' />
+ <nd ref='-31793' />
+ <nd ref='-31797' />
+ <nd ref='-31791' />
+ <nd ref='-31799' />
+ <nd ref='-31789' />
+ <nd ref='-41477' />
+ <nd ref='-38795' />
+ <nd ref='-30693' />
+ <nd ref='-30691' />
+ <nd ref='-30829' />
+ <nd ref='-30827' />
+ <nd ref='-30695' />
+ <nd ref='-30697' />
+ <nd ref='-30699' />
+ <nd ref='-30701' />
+ <nd ref='-30823' />
+ <nd ref='-30703' />
+ <nd ref='-30825' />
+ <nd ref='-30711' />
+ <nd ref='-30705' />
+ <nd ref='-30707' />
+ <nd ref='-30709' />
+ <nd ref='-30713' />
+ <nd ref='-30715' />
+ <nd ref='-30717' />
+ <nd ref='-30719' />
+ <nd ref='-30721' />
+ <nd ref='-30739' />
+ <nd ref='-30723' />
+ <nd ref='-30725' />
+ <nd ref='-30727' />
+ <nd ref='-30729' />
+ <nd ref='-30733' />
+ <nd ref='-30731' />
+ <nd ref='-30737' />
+ <nd ref='-30735' />
+ <nd ref='-30833' />
+ <nd ref='-30741' />
+ <nd ref='-30743' />
+ <nd ref='-30745' />
+ <nd ref='-30747' />
+ <nd ref='-30749' />
+ <nd ref='-30751' />
+ <nd ref='-30753' />
+ <nd ref='-30755' />
+ <nd ref='-30761' />
+ <nd ref='-30757' />
+ <nd ref='-30759' />
+ <nd ref='-30763' />
+ <nd ref='-30783' />
+ <nd ref='-30777' />
+ <nd ref='-30775' />
+ <nd ref='-30779' />
+ <nd ref='-30781' />
+ <nd ref='-30773' />
+ <nd ref='-30771' />
+ <nd ref='-30769' />
+ <nd ref='-30765' />
+ <nd ref='-30767' />
+ <nd ref='-30831' />
+ <nd ref='-30787' />
+ <nd ref='-30789' />
+ <nd ref='-30785' />
+ <nd ref='-30791' />
+ <nd ref='-30793' />
+ <nd ref='-30797' />
+ <nd ref='-30795' />
+ <nd ref='-30799' />
+ <nd ref='-30803' />
+ <nd ref='-30801' />
+ <nd ref='-30837' />
+ <nd ref='-30807' />
+ <nd ref='-30805' />
+ <nd ref='-30811' />
+ <nd ref='-30809' />
+ <nd ref='-30835' />
+ <nd ref='-30813' />
+ <nd ref='-30815' />
+ <nd ref='-30819' />
+ <nd ref='-30817' />
+ <nd ref='-30821' />
+ <nd ref='-38793' />
+ <nd ref='-42907' />
+ <nd ref='-37611' />
+ <nd ref='-41479' />
+ <nd ref='-48203' />
+ <nd ref='-48201' />
+ <nd ref='-48199' />
+ <nd ref='-48197' />
+ <nd ref='-48195' />
+ <nd ref='-48193' />
+ <nd ref='-48191' />
+ <nd ref='-48187' />
+ <nd ref='-48189' />
+ <nd ref='-48185' />
+ <nd ref='-48183' />
+ <nd ref='-48181' />
+ <nd ref='-48179' />
+ <nd ref='-48177' />
+ <nd ref='-48175' />
+ <nd ref='-48143' />
+ <nd ref='-48153' />
+ <nd ref='-48167' />
+ <nd ref='-48155' />
+ <nd ref='-48165' />
+ <nd ref='-48163' />
+ <nd ref='-48161' />
+ <nd ref='-48159' />
+ <nd ref='-48157' />
+ <nd ref='-48151' />
+ <nd ref='-48149' />
+ <nd ref='-48147' />
+ <nd ref='-48145' />
+ <nd ref='-48173' />
+ <nd ref='-48171' />
+ <nd ref='-48169' />
+ <nd ref='-41481' />
+ <nd ref='-41471' />
+ <nd ref='-41483' />
+ <nd ref='-41469' />
+ <nd ref='-41467' />
+ <nd ref='-41485' />
+ <nd ref='-41487' />
+ <nd ref='-41465' />
+ <nd ref='-41463' />
+ <nd ref='-41461' />
+ <nd ref='-41489' />
+ <nd ref='-41491' />
+ <nd ref='-41493' />
+ <nd ref='-41495' />
+ <nd ref='-41459' />
+ <nd ref='-41497' />
+ <nd ref='-41457' />
+ <nd ref='-31869' />
+ <nd ref='-31871' />
+ <nd ref='-41455' />
+ <nd ref='-31867' />
+ <nd ref='-31865' />
+ <nd ref='-41499' />
+ <nd ref='-41473' />
+ <tag k='ISO3166-1:alpha2' v='NG' />
+ <tag k='name:en' v='Nigeria' />
+ </way>
+ <way id='-57709'>
+ <nd ref='-39893' />
+ <nd ref='-39891' />
+ <nd ref='-41501' />
+ <nd ref='-41503' />
+ <nd ref='-41505' />
+ <nd ref='-35881' />
+ <nd ref='-35883' />
+ <nd ref='-35885' />
+ <nd ref='-35887' />
+ <nd ref='-35889' />
+ <nd ref='-35891' />
+ <nd ref='-38877' />
+ <nd ref='-41911' />
+ <nd ref='-41507' />
+ <nd ref='-41509' />
+ <nd ref='-39897' />
+ <nd ref='-35669' />
+ <nd ref='-35667' />
+ <nd ref='-35671' />
+ <nd ref='-35673' />
+ <nd ref='-35675' />
+ <nd ref='-35677' />
+ <nd ref='-35679' />
+ <nd ref='-35681' />
+ <nd ref='-35683' />
+ <nd ref='-35685' />
+ <nd ref='-35687' />
+ <nd ref='-35689' />
+ <nd ref='-39895' />
+ <nd ref='-35665' />
+ <nd ref='-35663' />
+ <nd ref='-35661' />
+ <nd ref='-35659' />
+ <nd ref='-35657' />
+ <nd ref='-35655' />
+ <nd ref='-35653' />
+ <nd ref='-35649' />
+ <nd ref='-35647' />
+ <nd ref='-35651' />
+ <nd ref='-35645' />
+ <nd ref='-39893' />
+ <tag k='ISO3166-1:alpha2' v='NI' />
+ <tag k='name:en' v='Nicaragua' />
+ </way>
+ <way id='-57711'>
+ <nd ref='-39181' />
+ <nd ref='-39179' />
+ <nd ref='-39177' />
+ <nd ref='-39175' />
+ <nd ref='-39173' />
+ <nd ref='-34575' />
+ <nd ref='-34573' />
+ <nd ref='-34571' />
+ <nd ref='-39171' />
+ <nd ref='-39169' />
+ <nd ref='-34569' />
+ <nd ref='-39167' />
+ <nd ref='-34567' />
+ <nd ref='-34565' />
+ <nd ref='-39165' />
+ <nd ref='-34559' />
+ <nd ref='-34561' />
+ <nd ref='-34563' />
+ <nd ref='-34549' />
+ <nd ref='-34551' />
+ <nd ref='-34553' />
+ <nd ref='-34557' />
+ <nd ref='-34555' />
+ <nd ref='-34543' />
+ <nd ref='-34545' />
+ <nd ref='-34547' />
+ <nd ref='-39163' />
+ <nd ref='-34525' />
+ <nd ref='-34527' />
+ <nd ref='-34529' />
+ <nd ref='-34531' />
+ <nd ref='-34533' />
+ <nd ref='-34535' />
+ <nd ref='-34539' />
+ <nd ref='-34537' />
+ <nd ref='-34541' />
+ <nd ref='-34523' />
+ <nd ref='-34521' />
+ <nd ref='-34519' />
+ <nd ref='-39161' />
+ <nd ref='-39159' />
+ <nd ref='-34513' />
+ <nd ref='-34511' />
+ <nd ref='-34515' />
+ <nd ref='-34517' />
+ <nd ref='-34509' />
+ <nd ref='-34507' />
+ <nd ref='-34505' />
+ <nd ref='-34503' />
+ <nd ref='-39157' />
+ <nd ref='-34501' />
+ <nd ref='-34499' />
+ <nd ref='-34497' />
+ <nd ref='-34495' />
+ <nd ref='-39155' />
+ <nd ref='-39153' />
+ <nd ref='-39151' />
+ <nd ref='-39149' />
+ <nd ref='-34493' />
+ <nd ref='-34491' />
+ <nd ref='-34489' />
+ <nd ref='-34487' />
+ <nd ref='-34485' />
+ <nd ref='-34483' />
+ <nd ref='-39147' />
+ <nd ref='-39145' />
+ <nd ref='-39143' />
+ <nd ref='-37451' />
+ <nd ref='-37449' />
+ <nd ref='-34609' />
+ <nd ref='-37447' />
+ <nd ref='-37445' />
+ <nd ref='-37443' />
+ <nd ref='-34605' />
+ <nd ref='-34607' />
+ <nd ref='-37441' />
+ <nd ref='-37439' />
+ <nd ref='-37437' />
+ <nd ref='-37435' />
+ <nd ref='-37433' />
+ <nd ref='-37431' />
+ <nd ref='-37429' />
+ <nd ref='-37427' />
+ <nd ref='-37425' />
+ <nd ref='-37423' />
+ <nd ref='-37421' />
+ <nd ref='-37419' />
+ <nd ref='-37417' />
+ <nd ref='-37415' />
+ <nd ref='-37413' />
+ <nd ref='-37411' />
+ <nd ref='-37409' />
+ <nd ref='-37407' />
+ <nd ref='-37405' />
+ <nd ref='-37403' />
+ <nd ref='-37401' />
+ <nd ref='-37399' />
+ <nd ref='-37397' />
+ <nd ref='-37395' />
+ <nd ref='-37393' />
+ <nd ref='-37391' />
+ <nd ref='-37389' />
+ <nd ref='-34621' />
+ <nd ref='-34615' />
+ <nd ref='-34619' />
+ <nd ref='-34617' />
+ <nd ref='-34613' />
+ <nd ref='-34611' />
+ <nd ref='-37387' />
+ <nd ref='-37385' />
+ <nd ref='-37383' />
+ <nd ref='-37381' />
+ <nd ref='-37379' />
+ <nd ref='-37377' />
+ <nd ref='-37375' />
+ <nd ref='-37373' />
+ <nd ref='-37371' />
+ <nd ref='-37369' />
+ <nd ref='-37367' />
+ <nd ref='-37365' />
+ <nd ref='-37363' />
+ <nd ref='-37361' />
+ <nd ref='-37359' />
+ <nd ref='-37357' />
+ <nd ref='-34623' />
+ <nd ref='-34625' />
+ <nd ref='-37355' />
+ <nd ref='-37353' />
+ <nd ref='-37351' />
+ <nd ref='-37349' />
+ <nd ref='-37347' />
+ <nd ref='-37345' />
+ <nd ref='-37343' />
+ <nd ref='-37341' />
+ <nd ref='-37339' />
+ <nd ref='-37337' />
+ <nd ref='-37335' />
+ <nd ref='-37333' />
+ <nd ref='-37331' />
+ <nd ref='-37329' />
+ <nd ref='-34627' />
+ <nd ref='-37327' />
+ <nd ref='-37325' />
+ <nd ref='-37323' />
+ <nd ref='-37321' />
+ <nd ref='-37319' />
+ <nd ref='-37317' />
+ <nd ref='-37315' />
+ <nd ref='-37313' />
+ <nd ref='-37311' />
+ <nd ref='-34629' />
+ <nd ref='-37609' />
+ <nd ref='-37607' />
+ <nd ref='-37605' />
+ <nd ref='-37603' />
+ <nd ref='-37601' />
+ <nd ref='-37599' />
+ <nd ref='-37597' />
+ <nd ref='-37595' />
+ <nd ref='-37593' />
+ <nd ref='-37591' />
+ <nd ref='-34631' />
+ <nd ref='-37589' />
+ <nd ref='-37587' />
+ <nd ref='-37585' />
+ <nd ref='-37583' />
+ <nd ref='-37581' />
+ <nd ref='-37579' />
+ <nd ref='-37577' />
+ <nd ref='-37575' />
+ <nd ref='-37573' />
+ <nd ref='-37571' />
+ <nd ref='-37569' />
+ <nd ref='-37567' />
+ <nd ref='-37565' />
+ <nd ref='-37563' />
+ <nd ref='-37561' />
+ <nd ref='-37559' />
+ <nd ref='-37557' />
+ <nd ref='-34633' />
+ <nd ref='-34635' />
+ <nd ref='-34637' />
+ <nd ref='-42859' />
+ <nd ref='-37555' />
+ <nd ref='-39181' />
+ <tag k='name:en' v='Metropolitan Netherlands' />
+ </way>
+ <way id='-57713'>
+ <nd ref='-41511' />
+ <nd ref='-41513' />
+ <nd ref='-41515' />
+ <nd ref='-41517' />
+ <nd ref='-41511' />
+ <tag k='ISO3166-1:alpha2' v='BV' />
+ <tag k='name:en' v='Bouvet Island' />
+ </way>
+ <way id='-57715'>
+ <nd ref='-41543' />
+ <nd ref='-32317' />
+ <nd ref='-32311' />
+ <nd ref='-32315' />
+ <nd ref='-32313' />
+ <nd ref='-32327' />
+ <nd ref='-32319' />
+ <nd ref='-32321' />
+ <nd ref='-32323' />
+ <nd ref='-32325' />
+ <nd ref='-39979' />
+ <nd ref='-32287' />
+ <nd ref='-32279' />
+ <nd ref='-32281' />
+ <nd ref='-32283' />
+ <nd ref='-32285' />
+ <nd ref='-32277' />
+ <nd ref='-32289' />
+ <nd ref='-32275' />
+ <nd ref='-32291' />
+ <nd ref='-32293' />
+ <nd ref='-32303' />
+ <nd ref='-32295' />
+ <nd ref='-32297' />
+ <nd ref='-32299' />
+ <nd ref='-32301' />
+ <nd ref='-32305' />
+ <nd ref='-32259' />
+ <nd ref='-32261' />
+ <nd ref='-32263' />
+ <nd ref='-32253' />
+ <nd ref='-32257' />
+ <nd ref='-32255' />
+ <nd ref='-32251' />
+ <nd ref='-32267' />
+ <nd ref='-32265' />
+ <nd ref='-32269' />
+ <nd ref='-32271' />
+ <nd ref='-32273' />
+ <nd ref='-32245' />
+ <nd ref='-32243' />
+ <nd ref='-32241' />
+ <nd ref='-32249' />
+ <nd ref='-32247' />
+ <nd ref='-32307' />
+ <nd ref='-32235' />
+ <nd ref='-32237' />
+ <nd ref='-32231' />
+ <nd ref='-32233' />
+ <nd ref='-32229' />
+ <nd ref='-32227' />
+ <nd ref='-32217' />
+ <nd ref='-32219' />
+ <nd ref='-32223' />
+ <nd ref='-32221' />
+ <nd ref='-32225' />
+ <nd ref='-32239' />
+ <nd ref='-32213' />
+ <nd ref='-32215' />
+ <nd ref='-32211' />
+ <nd ref='-32199' />
+ <nd ref='-32197' />
+ <nd ref='-32201' />
+ <nd ref='-32203' />
+ <nd ref='-32209' />
+ <nd ref='-32207' />
+ <nd ref='-32205' />
+ <nd ref='-32309' />
+ <nd ref='-32173' />
+ <nd ref='-32175' />
+ <nd ref='-32171' />
+ <nd ref='-32165' />
+ <nd ref='-32167' />
+ <nd ref='-32169' />
+ <nd ref='-32177' />
+ <nd ref='-32179' />
+ <nd ref='-32181' />
+ <nd ref='-32183' />
+ <nd ref='-32185' />
+ <nd ref='-32191' />
+ <nd ref='-32189' />
+ <nd ref='-32187' />
+ <nd ref='-32193' />
+ <nd ref='-32195' />
+ <nd ref='-32161' />
+ <nd ref='-32159' />
+ <nd ref='-32155' />
+ <nd ref='-32157' />
+ <nd ref='-32163' />
+ <nd ref='-32151' />
+ <nd ref='-32153' />
+ <nd ref='-32147' />
+ <nd ref='-32149' />
+ <nd ref='-32107' />
+ <nd ref='-32103' />
+ <nd ref='-32105' />
+ <nd ref='-41545' />
+ <nd ref='-32119' />
+ <nd ref='-32117' />
+ <nd ref='-32115' />
+ <nd ref='-32111' />
+ <nd ref='-32113' />
+ <nd ref='-32109' />
+ <nd ref='-32121' />
+ <nd ref='-32123' />
+ <nd ref='-32125' />
+ <nd ref='-32145' />
+ <nd ref='-32129' />
+ <nd ref='-32131' />
+ <nd ref='-32127' />
+ <nd ref='-32135' />
+ <nd ref='-32133' />
+ <nd ref='-32137' />
+ <nd ref='-32139' />
+ <nd ref='-32141' />
+ <nd ref='-32143' />
+ <nd ref='-41547' />
+ <nd ref='-32495' />
+ <nd ref='-32493' />
+ <nd ref='-32489' />
+ <nd ref='-32491' />
+ <nd ref='-32487' />
+ <nd ref='-32485' />
+ <nd ref='-32497' />
+ <nd ref='-32483' />
+ <nd ref='-32481' />
+ <nd ref='-32477' />
+ <nd ref='-32475' />
+ <nd ref='-32473' />
+ <nd ref='-32479' />
+ <nd ref='-32469' />
+ <nd ref='-32471' />
+ <nd ref='-32499' />
+ <nd ref='-32467' />
+ <nd ref='-32465' />
+ <nd ref='-32463' />
+ <nd ref='-32455' />
+ <nd ref='-32461' />
+ <nd ref='-32459' />
+ <nd ref='-32457' />
+ <nd ref='-32453' />
+ <nd ref='-32409' />
+ <nd ref='-32417' />
+ <nd ref='-32415' />
+ <nd ref='-32413' />
+ <nd ref='-32411' />
+ <nd ref='-32501' />
+ <nd ref='-32449' />
+ <nd ref='-32447' />
+ <nd ref='-32445' />
+ <nd ref='-32407' />
+ <nd ref='-32405' />
+ <nd ref='-32403' />
+ <nd ref='-32451' />
+ <nd ref='-32441' />
+ <nd ref='-32439' />
+ <nd ref='-32437' />
+ <nd ref='-32435' />
+ <nd ref='-32431' />
+ <nd ref='-32433' />
+ <nd ref='-32443' />
+ <nd ref='-32429' />
+ <nd ref='-32427' />
+ <nd ref='-32425' />
+ <nd ref='-32423' />
+ <nd ref='-32421' />
+ <nd ref='-32419' />
+ <nd ref='-32503' />
+ <nd ref='-32375' />
+ <nd ref='-32377' />
+ <nd ref='-32367' />
+ <nd ref='-32371' />
+ <nd ref='-32369' />
+ <nd ref='-32373' />
+ <nd ref='-32365' />
+ <nd ref='-32363' />
+ <nd ref='-32361' />
+ <nd ref='-32359' />
+ <nd ref='-32357' />
+ <nd ref='-32399' />
+ <nd ref='-32383' />
+ <nd ref='-32381' />
+ <nd ref='-32379' />
+ <nd ref='-32397' />
+ <nd ref='-32395' />
+ <nd ref='-32393' />
+ <nd ref='-32391' />
+ <nd ref='-32389' />
+ <nd ref='-32387' />
+ <nd ref='-32385' />
+ <nd ref='-32401' />
+ <nd ref='-32355' />
+ <nd ref='-32353' />
+ <nd ref='-32351' />
+ <nd ref='-32349' />
+ <nd ref='-32343' />
+ <nd ref='-32341' />
+ <nd ref='-32347' />
+ <nd ref='-32345' />
+ <nd ref='-32335' />
+ <nd ref='-32333' />
+ <nd ref='-32331' />
+ <nd ref='-32337' />
+ <nd ref='-32339' />
+ <nd ref='-32329' />
+ <nd ref='-41543' />
+ <tag k='ISO3166-1:alpha2' v='NP' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Nepal' />
+ </way>
+ <way id='-57717'>
+ <nd ref='-41549' />
+ <nd ref='-41551' />
+ <nd ref='-41553' />
+ <nd ref='-41555' />
+ <nd ref='-41549' />
+ <tag k='ISO3166-1:alpha2' v='NR' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Nauru' />
+ </way>
+ <way id='-57719'>
+ <nd ref='-41557' />
+ <nd ref='-41559' />
+ <nd ref='-42347' />
+ <nd ref='-41561' />
+ <nd ref='-41563' />
+ <nd ref='-41565' />
+ <nd ref='-37045' />
+ <nd ref='-34449' />
+ <nd ref='-34451' />
+ <nd ref='-34453' />
+ <nd ref='-37043' />
+ <nd ref='-34447' />
+ <nd ref='-37041' />
+ <nd ref='-37039' />
+ <nd ref='-34445' />
+ <nd ref='-34443' />
+ <nd ref='-34441' />
+ <nd ref='-37037' />
+ <nd ref='-34439' />
+ <nd ref='-34437' />
+ <nd ref='-37035' />
+ <nd ref='-34435' />
+ <nd ref='-34433' />
+ <nd ref='-34431' />
+ <nd ref='-37033' />
+ <nd ref='-34429' />
+ <nd ref='-34427' />
+ <nd ref='-34425' />
+ <nd ref='-34423' />
+ <nd ref='-34421' />
+ <nd ref='-34419' />
+ <nd ref='-37031' />
+ <nd ref='-37029' />
+ <nd ref='-34415' />
+ <nd ref='-34413' />
+ <nd ref='-34409' />
+ <nd ref='-34411' />
+ <nd ref='-34417' />
+ <nd ref='-40257' />
+ <nd ref='-41557' />
+ </way>
+ <way id='-57721'>
+ <nd ref='-37027' />
+ <nd ref='-37025' />
+ <nd ref='-34387' />
+ <nd ref='-34389' />
+ <nd ref='-34391' />
+ <nd ref='-34393' />
+ <nd ref='-34395' />
+ <nd ref='-34397' />
+ <nd ref='-34399' />
+ <nd ref='-34401' />
+ <nd ref='-34403' />
+ <nd ref='-34405' />
+ <nd ref='-34407' />
+ <nd ref='-37055' />
+ <nd ref='-37053' />
+ <nd ref='-41567' />
+ <nd ref='-41569' />
+ <nd ref='-36323' />
+ <nd ref='-37027' />
+ </way>
+ <way id='-57723'>
+ <nd ref='-38531' />
+ <nd ref='-38529' />
+ <nd ref='-52397' />
+ <nd ref='-52399' />
+ <nd ref='-52403' />
+ <nd ref='-52407' />
+ <nd ref='-52405' />
+ <nd ref='-52401' />
+ <nd ref='-38527' />
+ <nd ref='-52377' />
+ <nd ref='-52379' />
+ <nd ref='-52381' />
+ <nd ref='-52385' />
+ <nd ref='-52383' />
+ <nd ref='-52395' />
+ <nd ref='-52387' />
+ <nd ref='-52389' />
+ <nd ref='-52391' />
+ <nd ref='-52393' />
+ <nd ref='-38525' />
+ <nd ref='-53517' />
+ <nd ref='-53519' />
+ <nd ref='-53521' />
+ <nd ref='-53523' />
+ <nd ref='-53529' />
+ <nd ref='-53527' />
+ <nd ref='-53525' />
+ <nd ref='-40195' />
+ <nd ref='-53515' />
+ <nd ref='-40193' />
+ <nd ref='-40191' />
+ <nd ref='-53507' />
+ <nd ref='-53505' />
+ <nd ref='-53503' />
+ <nd ref='-53511' />
+ <nd ref='-53509' />
+ <nd ref='-53513' />
+ <nd ref='-40189' />
+ <nd ref='-53499' />
+ <nd ref='-53501' />
+ <nd ref='-53497' />
+ <nd ref='-40187' />
+ <nd ref='-53495' />
+ <nd ref='-40185' />
+ <nd ref='-40183' />
+ <nd ref='-53487' />
+ <nd ref='-53491' />
+ <nd ref='-53493' />
+ <nd ref='-53489' />
+ <nd ref='-53485' />
+ <nd ref='-53483' />
+ <nd ref='-53479' />
+ <nd ref='-53481' />
+ <nd ref='-53477' />
+ <nd ref='-53475' />
+ <nd ref='-53473' />
+ <nd ref='-53459' />
+ <nd ref='-53461' />
+ <nd ref='-53471' />
+ <nd ref='-53469' />
+ <nd ref='-53467' />
+ <nd ref='-53465' />
+ <nd ref='-53463' />
+ <nd ref='-53457' />
+ <nd ref='-40181' />
+ <nd ref='-40179' />
+ <nd ref='-40177' />
+ <nd ref='-53455' />
+ <nd ref='-53453' />
+ <nd ref='-53451' />
+ <nd ref='-53449' />
+ <nd ref='-40175' />
+ <nd ref='-53447' />
+ <nd ref='-53445' />
+ <nd ref='-53441' />
+ <nd ref='-53443' />
+ <nd ref='-53429' />
+ <nd ref='-53433' />
+ <nd ref='-53435' />
+ <nd ref='-53437' />
+ <nd ref='-53439' />
+ <nd ref='-53431' />
+ <nd ref='-40173' />
+ <nd ref='-40171' />
+ <nd ref='-40169' />
+ <nd ref='-40167' />
+ <nd ref='-53427' />
+ <nd ref='-53421' />
+ <nd ref='-53423' />
+ <nd ref='-53425' />
+ <nd ref='-40165' />
+ <nd ref='-53411' />
+ <nd ref='-53419' />
+ <nd ref='-53417' />
+ <nd ref='-53415' />
+ <nd ref='-53413' />
+ <nd ref='-53409' />
+ <nd ref='-53407' />
+ <nd ref='-40163' />
+ <nd ref='-53405' />
+ <nd ref='-53403' />
+ <nd ref='-40161' />
+ <nd ref='-40159' />
+ <nd ref='-53391' />
+ <nd ref='-53397' />
+ <nd ref='-53401' />
+ <nd ref='-53399' />
+ <nd ref='-53393' />
+ <nd ref='-53395' />
+ <nd ref='-40157' />
+ <nd ref='-40155' />
+ <nd ref='-53389' />
+ <nd ref='-40153' />
+ <nd ref='-40151' />
+ <nd ref='-40149' />
+ <nd ref='-40147' />
+ <nd ref='-40145' />
+ <nd ref='-40143' />
+ <nd ref='-40141' />
+ <nd ref='-40139' />
+ <nd ref='-40137' />
+ <nd ref='-40135' />
+ <nd ref='-40133' />
+ <nd ref='-40131' />
+ <nd ref='-40129' />
+ <nd ref='-40127' />
+ <nd ref='-53383' />
+ <nd ref='-53387' />
+ <nd ref='-53385' />
+ <nd ref='-40125' />
+ <nd ref='-40123' />
+ <nd ref='-53381' />
+ <nd ref='-53379' />
+ <nd ref='-53377' />
+ <nd ref='-40121' />
+ <nd ref='-40119' />
+ <nd ref='-40117' />
+ <nd ref='-40115' />
+ <nd ref='-40113' />
+ <nd ref='-40111' />
+ <nd ref='-53367' />
+ <nd ref='-53369' />
+ <nd ref='-53375' />
+ <nd ref='-53373' />
+ <nd ref='-53371' />
+ <nd ref='-53365' />
+ <nd ref='-40109' />
+ <nd ref='-53355' />
+ <nd ref='-53357' />
+ <nd ref='-53359' />
+ <nd ref='-53361' />
+ <nd ref='-53363' />
+ <nd ref='-53353' />
+ <nd ref='-53351' />
+ <nd ref='-53349' />
+ <nd ref='-53347' />
+ <nd ref='-40107' />
+ <nd ref='-40105' />
+ <nd ref='-53339' />
+ <nd ref='-53341' />
+ <nd ref='-53343' />
+ <nd ref='-53345' />
+ <nd ref='-53337' />
+ <nd ref='-53335' />
+ <nd ref='-53333' />
+ <nd ref='-53329' />
+ <nd ref='-53331' />
+ <nd ref='-53327' />
+ <nd ref='-53325' />
+ <nd ref='-40103' />
+ <nd ref='-40101' />
+ <nd ref='-40099' />
+ <nd ref='-53323' />
+ <nd ref='-53321' />
+ <nd ref='-53319' />
+ <nd ref='-53317' />
+ <nd ref='-53315' />
+ <nd ref='-53313' />
+ <nd ref='-53311' />
+ <nd ref='-53309' />
+ <nd ref='-53307' />
+ <nd ref='-40097' />
+ <nd ref='-40095' />
+ <nd ref='-40093' />
+ <nd ref='-36335' />
+ <nd ref='-36337' />
+ <nd ref='-36339' />
+ <nd ref='-36341' />
+ <nd ref='-36343' />
+ <nd ref='-36345' />
+ <nd ref='-36347' />
+ <nd ref='-36349' />
+ <nd ref='-40091' />
+ <nd ref='-36351' />
+ <nd ref='-36353' />
+ <nd ref='-36355' />
+ <nd ref='-36357' />
+ <nd ref='-36359' />
+ <nd ref='-40089' />
+ <nd ref='-40255' />
+ <nd ref='-40253' />
+ <nd ref='-50087' />
+ <nd ref='-40251' />
+ <nd ref='-50085' />
+ <nd ref='-50083' />
+ <nd ref='-40249' />
+ <nd ref='-50081' />
+ <nd ref='-40247' />
+ <nd ref='-50077' />
+ <nd ref='-50079' />
+ <nd ref='-40245' />
+ <nd ref='-50073' />
+ <nd ref='-50075' />
+ <nd ref='-50069' />
+ <nd ref='-50071' />
+ <nd ref='-50067' />
+ <nd ref='-40243' />
+ <nd ref='-40241' />
+ <nd ref='-50065' />
+ <nd ref='-40239' />
+ <nd ref='-50063' />
+ <nd ref='-50061' />
+ <nd ref='-40237' />
+ <nd ref='-50059' />
+ <nd ref='-50057' />
+ <nd ref='-40235' />
+ <nd ref='-50055' />
+ <nd ref='-36935' />
+ <nd ref='-36933' />
+ <nd ref='-36931' />
+ <nd ref='-36929' />
+ <nd ref='-34641' />
+ <nd ref='-34639' />
+ <nd ref='-36927' />
+ <nd ref='-41571' />
+ <nd ref='-36925' />
+ <nd ref='-41573' />
+ <nd ref='-36923' />
+ <nd ref='-36921' />
+ <nd ref='-36919' />
+ <nd ref='-36917' />
+ <nd ref='-52349' />
+ <nd ref='-52351' />
+ <nd ref='-52365' />
+ <nd ref='-52363' />
+ <nd ref='-52361' />
+ <nd ref='-52359' />
+ <nd ref='-52357' />
+ <nd ref='-52355' />
+ <nd ref='-52353' />
+ <nd ref='-52329' />
+ <nd ref='-52331' />
+ <nd ref='-52333' />
+ <nd ref='-52335' />
+ <nd ref='-52337' />
+ <nd ref='-52339' />
+ <nd ref='-52341' />
+ <nd ref='-52345' />
+ <nd ref='-52347' />
+ <nd ref='-52343' />
+ <nd ref='-52325' />
+ <nd ref='-52327' />
+ <nd ref='-52323' />
+ <nd ref='-41575' />
+ <nd ref='-52605' />
+ <nd ref='-52607' />
+ <nd ref='-52611' />
+ <nd ref='-52609' />
+ <nd ref='-52601' />
+ <nd ref='-52603' />
+ <nd ref='-41577' />
+ <nd ref='-52615' />
+ <nd ref='-52617' />
+ <nd ref='-52621' />
+ <nd ref='-52623' />
+ <nd ref='-52619' />
+ <nd ref='-52625' />
+ <nd ref='-52627' />
+ <nd ref='-52613' />
+ <nd ref='-41579' />
+ <nd ref='-52629' />
+ <nd ref='-52631' />
+ <nd ref='-52641' />
+ <nd ref='-52637' />
+ <nd ref='-52639' />
+ <nd ref='-52635' />
+ <nd ref='-52633' />
+ <nd ref='-52645' />
+ <nd ref='-52643' />
+ <nd ref='-36915' />
+ <nd ref='-52647' />
+ <nd ref='-52661' />
+ <nd ref='-52663' />
+ <nd ref='-52665' />
+ <nd ref='-52667' />
+ <nd ref='-52649' />
+ <nd ref='-52651' />
+ <nd ref='-52653' />
+ <nd ref='-52655' />
+ <nd ref='-52657' />
+ <nd ref='-52659' />
+ <nd ref='-41581' />
+ <nd ref='-36913' />
+ <nd ref='-52681' />
+ <nd ref='-52683' />
+ <nd ref='-52679' />
+ <nd ref='-52677' />
+ <nd ref='-52675' />
+ <nd ref='-52673' />
+ <nd ref='-52671' />
+ <nd ref='-52669' />
+ <nd ref='-41583' />
+ <nd ref='-52691' />
+ <nd ref='-52697' />
+ <nd ref='-52695' />
+ <nd ref='-52693' />
+ <nd ref='-52685' />
+ <nd ref='-52689' />
+ <nd ref='-52699' />
+ <nd ref='-52687' />
+ <nd ref='-41585' />
+ <nd ref='-52705' />
+ <nd ref='-52703' />
+ <nd ref='-52707' />
+ <nd ref='-52701' />
+ <nd ref='-41587' />
+ <nd ref='-52715' />
+ <nd ref='-52709' />
+ <nd ref='-52711' />
+ <nd ref='-52713' />
+ <nd ref='-41589' />
+ <nd ref='-36911' />
+ <nd ref='-41591' />
+ <nd ref='-36909' />
+ <nd ref='-41593' />
+ <nd ref='-52717' />
+ <nd ref='-36907' />
+ <nd ref='-52719' />
+ <nd ref='-38533' />
+ <nd ref='-52413' />
+ <nd ref='-52415' />
+ <nd ref='-52411' />
+ <nd ref='-52409' />
+ <nd ref='-52425' />
+ <nd ref='-52427' />
+ <nd ref='-52429' />
+ <nd ref='-52431' />
+ <nd ref='-52417' />
+ <nd ref='-52419' />
+ <nd ref='-52423' />
+ <nd ref='-52421' />
+ <nd ref='-38531' />
+ <tag k='ISO3166-1:alpha2' v='PK' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Pakistan' />
+ </way>
+ <way id='-57725'>
+ <nd ref='-38865' />
+ <nd ref='-35925' />
+ <nd ref='-35923' />
+ <nd ref='-35921' />
+ <nd ref='-35919' />
+ <nd ref='-35917' />
+ <nd ref='-35927' />
+ <nd ref='-36801' />
+ <nd ref='-38863' />
+ <nd ref='-41595' />
+ <nd ref='-38875' />
+ <nd ref='-36797' />
+ <nd ref='-38873' />
+ <nd ref='-38871' />
+ <nd ref='-35901' />
+ <nd ref='-35905' />
+ <nd ref='-35903' />
+ <nd ref='-35907' />
+ <nd ref='-35909' />
+ <nd ref='-35911' />
+ <nd ref='-35915' />
+ <nd ref='-35913' />
+ <nd ref='-35899' />
+ <nd ref='-35897' />
+ <nd ref='-35895' />
+ <nd ref='-35893' />
+ <nd ref='-38869' />
+ <nd ref='-38867' />
+ <nd ref='-36761' />
+ <nd ref='-36763' />
+ <nd ref='-38865' />
+ <tag k='ISO3166-1:alpha2' v='PA' />
+ <tag k='name:en' v='Panama' />
+ </way>
+ <way id='-57727'>
+ <nd ref='-38859' />
+ <nd ref='-35809' />
+ <nd ref='-35811' />
+ <nd ref='-35813' />
+ <nd ref='-38857' />
+ <nd ref='-38855' />
+ <nd ref='-35979' />
+ <nd ref='-35977' />
+ <nd ref='-37931' />
+ <nd ref='-35969' />
+ <nd ref='-35967' />
+ <nd ref='-35971' />
+ <nd ref='-35973' />
+ <nd ref='-35975' />
+ <nd ref='-37929' />
+ <nd ref='-35963' />
+ <nd ref='-35965' />
+ <nd ref='-37927' />
+ <nd ref='-35961' />
+ <nd ref='-35959' />
+ <nd ref='-35957' />
+ <nd ref='-35955' />
+ <nd ref='-37925' />
+ <nd ref='-35929' />
+ <nd ref='-35931' />
+ <nd ref='-35933' />
+ <nd ref='-37923' />
+ <nd ref='-35939' />
+ <nd ref='-35937' />
+ <nd ref='-35935' />
+ <nd ref='-37921' />
+ <nd ref='-35945' />
+ <nd ref='-35941' />
+ <nd ref='-35943' />
+ <nd ref='-35947' />
+ <nd ref='-37919' />
+ <nd ref='-35953' />
+ <nd ref='-35951' />
+ <nd ref='-35949' />
+ <nd ref='-37891' />
+ <nd ref='-41597' />
+ <nd ref='-36043' />
+ <nd ref='-36041' />
+ <nd ref='-37889' />
+ <nd ref='-36045' />
+ <nd ref='-36049' />
+ <nd ref='-36047' />
+ <nd ref='-41599' />
+ <nd ref='-37887' />
+ <nd ref='-36057' />
+ <nd ref='-36059' />
+ <nd ref='-36055' />
+ <nd ref='-36053' />
+ <nd ref='-36051' />
+ <nd ref='-36061' />
+ <nd ref='-36063' />
+ <nd ref='-36065' />
+ <nd ref='-36067' />
+ <nd ref='-41601' />
+ <nd ref='-36193' />
+ <nd ref='-36195' />
+ <nd ref='-36181' />
+ <nd ref='-36185' />
+ <nd ref='-36183' />
+ <nd ref='-36191' />
+ <nd ref='-36187' />
+ <nd ref='-36189' />
+ <nd ref='-36795' />
+ <nd ref='-38737' />
+ <nd ref='-36793' />
+ <nd ref='-36789' />
+ <nd ref='-36791' />
+ <nd ref='-39301' />
+ <nd ref='-39299' />
+ <nd ref='-39297' />
+ <nd ref='-35815' />
+ <nd ref='-35817' />
+ <nd ref='-35819' />
+ <nd ref='-35821' />
+ <nd ref='-35823' />
+ <nd ref='-35825' />
+ <nd ref='-35827' />
+ <nd ref='-35831' />
+ <nd ref='-35829' />
+ <nd ref='-35833' />
+ <nd ref='-35835' />
+ <nd ref='-39295' />
+ <nd ref='-35849' />
+ <nd ref='-35841' />
+ <nd ref='-35847' />
+ <nd ref='-35845' />
+ <nd ref='-35839' />
+ <nd ref='-35837' />
+ <nd ref='-35843' />
+ <nd ref='-39293' />
+ <nd ref='-39291' />
+ <nd ref='-39289' />
+ <nd ref='-39287' />
+ <nd ref='-39285' />
+ <nd ref='-35851' />
+ <nd ref='-35857' />
+ <nd ref='-35853' />
+ <nd ref='-35855' />
+ <nd ref='-35863' />
+ <nd ref='-35865' />
+ <nd ref='-39283' />
+ <nd ref='-35861' />
+ <nd ref='-35859' />
+ <nd ref='-38859' />
+ <tag k='ISO3166-1:alpha2' v='PE' />
+ <tag k='name:en' v='Peru' />
+ </way>
+ <way id='-57729'>
+ <nd ref='-42983' />
+ <nd ref='-43117' />
+ <nd ref='-43119' />
+ <nd ref='-42961' />
+ <nd ref='-42959' />
+ <nd ref='-42963' />
+ <nd ref='-42957' />
+ <nd ref='-42955' />
+ <nd ref='-42491' />
+ <nd ref='-41603' />
+ <nd ref='-42489' />
+ <nd ref='-42487' />
+ <nd ref='-42485' />
+ <nd ref='-41605' />
+ <nd ref='-41607' />
+ <nd ref='-41609' />
+ <nd ref='-41611' />
+ <nd ref='-41613' />
+ <nd ref='-41615' />
+ <nd ref='-43111' />
+ <nd ref='-43115' />
+ <nd ref='-43113' />
+ <nd ref='-39973' />
+ <nd ref='-42983' />
+ <tag k='ISO3166-1:alpha2' v='PG' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Papua New Guinea' />
+ </way>
+ <way id='-57731'>
+ <nd ref='-41617' />
+ <nd ref='-42799' />
+ <nd ref='-41713' />
+ <nd ref='-42801' />
+ <nd ref='-41619' />
+ <nd ref='-46623' />
+ <nd ref='-46625' />
+ <nd ref='-46627' />
+ <nd ref='-46629' />
+ <nd ref='-46631' />
+ <nd ref='-46633' />
+ <nd ref='-46635' />
+ <nd ref='-46637' />
+ <nd ref='-46639' />
+ <nd ref='-46641' />
+ <nd ref='-46643' />
+ <nd ref='-46645' />
+ <nd ref='-46647' />
+ <nd ref='-46649' />
+ <nd ref='-40783' />
+ <nd ref='-51243' />
+ <nd ref='-37845' />
+ <nd ref='-51249' />
+ <nd ref='-51247' />
+ <nd ref='-51251' />
+ <nd ref='-51245' />
+ <nd ref='-37843' />
+ <nd ref='-37841' />
+ <nd ref='-51257' />
+ <nd ref='-51255' />
+ <nd ref='-51253' />
+ <nd ref='-37839' />
+ <nd ref='-51259' />
+ <nd ref='-51261' />
+ <nd ref='-37837' />
+ <nd ref='-51263' />
+ <nd ref='-51271' />
+ <nd ref='-51269' />
+ <nd ref='-51265' />
+ <nd ref='-51267' />
+ <nd ref='-42279' />
+ <nd ref='-42277' />
+ <nd ref='-51285' />
+ <nd ref='-42275' />
+ <nd ref='-51291' />
+ <nd ref='-51295' />
+ <nd ref='-51293' />
+ <nd ref='-51299' />
+ <nd ref='-51297' />
+ <nd ref='-51287' />
+ <nd ref='-51289' />
+ <nd ref='-42273' />
+ <nd ref='-51305' />
+ <nd ref='-51301' />
+ <nd ref='-51303' />
+ <nd ref='-42271' />
+ <nd ref='-51309' />
+ <nd ref='-51307' />
+ <nd ref='-41621' />
+ <nd ref='-41623' />
+ <nd ref='-51311' />
+ <nd ref='-51313' />
+ <nd ref='-41625' />
+ <nd ref='-51167' />
+ <nd ref='-42269' />
+ <nd ref='-42267' />
+ <nd ref='-41627' />
+ <nd ref='-51175' />
+ <nd ref='-51173' />
+ <nd ref='-51171' />
+ <nd ref='-51169' />
+ <nd ref='-51177' />
+ <nd ref='-51179' />
+ <nd ref='-51181' />
+ <nd ref='-51185' />
+ <nd ref='-51183' />
+ <nd ref='-41629' />
+ <nd ref='-51189' />
+ <nd ref='-51191' />
+ <nd ref='-51201' />
+ <nd ref='-51199' />
+ <nd ref='-51197' />
+ <nd ref='-51195' />
+ <nd ref='-51193' />
+ <nd ref='-51203' />
+ <nd ref='-51187' />
+ <nd ref='-41631' />
+ <nd ref='-51207' />
+ <nd ref='-51205' />
+ <nd ref='-51211' />
+ <nd ref='-51209' />
+ <nd ref='-41633' />
+ <nd ref='-51213' />
+ <nd ref='-51223' />
+ <nd ref='-51217' />
+ <nd ref='-51221' />
+ <nd ref='-51219' />
+ <nd ref='-51225' />
+ <nd ref='-51227' />
+ <nd ref='-51215' />
+ <nd ref='-51239' />
+ <nd ref='-51241' />
+ <nd ref='-51237' />
+ <nd ref='-51235' />
+ <nd ref='-51233' />
+ <nd ref='-51231' />
+ <nd ref='-51229' />
+ <nd ref='-38979' />
+ <nd ref='-50883' />
+ <nd ref='-38977' />
+ <nd ref='-50887' />
+ <nd ref='-50885' />
+ <nd ref='-50841' />
+ <nd ref='-50877' />
+ <nd ref='-50879' />
+ <nd ref='-50881' />
+ <nd ref='-50875' />
+ <nd ref='-50873' />
+ <nd ref='-50871' />
+ <nd ref='-50869' />
+ <nd ref='-50865' />
+ <nd ref='-50867' />
+ <nd ref='-50843' />
+ <nd ref='-50863' />
+ <nd ref='-50861' />
+ <nd ref='-50859' />
+ <nd ref='-50857' />
+ <nd ref='-50847' />
+ <nd ref='-50849' />
+ <nd ref='-50851' />
+ <nd ref='-50853' />
+ <nd ref='-50855' />
+ <nd ref='-50845' />
+ <nd ref='-50837' />
+ <nd ref='-50839' />
+ <nd ref='-50835' />
+ <nd ref='-50811' />
+ <nd ref='-50809' />
+ <nd ref='-50815' />
+ <nd ref='-50817' />
+ <nd ref='-50833' />
+ <nd ref='-50831' />
+ <nd ref='-50813' />
+ <nd ref='-50827' />
+ <nd ref='-50829' />
+ <nd ref='-50825' />
+ <nd ref='-50823' />
+ <nd ref='-50819' />
+ <nd ref='-50821' />
+ <nd ref='-50789' />
+ <nd ref='-50787' />
+ <nd ref='-50783' />
+ <nd ref='-50785' />
+ <nd ref='-50795' />
+ <nd ref='-50793' />
+ <nd ref='-50805' />
+ <nd ref='-50803' />
+ <nd ref='-50801' />
+ <nd ref='-50799' />
+ <nd ref='-50797' />
+ <nd ref='-50807' />
+ <nd ref='-50791' />
+ <nd ref='-50763' />
+ <nd ref='-50773' />
+ <nd ref='-50771' />
+ <nd ref='-50769' />
+ <nd ref='-50775' />
+ <nd ref='-50781' />
+ <nd ref='-50777' />
+ <nd ref='-50767' />
+ <nd ref='-50779' />
+ <nd ref='-50765' />
+ <nd ref='-50749' />
+ <nd ref='-50759' />
+ <nd ref='-50761' />
+ <nd ref='-50751' />
+ <nd ref='-50753' />
+ <nd ref='-50755' />
+ <nd ref='-50757' />
+ <nd ref='-50743' />
+ <nd ref='-50733' />
+ <nd ref='-50745' />
+ <nd ref='-50747' />
+ <nd ref='-50739' />
+ <nd ref='-50737' />
+ <nd ref='-50735' />
+ <nd ref='-50741' />
+ <nd ref='-50731' />
+ <nd ref='-50715' />
+ <nd ref='-50729' />
+ <nd ref='-50727' />
+ <nd ref='-50713' />
+ <nd ref='-50723' />
+ <nd ref='-50721' />
+ <nd ref='-50719' />
+ <nd ref='-50717' />
+ <nd ref='-50725' />
+ <nd ref='-50711' />
+ <nd ref='-50709' />
+ <nd ref='-50707' />
+ <nd ref='-50705' />
+ <nd ref='-38975' />
+ <nd ref='-46403' />
+ <nd ref='-46393' />
+ <nd ref='-46395' />
+ <nd ref='-46397' />
+ <nd ref='-46401' />
+ <nd ref='-46399' />
+ <nd ref='-46359' />
+ <nd ref='-46391' />
+ <nd ref='-46385' />
+ <nd ref='-46387' />
+ <nd ref='-46389' />
+ <nd ref='-46361' />
+ <nd ref='-46363' />
+ <nd ref='-46365' />
+ <nd ref='-46367' />
+ <nd ref='-46369' />
+ <nd ref='-46371' />
+ <nd ref='-46373' />
+ <nd ref='-46375' />
+ <nd ref='-46383' />
+ <nd ref='-46381' />
+ <nd ref='-46379' />
+ <nd ref='-46377' />
+ <nd ref='-46343' />
+ <nd ref='-46351' />
+ <nd ref='-46357' />
+ <nd ref='-46355' />
+ <nd ref='-46353' />
+ <nd ref='-46347' />
+ <nd ref='-46349' />
+ <nd ref='-46345' />
+ <nd ref='-46407' />
+ <nd ref='-46405' />
+ <nd ref='-46409' />
+ <nd ref='-46413' />
+ <nd ref='-46411' />
+ <nd ref='-46415' />
+ <nd ref='-46417' />
+ <nd ref='-46419' />
+ <nd ref='-46421' />
+ <nd ref='-46423' />
+ <nd ref='-46425' />
+ <nd ref='-46427' />
+ <nd ref='-46435' />
+ <nd ref='-46433' />
+ <nd ref='-46431' />
+ <nd ref='-46429' />
+ <nd ref='-46449' />
+ <nd ref='-46451' />
+ <nd ref='-46447' />
+ <nd ref='-46445' />
+ <nd ref='-41635' />
+ <nd ref='-43051' />
+ <nd ref='-46443' />
+ <nd ref='-46439' />
+ <nd ref='-46441' />
+ <nd ref='-46437' />
+ <nd ref='-38983' />
+ <nd ref='-41617' />
+ <tag k='ISO3166-1:alpha2' v='PL' />
+ <tag k='maxspeed:living_street' v='20' />
+ <tag k='maxspeed:motorway' v='140' />
+ <tag k='maxspeed:rural' v='90' />
+ <tag k='maxspeed:rural_dual' v='100' />
+ <tag k='maxspeed:source' v='http://ec.europa.eu/transport/road_safety/going_abroad/poland/speed_limits_en.htm' />
+ <tag k='maxspeed:trunk' v='120' />
+ <tag k='maxspeed:trunk_single' v='100' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Poland' />
+ </way>
+ <way id='-57733'>
+ <nd ref='-38427' />
+ <nd ref='-43673' />
+ <nd ref='-43679' />
+ <nd ref='-43677' />
+ <nd ref='-43675' />
+ <nd ref='-41637' />
+ <nd ref='-43681' />
+ <nd ref='-43683' />
+ <nd ref='-41639' />
+ <nd ref='-42537' />
+ <nd ref='-41641' />
+ <nd ref='-41643' />
+ <nd ref='-40709' />
+ <nd ref='-40707' />
+ <nd ref='-40705' />
+ <nd ref='-40703' />
+ <nd ref='-40701' />
+ <nd ref='-40699' />
+ <nd ref='-40697' />
+ <nd ref='-35079' />
+ <nd ref='-35081' />
+ <nd ref='-35083' />
+ <nd ref='-40695' />
+ <nd ref='-35085' />
+ <nd ref='-35087' />
+ <nd ref='-35089' />
+ <nd ref='-40693' />
+ <nd ref='-41645' />
+ <nd ref='-41647' />
+ <nd ref='-42727' />
+ <nd ref='-41649' />
+ <nd ref='-40691' />
+ <nd ref='-42729' />
+ <nd ref='-41651' />
+ <nd ref='-41653' />
+ <nd ref='-42733' />
+ <nd ref='-41655' />
+ <nd ref='-42731' />
+ <nd ref='-42725' />
+ <nd ref='-41657' />
+ <nd ref='-43015' />
+ <nd ref='-43013' />
+ <nd ref='-38445' />
+ <nd ref='-38443' />
+ <nd ref='-43645' />
+ <nd ref='-43647' />
+ <nd ref='-43649' />
+ <nd ref='-43651' />
+ <nd ref='-43653' />
+ <nd ref='-38441' />
+ <nd ref='-43655' />
+ <nd ref='-38439' />
+ <nd ref='-38437' />
+ <nd ref='-43657' />
+ <nd ref='-38435' />
+ <nd ref='-38433' />
+ <nd ref='-38431' />
+ <nd ref='-43663' />
+ <nd ref='-43661' />
+ <nd ref='-43665' />
+ <nd ref='-43667' />
+ <nd ref='-43669' />
+ <nd ref='-43659' />
+ <nd ref='-38429' />
+ <nd ref='-43671' />
+ <nd ref='-38427' />
+ <tag k='ISO3166-1:alpha2' v='KP' />
+ <tag k='name:en' v='Korea, Dem. Rep.' />
+ </way>
+ <way id='-57735'>
+ <nd ref='-39533' />
+ <nd ref='-44131' />
+ <nd ref='-44129' />
+ <nd ref='-44127' />
+ <nd ref='-44117' />
+ <nd ref='-44123' />
+ <nd ref='-44125' />
+ <nd ref='-44121' />
+ <nd ref='-44119' />
+ <nd ref='-39531' />
+ <nd ref='-44111' />
+ <nd ref='-44109' />
+ <nd ref='-44107' />
+ <nd ref='-44105' />
+ <nd ref='-44103' />
+ <nd ref='-44113' />
+ <nd ref='-44115' />
+ <nd ref='-44083' />
+ <nd ref='-44097' />
+ <nd ref='-44101' />
+ <nd ref='-44099' />
+ <nd ref='-44091' />
+ <nd ref='-44089' />
+ <nd ref='-44095' />
+ <nd ref='-44093' />
+ <nd ref='-44085' />
+ <nd ref='-44087' />
+ <nd ref='-44071' />
+ <nd ref='-44077' />
+ <nd ref='-44075' />
+ <nd ref='-44073' />
+ <nd ref='-44081' />
+ <nd ref='-44079' />
+ <nd ref='-39529' />
+ <nd ref='-44069' />
+ <nd ref='-44067' />
+ <nd ref='-39527' />
+ <nd ref='-44065' />
+ <nd ref='-44061' />
+ <nd ref='-44063' />
+ <nd ref='-44047' />
+ <nd ref='-44051' />
+ <nd ref='-44049' />
+ <nd ref='-44053' />
+ <nd ref='-44059' />
+ <nd ref='-44055' />
+ <nd ref='-44057' />
+ <nd ref='-44013' />
+ <nd ref='-44045' />
+ <nd ref='-44043' />
+ <nd ref='-44039' />
+ <nd ref='-44041' />
+ <nd ref='-44035' />
+ <nd ref='-44037' />
+ <nd ref='-44017' />
+ <nd ref='-44015' />
+ <nd ref='-39525' />
+ <nd ref='-44025' />
+ <nd ref='-44023' />
+ <nd ref='-44021' />
+ <nd ref='-44019' />
+ <nd ref='-44027' />
+ <nd ref='-39523' />
+ <nd ref='-44033' />
+ <nd ref='-44029' />
+ <nd ref='-44031' />
+ <nd ref='-42689' />
+ <nd ref='-39521' />
+ <nd ref='-53853' />
+ <nd ref='-42685' />
+ <nd ref='-42683' />
+ <nd ref='-42687' />
+ <nd ref='-39537' />
+ <nd ref='-39535' />
+ <nd ref='-43943' />
+ <nd ref='-43945' />
+ <nd ref='-43947' />
+ <nd ref='-43949' />
+ <nd ref='-43951' />
+ <nd ref='-43953' />
+ <nd ref='-43955' />
+ <nd ref='-43957' />
+ <nd ref='-43959' />
+ <nd ref='-43961' />
+ <nd ref='-43965' />
+ <nd ref='-43963' />
+ <nd ref='-43967' />
+ <nd ref='-43969' />
+ <nd ref='-43973' />
+ <nd ref='-43971' />
+ <nd ref='-43977' />
+ <nd ref='-43975' />
+ <nd ref='-43981' />
+ <nd ref='-43979' />
+ <nd ref='-43983' />
+ <nd ref='-43985' />
+ <nd ref='-43987' />
+ <nd ref='-43989' />
+ <nd ref='-43991' />
+ <nd ref='-43993' />
+ <nd ref='-43995' />
+ <nd ref='-43997' />
+ <nd ref='-44007' />
+ <nd ref='-44009' />
+ <nd ref='-44173' />
+ <nd ref='-44011' />
+ <nd ref='-44175' />
+ <nd ref='-44177' />
+ <nd ref='-44179' />
+ <nd ref='-44181' />
+ <nd ref='-44183' />
+ <nd ref='-44185' />
+ <nd ref='-44171' />
+ <nd ref='-44169' />
+ <nd ref='-44167' />
+ <nd ref='-44005' />
+ <nd ref='-44165' />
+ <nd ref='-44163' />
+ <nd ref='-44153' />
+ <nd ref='-44161' />
+ <nd ref='-44159' />
+ <nd ref='-44157' />
+ <nd ref='-44155' />
+ <nd ref='-44003' />
+ <nd ref='-44147' />
+ <nd ref='-44149' />
+ <nd ref='-44151' />
+ <nd ref='-44001' />
+ <nd ref='-44143' />
+ <nd ref='-44145' />
+ <nd ref='-43999' />
+ <nd ref='-44135' />
+ <nd ref='-44137' />
+ <nd ref='-44139' />
+ <nd ref='-44141' />
+ <nd ref='-44133' />
+ <nd ref='-39533' />
+ <tag k='ISO3166-1:alpha2' v='PT' />
+ <tag k='name:en' v='Portugal' />
+ </way>
+ <way id='-57737'>
+ <nd ref='-37907' />
+ <nd ref='-36133' />
+ <nd ref='-41659' />
+ <nd ref='-36139' />
+ <nd ref='-36137' />
+ <nd ref='-36135' />
+ <nd ref='-41661' />
+ <nd ref='-36141' />
+ <nd ref='-41663' />
+ <nd ref='-36143' />
+ <nd ref='-36145' />
+ <nd ref='-41665' />
+ <nd ref='-36147' />
+ <nd ref='-36149' />
+ <nd ref='-37085' />
+ <nd ref='-36127' />
+ <nd ref='-36125' />
+ <nd ref='-36119' />
+ <nd ref='-36121' />
+ <nd ref='-36123' />
+ <nd ref='-36129' />
+ <nd ref='-41667' />
+ <nd ref='-36115' />
+ <nd ref='-36117' />
+ <nd ref='-41669' />
+ <nd ref='-36113' />
+ <nd ref='-36111' />
+ <nd ref='-36109' />
+ <nd ref='-36107' />
+ <nd ref='-36105' />
+ <nd ref='-41671' />
+ <nd ref='-36103' />
+ <nd ref='-36097' />
+ <nd ref='-36099' />
+ <nd ref='-36101' />
+ <nd ref='-37083' />
+ <nd ref='-36087' />
+ <nd ref='-36089' />
+ <nd ref='-36091' />
+ <nd ref='-36093' />
+ <nd ref='-36095' />
+ <nd ref='-37879' />
+ <nd ref='-37877' />
+ <nd ref='-37875' />
+ <nd ref='-36131' />
+ <nd ref='-37873' />
+ <nd ref='-37871' />
+ <nd ref='-37869' />
+ <nd ref='-37867' />
+ <nd ref='-37907' />
+ <tag k='ISO3166-1:alpha2' v='PY' />
+ <tag k='name:en' v='Paraguay' />
+ </way>
+ <way id='-57739'>
+ <nd ref='-41827' />
+ <nd ref='-41673' />
+ <nd ref='-41675' />
+ <nd ref='-37769' />
+ <nd ref='-34455' />
+ <nd ref='-34457' />
+ <nd ref='-34459' />
+ <nd ref='-37767' />
+ <nd ref='-41677' />
+ <nd ref='-34461' />
+ <nd ref='-41679' />
+ <nd ref='-34463' />
+ <nd ref='-34465' />
+ <nd ref='-34467' />
+ <nd ref='-41827' />
+ <tag k='ISO3166-1:alpha2' v='QA' />
+ <tag k='name:en' v='Qatar' />
+ </way>
+ <way id='-57741'>
+ <nd ref='-41681' />
+ <nd ref='-50547' />
+ <nd ref='-41683' />
+ <nd ref='-50545' />
+ <nd ref='-40989' />
+ <nd ref='-50553' />
+ <nd ref='-50551' />
+ <nd ref='-50555' />
+ <nd ref='-50549' />
+ <nd ref='-41685' />
+ <nd ref='-50559' />
+ <nd ref='-50557' />
+ <nd ref='-41687' />
+ <nd ref='-50569' />
+ <nd ref='-50567' />
+ <nd ref='-50565' />
+ <nd ref='-50563' />
+ <nd ref='-50561' />
+ <nd ref='-40987' />
+ <nd ref='-50571' />
+ <nd ref='-41689' />
+ <nd ref='-41691' />
+ <nd ref='-42265' />
+ <nd ref='-50937' />
+ <nd ref='-50939' />
+ <nd ref='-50941' />
+ <nd ref='-50943' />
+ <nd ref='-50947' />
+ <nd ref='-50945' />
+ <nd ref='-50949' />
+ <nd ref='-50951' />
+ <nd ref='-50953' />
+ <nd ref='-50955' />
+ <nd ref='-50959' />
+ <nd ref='-50957' />
+ <nd ref='-42797' />
+ <nd ref='-42263' />
+ <nd ref='-41693' />
+ <nd ref='-37747' />
+ <nd ref='-37745' />
+ <nd ref='-49969' />
+ <nd ref='-49971' />
+ <nd ref='-49975' />
+ <nd ref='-49973' />
+ <nd ref='-37743' />
+ <nd ref='-49967' />
+ <nd ref='-37741' />
+ <nd ref='-49965' />
+ <nd ref='-37739' />
+ <nd ref='-49963' />
+ <nd ref='-49961' />
+ <nd ref='-37737' />
+ <nd ref='-37735' />
+ <nd ref='-49957' />
+ <nd ref='-49959' />
+ <nd ref='-37733' />
+ <nd ref='-49953' />
+ <nd ref='-49951' />
+ <nd ref='-49955' />
+ <nd ref='-49947' />
+ <nd ref='-49949' />
+ <nd ref='-37731' />
+ <nd ref='-49945' />
+ <nd ref='-49943' />
+ <nd ref='-49941' />
+ <nd ref='-37729' />
+ <nd ref='-37727' />
+ <nd ref='-37765' />
+ <nd ref='-49937' />
+ <nd ref='-49935' />
+ <nd ref='-49939' />
+ <nd ref='-37763' />
+ <nd ref='-41947' />
+ <nd ref='-49979' />
+ <nd ref='-49977' />
+ <nd ref='-41945' />
+ <nd ref='-49991' />
+ <nd ref='-49993' />
+ <nd ref='-49989' />
+ <nd ref='-49987' />
+ <nd ref='-49985' />
+ <nd ref='-49995' />
+ <nd ref='-49983' />
+ <nd ref='-49981' />
+ <nd ref='-41695' />
+ <nd ref='-50001' />
+ <nd ref='-50003' />
+ <nd ref='-49999' />
+ <nd ref='-49997' />
+ <nd ref='-41943' />
+ <nd ref='-50011' />
+ <nd ref='-50017' />
+ <nd ref='-50015' />
+ <nd ref='-50013' />
+ <nd ref='-50009' />
+ <nd ref='-50007' />
+ <nd ref='-50005' />
+ <nd ref='-41697' />
+ <nd ref='-50019' />
+ <nd ref='-41941' />
+ <nd ref='-50023' />
+ <nd ref='-50025' />
+ <nd ref='-50021' />
+ <nd ref='-41939' />
+ <nd ref='-50027' />
+ <nd ref='-41699' />
+ <nd ref='-50031' />
+ <nd ref='-50029' />
+ <nd ref='-41701' />
+ <nd ref='-50033' />
+ <nd ref='-50037' />
+ <nd ref='-50035' />
+ <nd ref='-41703' />
+ <nd ref='-41705' />
+ <nd ref='-39945' />
+ <nd ref='-39943' />
+ <nd ref='-51095' />
+ <nd ref='-39941' />
+ <nd ref='-51097' />
+ <nd ref='-51099' />
+ <nd ref='-51101' />
+ <nd ref='-51103' />
+ <nd ref='-51081' />
+ <nd ref='-51093' />
+ <nd ref='-51083' />
+ <nd ref='-51085' />
+ <nd ref='-51087' />
+ <nd ref='-51089' />
+ <nd ref='-51091' />
+ <nd ref='-39939' />
+ <nd ref='-51061' />
+ <nd ref='-51063' />
+ <nd ref='-51071' />
+ <nd ref='-51069' />
+ <nd ref='-51067' />
+ <nd ref='-51065' />
+ <nd ref='-51075' />
+ <nd ref='-51073' />
+ <nd ref='-51079' />
+ <nd ref='-51077' />
+ <nd ref='-51051' />
+ <nd ref='-51053' />
+ <nd ref='-51055' />
+ <nd ref='-51057' />
+ <nd ref='-51059' />
+ <nd ref='-51043' />
+ <nd ref='-51045' />
+ <nd ref='-51047' />
+ <nd ref='-51049' />
+ <nd ref='-51037' />
+ <nd ref='-51041' />
+ <nd ref='-51039' />
+ <nd ref='-51035' />
+ <nd ref='-39937' />
+ <nd ref='-51001' />
+ <nd ref='-51005' />
+ <nd ref='-51003' />
+ <nd ref='-50999' />
+ <nd ref='-51013' />
+ <nd ref='-51007' />
+ <nd ref='-51011' />
+ <nd ref='-51009' />
+ <nd ref='-41707' />
+ <nd ref='-50981' />
+ <nd ref='-50985' />
+ <nd ref='-50987' />
+ <nd ref='-50989' />
+ <nd ref='-50983' />
+ <nd ref='-50991' />
+ <nd ref='-50993' />
+ <nd ref='-50997' />
+ <nd ref='-50995' />
+ <nd ref='-41709' />
+ <nd ref='-50979' />
+ <nd ref='-50977' />
+ <nd ref='-50973' />
+ <nd ref='-50975' />
+ <nd ref='-50971' />
+ <nd ref='-50969' />
+ <nd ref='-41711' />
+ <nd ref='-50963' />
+ <nd ref='-50961' />
+ <nd ref='-50965' />
+ <nd ref='-50967' />
+ <nd ref='-40991' />
+ <nd ref='-50543' />
+ <nd ref='-41681' />
+ <tag k='ISO3166-1:alpha2' v='RO' />
+ <tag k='maxspeed:motorway' v='130' />
+ <tag k='maxspeed:rural' v='90' />
+ <tag k='maxspeed:source' v='http://ec.europa.eu/transport/road_safety/going_abroad/romania/speed_limits_en.htm' />
+ <tag k='maxspeed:trunk' v='100' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Romania' />
+ </way>
+ <way id='-57743'>
+ <nd ref='-40787' />
+ <nd ref='-40785' />
+ <nd ref='-46499' />
+ <nd ref='-46501' />
+ <nd ref='-46497' />
+ <nd ref='-46495' />
+ <nd ref='-46493' />
+ <nd ref='-46491' />
+ <nd ref='-46489' />
+ <nd ref='-46487' />
+ <nd ref='-46485' />
+ <nd ref='-46483' />
+ <nd ref='-46481' />
+ <nd ref='-46479' />
+ <nd ref='-46475' />
+ <nd ref='-46477' />
+ <nd ref='-46473' />
+ <nd ref='-46471' />
+ <nd ref='-46469' />
+ <nd ref='-46467' />
+ <nd ref='-46465' />
+ <nd ref='-46463' />
+ <nd ref='-46461' />
+ <nd ref='-46459' />
+ <nd ref='-46457' />
+ <nd ref='-46455' />
+ <nd ref='-46453' />
+ <nd ref='-41619' />
+ <nd ref='-42801' />
+ <nd ref='-41713' />
+ <nd ref='-42799' />
+ <nd ref='-41617' />
+ <nd ref='-43049' />
+ <nd ref='-43047' />
+ <nd ref='-40793' />
+ <nd ref='-40791' />
+ <nd ref='-40789' />
+ <nd ref='-40787' />
+ <tag k='ISO3166-2' v='RU-KGD' />
+ <tag k='name:en' v='Kaliningrad' />
+ </way>
+ <way id='-57745'>
+ <nd ref='-41777' />
+ <nd ref='-34325' />
+ <nd ref='-34327' />
+ <nd ref='-34329' />
+ <nd ref='-41779' />
+ <nd ref='-34331' />
+ <nd ref='-42243' />
+ <nd ref='-34333' />
+ <nd ref='-34335' />
+ <nd ref='-42241' />
+ <nd ref='-34349' />
+ <nd ref='-34343' />
+ <nd ref='-34345' />
+ <nd ref='-34347' />
+ <nd ref='-34337' />
+ <nd ref='-34339' />
+ <nd ref='-34341' />
+ <nd ref='-38803' />
+ <nd ref='-34287' />
+ <nd ref='-34311' />
+ <nd ref='-34289' />
+ <nd ref='-34299' />
+ <nd ref='-34293' />
+ <nd ref='-34291' />
+ <nd ref='-34297' />
+ <nd ref='-34295' />
+ <nd ref='-34309' />
+ <nd ref='-34307' />
+ <nd ref='-34305' />
+ <nd ref='-34303' />
+ <nd ref='-34301' />
+ <nd ref='-34283' />
+ <nd ref='-34281' />
+ <nd ref='-34273' />
+ <nd ref='-34285' />
+ <nd ref='-34279' />
+ <nd ref='-34277' />
+ <nd ref='-34275' />
+ <nd ref='-41781' />
+ <nd ref='-34317' />
+ <nd ref='-34315' />
+ <nd ref='-34313' />
+ <nd ref='-41783' />
+ <nd ref='-41777' />
+ <tag k='ISO3166-1:alpha2' v='RW' />
+ <tag k='name:en' v='Rwanda' />
+ </way>
+ <way id='-57747'>
+ <nd ref='-39251' />
+ <nd ref='-41785' />
+ <nd ref='-41367' />
+ <nd ref='-41787' />
+ <nd ref='-41789' />
+ <nd ref='-41791' />
+ <nd ref='-41365' />
+ <nd ref='-41793' />
+ <nd ref='-41363' />
+ <nd ref='-41361' />
+ <nd ref='-41795' />
+ <nd ref='-41359' />
+ <nd ref='-41357' />
+ <nd ref='-41797' />
+ <nd ref='-41799' />
+ <nd ref='-41801' />
+ <nd ref='-41355' />
+ <nd ref='-41353' />
+ <nd ref='-41803' />
+ <nd ref='-41351' />
+ <nd ref='-36309' />
+ <nd ref='-40953' />
+ <nd ref='-40951' />
+ <nd ref='-40949' />
+ <nd ref='-40947' />
+ <nd ref='-41805' />
+ <nd ref='-40945' />
+ <nd ref='-40943' />
+ <nd ref='-41807' />
+ <nd ref='-40941' />
+ <nd ref='-41809' />
+ <nd ref='-41811' />
+ <nd ref='-40939' />
+ <nd ref='-41813' />
+ <nd ref='-40937' />
+ <nd ref='-41815' />
+ <nd ref='-41817' />
+ <nd ref='-40935' />
+ <nd ref='-40933' />
+ <nd ref='-36307' />
+ <nd ref='-40931' />
+ <nd ref='-40929' />
+ <nd ref='-41819' />
+ <nd ref='-40927' />
+ <nd ref='-41821' />
+ <nd ref='-39251' />
+ <tag k='ISO3166-1:alpha2' v='EH' />
+ <tag k='name:en' v='Western Sahara' />
+ <tag k='note' v='Self admin.; Claimed by Morocco' />
+ </way>
+ <way id='-57749'>
+ <nd ref='-40295' />
+ <nd ref='-40293' />
+ <nd ref='-36331' />
+ <nd ref='-40291' />
+ <nd ref='-40289' />
+ <nd ref='-40287' />
+ <nd ref='-40717' />
+ <nd ref='-36327' />
+ <nd ref='-36325' />
+ <nd ref='-40715' />
+ <nd ref='-40713' />
+ <nd ref='-40711' />
+ <nd ref='-34381' />
+ <nd ref='-34383' />
+ <nd ref='-34385' />
+ <nd ref='-41823' />
+ <nd ref='-37771' />
+ <nd ref='-41825' />
+ <nd ref='-41675' />
+ <nd ref='-41673' />
+ <nd ref='-41827' />
+ <nd ref='-34467' />
+ <nd ref='-34465' />
+ <nd ref='-34463' />
+ <nd ref='-41679' />
+ <nd ref='-34471' />
+ <nd ref='-34469' />
+ <nd ref='-37051' />
+ <nd ref='-37049' />
+ <nd ref='-37047' />
+ <nd ref='-37045' />
+ <nd ref='-41565' />
+ <nd ref='-41563' />
+ <nd ref='-41561' />
+ <nd ref='-34179' />
+ <nd ref='-34181' />
+ <nd ref='-34183' />
+ <nd ref='-34185' />
+ <nd ref='-34187' />
+ <nd ref='-34189' />
+ <nd ref='-34191' />
+ <nd ref='-34193' />
+ <nd ref='-34195' />
+ <nd ref='-34197' />
+ <nd ref='-34199' />
+ <nd ref='-34201' />
+ <nd ref='-41829' />
+ <nd ref='-36319' />
+ <nd ref='-39313' />
+ <nd ref='-39327' />
+ <nd ref='-41845' />
+ <nd ref='-36317' />
+ <nd ref='-41831' />
+ <nd ref='-40375' />
+ <nd ref='-36329' />
+ <nd ref='-41833' />
+ <nd ref='-40373' />
+ <nd ref='-41835' />
+ <nd ref='-41837' />
+ <nd ref='-41839' />
+ <nd ref='-40371' />
+ <nd ref='-41841' />
+ <nd ref='-41843' />
+ <nd ref='-40297' />
+ <nd ref='-40295' />
+ <tag k='ISO3166-1:alpha2' v='SA' />
+ <tag k='name:en' v='Saudi Arabia' />
+ </way>
+ <way id='-57751'>
+ <nd ref='-41845' />
+ <nd ref='-39327' />
+ <nd ref='-36315' />
+ <nd ref='-39325' />
+ <nd ref='-39323' />
+ <nd ref='-48453' />
+ <nd ref='-48451' />
+ <nd ref='-48447' />
+ <nd ref='-48445' />
+ <nd ref='-48449' />
+ <nd ref='-48443' />
+ <nd ref='-48441' />
+ <nd ref='-48439' />
+ <nd ref='-39321' />
+ <nd ref='-39319' />
+ <nd ref='-30913' />
+ <nd ref='-30917' />
+ <nd ref='-30915' />
+ <nd ref='-30927' />
+ <nd ref='-30919' />
+ <nd ref='-30921' />
+ <nd ref='-30925' />
+ <nd ref='-30923' />
+ <nd ref='-30939' />
+ <nd ref='-30937' />
+ <nd ref='-30929' />
+ <nd ref='-30931' />
+ <nd ref='-30933' />
+ <nd ref='-30935' />
+ <nd ref='-30973' />
+ <nd ref='-30953' />
+ <nd ref='-30949' />
+ <nd ref='-30947' />
+ <nd ref='-30945' />
+ <nd ref='-30941' />
+ <nd ref='-30943' />
+ <nd ref='-30951' />
+ <nd ref='-30955' />
+ <nd ref='-30969' />
+ <nd ref='-30971' />
+ <nd ref='-30965' />
+ <nd ref='-30963' />
+ <nd ref='-30967' />
+ <nd ref='-30959' />
+ <nd ref='-30957' />
+ <nd ref='-30961' />
+ <nd ref='-39579' />
+ <nd ref='-48925' />
+ <nd ref='-48927' />
+ <nd ref='-48937' />
+ <nd ref='-48939' />
+ <nd ref='-48935' />
+ <nd ref='-48933' />
+ <nd ref='-48931' />
+ <nd ref='-48929' />
+ <nd ref='-48923' />
+ <nd ref='-48903' />
+ <nd ref='-48921' />
+ <nd ref='-48911' />
+ <nd ref='-48919' />
+ <nd ref='-48917' />
+ <nd ref='-48915' />
+ <nd ref='-48913' />
+ <nd ref='-48907' />
+ <nd ref='-48909' />
+ <nd ref='-48905' />
+ <nd ref='-48899' />
+ <nd ref='-48901' />
+ <nd ref='-48887' />
+ <nd ref='-48897' />
+ <nd ref='-48891' />
+ <nd ref='-48895' />
+ <nd ref='-48893' />
+ <nd ref='-48889' />
+ <nd ref='-48869' />
+ <nd ref='-48881' />
+ <nd ref='-48885' />
+ <nd ref='-48883' />
+ <nd ref='-48871' />
+ <nd ref='-48875' />
+ <nd ref='-48873' />
+ <nd ref='-48877' />
+ <nd ref='-48879' />
+ <nd ref='-48857' />
+ <nd ref='-48867' />
+ <nd ref='-48855' />
+ <nd ref='-48853' />
+ <nd ref='-48865' />
+ <nd ref='-48851' />
+ <nd ref='-48863' />
+ <nd ref='-48861' />
+ <nd ref='-48859' />
+ <nd ref='-38005' />
+ <nd ref='-48845' />
+ <nd ref='-48847' />
+ <nd ref='-48849' />
+ <nd ref='-38003' />
+ <nd ref='-48781' />
+ <nd ref='-48779' />
+ <nd ref='-48799' />
+ <nd ref='-48797' />
+ <nd ref='-48787' />
+ <nd ref='-48793' />
+ <nd ref='-48795' />
+ <nd ref='-48789' />
+ <nd ref='-48791' />
+ <nd ref='-48785' />
+ <nd ref='-48805' />
+ <nd ref='-48807' />
+ <nd ref='-48803' />
+ <nd ref='-48801' />
+ <nd ref='-48809' />
+ <nd ref='-48813' />
+ <nd ref='-48811' />
+ <nd ref='-48783' />
+ <nd ref='-48817' />
+ <nd ref='-48819' />
+ <nd ref='-48815' />
+ <nd ref='-48827' />
+ <nd ref='-48825' />
+ <nd ref='-48823' />
+ <nd ref='-48821' />
+ <nd ref='-48829' />
+ <nd ref='-48833' />
+ <nd ref='-48835' />
+ <nd ref='-48837' />
+ <nd ref='-48839' />
+ <nd ref='-48831' />
+ <nd ref='-48841' />
+ <nd ref='-48843' />
+ <nd ref='-41847' />
+ <nd ref='-41849' />
+ <nd ref='-41851' />
+ <nd ref='-41853' />
+ <nd ref='-40751' />
+ <nd ref='-53899' />
+ <nd ref='-53903' />
+ <nd ref='-53905' />
+ <nd ref='-53901' />
+ <nd ref='-41845' />
+ <tag k='ISO3166-1:alpha2' v='SD' />
+ <tag k='name:en' v='Sudan' />
+ </way>
+ <way id='-57753'>
+ <nd ref='-39579' />
+ <nd ref='-30839' />
+ <nd ref='-30855' />
+ <nd ref='-30843' />
+ <nd ref='-30841' />
+ <nd ref='-30845' />
+ <nd ref='-30851' />
+ <nd ref='-30853' />
+ <nd ref='-30847' />
+ <nd ref='-30849' />
+ <nd ref='-30865' />
+ <nd ref='-30857' />
+ <nd ref='-30859' />
+ <nd ref='-30861' />
+ <nd ref='-30863' />
+ <nd ref='-30911' />
+ <nd ref='-30867' />
+ <nd ref='-30873' />
+ <nd ref='-30871' />
+ <nd ref='-30869' />
+ <nd ref='-30875' />
+ <nd ref='-30879' />
+ <nd ref='-30877' />
+ <nd ref='-30891' />
+ <nd ref='-30885' />
+ <nd ref='-30883' />
+ <nd ref='-30881' />
+ <nd ref='-30887' />
+ <nd ref='-30889' />
+ <nd ref='-30909' />
+ <nd ref='-30903' />
+ <nd ref='-30905' />
+ <nd ref='-30901' />
+ <nd ref='-30907' />
+ <nd ref='-30897' />
+ <nd ref='-30899' />
+ <nd ref='-30893' />
+ <nd ref='-30895' />
+ <nd ref='-39577' />
+ <nd ref='-31115' />
+ <nd ref='-31113' />
+ <nd ref='-31111' />
+ <nd ref='-31109' />
+ <nd ref='-41855' />
+ <nd ref='-40595' />
+ <nd ref='-31125' />
+ <nd ref='-31121' />
+ <nd ref='-31119' />
+ <nd ref='-31117' />
+ <nd ref='-31123' />
+ <nd ref='-40623' />
+ <nd ref='-42249' />
+ <nd ref='-41857' />
+ <nd ref='-41859' />
+ <nd ref='-42247' />
+ <nd ref='-31047' />
+ <nd ref='-31049' />
+ <nd ref='-31051' />
+ <nd ref='-31053' />
+ <nd ref='-31055' />
+ <nd ref='-31057' />
+ <nd ref='-31059' />
+ <nd ref='-31061' />
+ <nd ref='-31065' />
+ <nd ref='-31063' />
+ <nd ref='-31075' />
+ <nd ref='-31067' />
+ <nd ref='-31069' />
+ <nd ref='-31071' />
+ <nd ref='-31073' />
+ <nd ref='-31079' />
+ <nd ref='-31077' />
+ <nd ref='-42245' />
+ <nd ref='-49093' />
+ <nd ref='-49097' />
+ <nd ref='-49099' />
+ <nd ref='-49095' />
+ <nd ref='-49091' />
+ <nd ref='-49089' />
+ <nd ref='-49075' />
+ <nd ref='-49077' />
+ <nd ref='-49073' />
+ <nd ref='-49079' />
+ <nd ref='-49087' />
+ <nd ref='-49081' />
+ <nd ref='-49083' />
+ <nd ref='-49085' />
+ <nd ref='-49071' />
+ <nd ref='-49069' />
+ <nd ref='-49067' />
+ <nd ref='-49065' />
+ <nd ref='-49063' />
+ <nd ref='-49061' />
+ <nd ref='-49057' />
+ <nd ref='-49059' />
+ <nd ref='-49001' />
+ <nd ref='-49055' />
+ <nd ref='-49053' />
+ <nd ref='-49051' />
+ <nd ref='-49049' />
+ <nd ref='-49047' />
+ <nd ref='-49045' />
+ <nd ref='-49043' />
+ <nd ref='-49041' />
+ <nd ref='-49039' />
+ <nd ref='-49037' />
+ <nd ref='-49035' />
+ <nd ref='-49033' />
+ <nd ref='-49031' />
+ <nd ref='-49029' />
+ <nd ref='-49027' />
+ <nd ref='-49025' />
+ <nd ref='-49023' />
+ <nd ref='-49021' />
+ <nd ref='-49019' />
+ <nd ref='-49017' />
+ <nd ref='-49015' />
+ <nd ref='-49013' />
+ <nd ref='-49011' />
+ <nd ref='-49007' />
+ <nd ref='-49009' />
+ <nd ref='-49005' />
+ <nd ref='-49003' />
+ <nd ref='-38801' />
+ <nd ref='-41861' />
+ <nd ref='-48999' />
+ <nd ref='-48997' />
+ <nd ref='-48991' />
+ <nd ref='-48995' />
+ <nd ref='-48993' />
+ <nd ref='-48989' />
+ <nd ref='-48987' />
+ <nd ref='-48985' />
+ <nd ref='-48983' />
+ <nd ref='-48971' />
+ <nd ref='-48973' />
+ <nd ref='-48975' />
+ <nd ref='-48981' />
+ <nd ref='-48979' />
+ <nd ref='-48977' />
+ <nd ref='-48941' />
+ <nd ref='-48969' />
+ <nd ref='-48967' />
+ <nd ref='-48963' />
+ <nd ref='-48965' />
+ <nd ref='-48961' />
+ <nd ref='-48943' />
+ <nd ref='-48945' />
+ <nd ref='-48947' />
+ <nd ref='-48949' />
+ <nd ref='-48951' />
+ <nd ref='-48955' />
+ <nd ref='-48953' />
+ <nd ref='-48959' />
+ <nd ref='-48957' />
+ <nd ref='-38005' />
+ <nd ref='-48859' />
+ <nd ref='-48861' />
+ <nd ref='-48863' />
+ <nd ref='-48851' />
+ <nd ref='-48865' />
+ <nd ref='-48853' />
+ <nd ref='-48855' />
+ <nd ref='-48867' />
+ <nd ref='-48857' />
+ <nd ref='-48879' />
+ <nd ref='-48877' />
+ <nd ref='-48873' />
+ <nd ref='-48875' />
+ <nd ref='-48871' />
+ <nd ref='-48883' />
+ <nd ref='-48885' />
+ <nd ref='-48881' />
+ <nd ref='-48869' />
+ <nd ref='-48889' />
+ <nd ref='-48893' />
+ <nd ref='-48895' />
+ <nd ref='-48891' />
+ <nd ref='-48897' />
+ <nd ref='-48887' />
+ <nd ref='-48901' />
+ <nd ref='-48899' />
+ <nd ref='-48905' />
+ <nd ref='-48909' />
+ <nd ref='-48907' />
+ <nd ref='-48913' />
+ <nd ref='-48915' />
+ <nd ref='-48917' />
+ <nd ref='-48919' />
+ <nd ref='-48911' />
+ <nd ref='-48921' />
+ <nd ref='-48903' />
+ <nd ref='-48923' />
+ <nd ref='-48929' />
+ <nd ref='-48931' />
+ <nd ref='-48933' />
+ <nd ref='-48935' />
+ <nd ref='-48939' />
+ <nd ref='-48937' />
+ <nd ref='-48927' />
+ <nd ref='-48925' />
+ <nd ref='-39579' />
+ <tag k='ISO3166-1:alpha2' v='SS' />
+ <tag k='name:en' v='South Sudan' />
+ </way>
+ <way id='-57755'>
+ <nd ref='-41345' />
+ <nd ref='-41863' />
+ <nd ref='-35069' />
+ <nd ref='-41343' />
+ <nd ref='-41341' />
+ <nd ref='-34255' />
+ <nd ref='-34259' />
+ <nd ref='-34257' />
+ <nd ref='-34253' />
+ <nd ref='-34251' />
+ <nd ref='-39801' />
+ <nd ref='-34261' />
+ <nd ref='-34263' />
+ <nd ref='-34267' />
+ <nd ref='-34265' />
+ <nd ref='-34269' />
+ <nd ref='-34271' />
+ <nd ref='-39847' />
+ <nd ref='-39845' />
+ <nd ref='-35047' />
+ <nd ref='-35049' />
+ <nd ref='-35051' />
+ <nd ref='-39843' />
+ <nd ref='-41865' />
+ <nd ref='-41867' />
+ <nd ref='-39829' />
+ <nd ref='-39827' />
+ <nd ref='-39825' />
+ <nd ref='-39823' />
+ <nd ref='-39821' />
+ <nd ref='-39819' />
+ <nd ref='-35059' />
+ <nd ref='-35053' />
+ <nd ref='-35055' />
+ <nd ref='-35057' />
+ <nd ref='-35061' />
+ <nd ref='-39835' />
+ <nd ref='-39833' />
+ <nd ref='-39831' />
+ <nd ref='-41869' />
+ <nd ref='-41871' />
+ <nd ref='-41349' />
+ <nd ref='-41873' />
+ <nd ref='-41347' />
+ <nd ref='-35077' />
+ <nd ref='-35075' />
+ <nd ref='-35073' />
+ <nd ref='-35071' />
+ <nd ref='-41345' />
+ <tag k='ISO3166-1:alpha2' v='SN' />
+ <tag k='name:en' v='Senegal' />
+ </way>
+ <way id='-57757'>
+ <nd ref='-41875' />
+ <nd ref='-41393' />
+ <nd ref='-41391' />
+ <nd ref='-41389' />
+ <nd ref='-41877' />
+ <nd ref='-41879' />
+ <nd ref='-41881' />
+ <nd ref='-41883' />
+ <nd ref='-41885' />
+ <nd ref='-41887' />
+ <nd ref='-42995' />
+ <nd ref='-41397' />
+ <nd ref='-41395' />
+ <nd ref='-41889' />
+ <nd ref='-41891' />
+ <nd ref='-41893' />
+ <nd ref='-42997' />
+ <nd ref='-42999' />
+ <nd ref='-43001' />
+ <nd ref='-43003' />
+ <nd ref='-41895' />
+ <nd ref='-41875' />
+ <tag k='ISO3166-1:alpha2' v='SG' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Singapore' />
+ </way>
+ <way id='-57759'>
+ <nd ref='-39805' />
+ <nd ref='-34231' />
+ <nd ref='-34229' />
+ <nd ref='-34227' />
+ <nd ref='-34233' />
+ <nd ref='-34225' />
+ <nd ref='-34235' />
+ <nd ref='-41897' />
+ <nd ref='-41899' />
+ <nd ref='-40747' />
+ <nd ref='-34239' />
+ <nd ref='-34237' />
+ <nd ref='-34241' />
+ <nd ref='-40745' />
+ <nd ref='-39813' />
+ <nd ref='-39811' />
+ <nd ref='-34249' />
+ <nd ref='-34247' />
+ <nd ref='-34245' />
+ <nd ref='-34243' />
+ <nd ref='-41901' />
+ <nd ref='-39809' />
+ <nd ref='-41903' />
+ <nd ref='-41905' />
+ <nd ref='-39807' />
+ <nd ref='-34223' />
+ <nd ref='-34221' />
+ <nd ref='-34219' />
+ <nd ref='-34217' />
+ <nd ref='-34215' />
+ <nd ref='-34213' />
+ <nd ref='-34209' />
+ <nd ref='-34211' />
+ <nd ref='-34203' />
+ <nd ref='-34207' />
+ <nd ref='-34205' />
+ <nd ref='-39805' />
+ <tag k='ISO3166-1:alpha2' v='SL' />
+ <tag k='name:en' v='Sierra Leone' />
+ </way>
+ <way id='-57761'>
+ <nd ref='-39907' />
+ <nd ref='-35723' />
+ <nd ref='-35721' />
+ <nd ref='-35719' />
+ <nd ref='-35717' />
+ <nd ref='-35715' />
+ <nd ref='-35713' />
+ <nd ref='-35711' />
+ <nd ref='-35709' />
+ <nd ref='-35707' />
+ <nd ref='-35705' />
+ <nd ref='-35703' />
+ <nd ref='-35701' />
+ <nd ref='-35699' />
+ <nd ref='-35697' />
+ <nd ref='-35695' />
+ <nd ref='-35693' />
+ <nd ref='-35691' />
+ <nd ref='-39905' />
+ <nd ref='-39903' />
+ <nd ref='-36777' />
+ <nd ref='-36779' />
+ <nd ref='-41907' />
+ <nd ref='-41909' />
+ <nd ref='-39901' />
+ <nd ref='-39899' />
+ <nd ref='-41509' />
+ <nd ref='-41507' />
+ <nd ref='-41911' />
+ <nd ref='-41913' />
+ <nd ref='-36787' />
+ <nd ref='-35749' />
+ <nd ref='-35747' />
+ <nd ref='-35745' />
+ <nd ref='-35743' />
+ <nd ref='-35741' />
+ <nd ref='-35739' />
+ <nd ref='-35737' />
+ <nd ref='-35735' />
+ <nd ref='-35733' />
+ <nd ref='-35731' />
+ <nd ref='-35729' />
+ <nd ref='-35727' />
+ <nd ref='-35725' />
+ <nd ref='-39907' />
+ <tag k='ISO3166-1:alpha2' v='SV' />
+ <tag k='name:en' v='El Salvador' />
+ </way>
+ <way id='-57763'>
+ <nd ref='-41915' />
+ <nd ref='-44315' />
+ <nd ref='-44317' />
+ <nd ref='-41917' />
+ <nd ref='-44319' />
+ <nd ref='-44321' />
+ <nd ref='-44323' />
+ <nd ref='-44359' />
+ <nd ref='-44327' />
+ <nd ref='-44325' />
+ <nd ref='-44331' />
+ <nd ref='-44333' />
+ <nd ref='-44329' />
+ <nd ref='-44335' />
+ <nd ref='-44361' />
+ <nd ref='-41919' />
+ <nd ref='-44363' />
+ <nd ref='-44337' />
+ <nd ref='-41921' />
+ <nd ref='-44339' />
+ <nd ref='-44343' />
+ <nd ref='-44341' />
+ <nd ref='-41923' />
+ <nd ref='-41925' />
+ <nd ref='-44345' />
+ <nd ref='-44347' />
+ <nd ref='-41927' />
+ <nd ref='-44353' />
+ <nd ref='-44355' />
+ <nd ref='-44357' />
+ <nd ref='-44351' />
+ <nd ref='-44349' />
+ <nd ref='-41929' />
+ <nd ref='-41915' />
+ <tag k='ISO3166-1:alpha2' v='SM' />
+ <tag k='name:en' v='San Marino' />
+ </way>
+ <way id='-57765'>
+ <nd ref='-41937' />
+ <nd ref='-50039' />
+ <nd ref='-50041' />
+ <nd ref='-50043' />
+ <nd ref='-50045' />
+ <nd ref='-50047' />
+ <nd ref='-39945' />
+ <nd ref='-41705' />
+ <nd ref='-41703' />
+ <nd ref='-50035' />
+ <nd ref='-50037' />
+ <nd ref='-50033' />
+ <nd ref='-41701' />
+ <nd ref='-50029' />
+ <nd ref='-50031' />
+ <nd ref='-41699' />
+ <nd ref='-50027' />
+ <nd ref='-41939' />
+ <nd ref='-50021' />
+ <nd ref='-50025' />
+ <nd ref='-50023' />
+ <nd ref='-41941' />
+ <nd ref='-50019' />
+ <nd ref='-41697' />
+ <nd ref='-50005' />
+ <nd ref='-50007' />
+ <nd ref='-50009' />
+ <nd ref='-50013' />
+ <nd ref='-50015' />
+ <nd ref='-50017' />
+ <nd ref='-50011' />
+ <nd ref='-41943' />
+ <nd ref='-49997' />
+ <nd ref='-49999' />
+ <nd ref='-50003' />
+ <nd ref='-50001' />
+ <nd ref='-41695' />
+ <nd ref='-49981' />
+ <nd ref='-49983' />
+ <nd ref='-49995' />
+ <nd ref='-49985' />
+ <nd ref='-49987' />
+ <nd ref='-49989' />
+ <nd ref='-49993' />
+ <nd ref='-49991' />
+ <nd ref='-41945' />
+ <nd ref='-49977' />
+ <nd ref='-49979' />
+ <nd ref='-41947' />
+ <nd ref='-49933' />
+ <nd ref='-37761' />
+ <nd ref='-37759' />
+ <nd ref='-37757' />
+ <nd ref='-49931' />
+ <nd ref='-37755' />
+ <nd ref='-41949' />
+ <nd ref='-49927' />
+ <nd ref='-49929' />
+ <nd ref='-41951' />
+ <nd ref='-49925' />
+ <nd ref='-49923' />
+ <nd ref='-49919' />
+ <nd ref='-49921' />
+ <nd ref='-37753' />
+ <nd ref='-49917' />
+ <nd ref='-49915' />
+ <nd ref='-41953' />
+ <nd ref='-49909' />
+ <nd ref='-49911' />
+ <nd ref='-49913' />
+ <nd ref='-49907' />
+ <nd ref='-37751' />
+ <nd ref='-46779' />
+ <nd ref='-46781' />
+ <nd ref='-46785' />
+ <nd ref='-46783' />
+ <nd ref='-46787' />
+ <nd ref='-46791' />
+ <nd ref='-46793' />
+ <nd ref='-46789' />
+ <nd ref='-41085' />
+ <nd ref='-46721' />
+ <nd ref='-46719' />
+ <nd ref='-46717' />
+ <nd ref='-46715' />
+ <nd ref='-46713' />
+ <nd ref='-46709' />
+ <nd ref='-46711' />
+ <nd ref='-46707' />
+ <nd ref='-46701' />
+ <nd ref='-46699' />
+ <nd ref='-46703' />
+ <nd ref='-46705' />
+ <nd ref='-41955' />
+ <nd ref='-46687' />
+ <nd ref='-46697' />
+ <nd ref='-46695' />
+ <nd ref='-46685' />
+ <nd ref='-46683' />
+ <nd ref='-46681' />
+ <nd ref='-46689' />
+ <nd ref='-46679' />
+ <nd ref='-46691' />
+ <nd ref='-46693' />
+ <nd ref='-46677' />
+ <nd ref='-46675' />
+ <nd ref='-46673' />
+ <nd ref='-46671' />
+ <nd ref='-46669' />
+ <nd ref='-46667' />
+ <nd ref='-46665' />
+ <nd ref='-46663' />
+ <nd ref='-46661' />
+ <nd ref='-46659' />
+ <nd ref='-46657' />
+ <nd ref='-46651' />
+ <nd ref='-46655' />
+ <nd ref='-46653' />
+ <nd ref='-41957' />
+ <nd ref='-47001' />
+ <nd ref='-47015' />
+ <nd ref='-47003' />
+ <nd ref='-47013' />
+ <nd ref='-47011' />
+ <nd ref='-47009' />
+ <nd ref='-47007' />
+ <nd ref='-47005' />
+ <nd ref='-47025' />
+ <nd ref='-47023' />
+ <nd ref='-47021' />
+ <nd ref='-47019' />
+ <nd ref='-47017' />
+ <nd ref='-46999' />
+ <nd ref='-46997' />
+ <nd ref='-46995' />
+ <nd ref='-46993' />
+ <nd ref='-46991' />
+ <nd ref='-41959' />
+ <nd ref='-49905' />
+ <nd ref='-49891' />
+ <nd ref='-49899' />
+ <nd ref='-49901' />
+ <nd ref='-49903' />
+ <nd ref='-49897' />
+ <nd ref='-49895' />
+ <nd ref='-49893' />
+ <nd ref='-37787' />
+ <nd ref='-37785' />
+ <nd ref='-49889' />
+ <nd ref='-49887' />
+ <nd ref='-49877' />
+ <nd ref='-49883' />
+ <nd ref='-49885' />
+ <nd ref='-49881' />
+ <nd ref='-49879' />
+ <nd ref='-49875' />
+ <nd ref='-49873' />
+ <nd ref='-49867' />
+ <nd ref='-49871' />
+ <nd ref='-49869' />
+ <nd ref='-49865' />
+ <nd ref='-37783' />
+ <nd ref='-49863' />
+ <nd ref='-49797' />
+ <nd ref='-37781' />
+ <nd ref='-49799' />
+ <nd ref='-49801' />
+ <nd ref='-49803' />
+ <nd ref='-49805' />
+ <nd ref='-49807' />
+ <nd ref='-39921' />
+ <nd ref='-49809' />
+ <nd ref='-49811' />
+ <nd ref='-49813' />
+ <nd ref='-49819' />
+ <nd ref='-49815' />
+ <nd ref='-49817' />
+ <nd ref='-39919' />
+ <nd ref='-49821' />
+ <nd ref='-49823' />
+ <nd ref='-49829' />
+ <nd ref='-49827' />
+ <nd ref='-49825' />
+ <nd ref='-39917' />
+ <nd ref='-49831' />
+ <nd ref='-49833' />
+ <nd ref='-39915' />
+ <nd ref='-50053' />
+ <nd ref='-39947' />
+ <nd ref='-50051' />
+ <nd ref='-50049' />
+ <nd ref='-41937' />
+ <tag k='ISO3166-1:alpha2' v='RS' />
+ <tag k='name:en' v='Serbia' />
+ </way>
+ <way id='-57767'>
+ <nd ref='-39609' />
+ <nd ref='-43475' />
+ <nd ref='-43477' />
+ <nd ref='-43479' />
+ <nd ref='-41961' />
+ <nd ref='-43491' />
+ <nd ref='-41963' />
+ <nd ref='-43513' />
+ <nd ref='-43509' />
+ <nd ref='-43507' />
+ <nd ref='-43505' />
+ <nd ref='-43511' />
+ <nd ref='-43503' />
+ <nd ref='-37899' />
+ <nd ref='-37897' />
+ <nd ref='-43501' />
+ <nd ref='-41965' />
+ <nd ref='-39877' />
+ <nd ref='-43499' />
+ <nd ref='-39875' />
+ <nd ref='-41967' />
+ <nd ref='-43497' />
+ <nd ref='-43495' />
+ <nd ref='-39873' />
+ <nd ref='-41969' />
+ <nd ref='-43471' />
+ <nd ref='-43473' />
+ <nd ref='-39609' />
+ <tag k='ISO3166-1:alpha2' v='SR' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Suriname' />
+ </way>
+ <way id='-57769'>
+ <nd ref='-41633' />
+ <nd ref='-51209' />
+ <nd ref='-51211' />
+ <nd ref='-51205' />
+ <nd ref='-51207' />
+ <nd ref='-41631' />
+ <nd ref='-51187' />
+ <nd ref='-51203' />
+ <nd ref='-51193' />
+ <nd ref='-51195' />
+ <nd ref='-51197' />
+ <nd ref='-51199' />
+ <nd ref='-51201' />
+ <nd ref='-51191' />
+ <nd ref='-51189' />
+ <nd ref='-41629' />
+ <nd ref='-51183' />
+ <nd ref='-51185' />
+ <nd ref='-51181' />
+ <nd ref='-51179' />
+ <nd ref='-51177' />
+ <nd ref='-51169' />
+ <nd ref='-51171' />
+ <nd ref='-51173' />
+ <nd ref='-51175' />
+ <nd ref='-41627' />
+ <nd ref='-42267' />
+ <nd ref='-51163' />
+ <nd ref='-51165' />
+ <nd ref='-41971' />
+ <nd ref='-51159' />
+ <nd ref='-51161' />
+ <nd ref='-51157' />
+ <nd ref='-39935' />
+ <nd ref='-51155' />
+ <nd ref='-51153' />
+ <nd ref='-39933' />
+ <nd ref='-51151' />
+ <nd ref='-51149' />
+ <nd ref='-51147' />
+ <nd ref='-51145' />
+ <nd ref='-39959' />
+ <nd ref='-39957' />
+ <nd ref='-51143' />
+ <nd ref='-51141' />
+ <nd ref='-51139' />
+ <nd ref='-51137' />
+ <nd ref='-51135' />
+ <nd ref='-51131' />
+ <nd ref='-51129' />
+ <nd ref='-51127' />
+ <nd ref='-51133' />
+ <nd ref='-51123' />
+ <nd ref='-51125' />
+ <nd ref='-51121' />
+ <nd ref='-51113' />
+ <nd ref='-51119' />
+ <nd ref='-51117' />
+ <nd ref='-51115' />
+ <nd ref='-51111' />
+ <nd ref='-51109' />
+ <nd ref='-51107' />
+ <nd ref='-51105' />
+ <nd ref='-37201' />
+ <nd ref='-49623' />
+ <nd ref='-49613' />
+ <nd ref='-49611' />
+ <nd ref='-49615' />
+ <nd ref='-49617' />
+ <nd ref='-49621' />
+ <nd ref='-49619' />
+ <nd ref='-49605' />
+ <nd ref='-49607' />
+ <nd ref='-49609' />
+ <nd ref='-37199' />
+ <nd ref='-50931' />
+ <nd ref='-50933' />
+ <nd ref='-38981' />
+ <nd ref='-50935' />
+ <nd ref='-50911' />
+ <nd ref='-50913' />
+ <nd ref='-50915' />
+ <nd ref='-50917' />
+ <nd ref='-50919' />
+ <nd ref='-50921' />
+ <nd ref='-50923' />
+ <nd ref='-50925' />
+ <nd ref='-50927' />
+ <nd ref='-50929' />
+ <nd ref='-50889' />
+ <nd ref='-50891' />
+ <nd ref='-50909' />
+ <nd ref='-50907' />
+ <nd ref='-50905' />
+ <nd ref='-50893' />
+ <nd ref='-50901' />
+ <nd ref='-50897' />
+ <nd ref='-50903' />
+ <nd ref='-50899' />
+ <nd ref='-50895' />
+ <nd ref='-38979' />
+ <nd ref='-51229' />
+ <nd ref='-51231' />
+ <nd ref='-51233' />
+ <nd ref='-51235' />
+ <nd ref='-51237' />
+ <nd ref='-51241' />
+ <nd ref='-51239' />
+ <nd ref='-51215' />
+ <nd ref='-51227' />
+ <nd ref='-51225' />
+ <nd ref='-51219' />
+ <nd ref='-51221' />
+ <nd ref='-51217' />
+ <nd ref='-51223' />
+ <nd ref='-51213' />
+ <nd ref='-41633' />
+ <tag k='ISO3166-1:alpha2' v='SK' />
+ <tag k='maxspeed:motorway' v='130' />
+ <tag k='maxspeed:rural' v='90' />
+ <tag k='maxspeed:source' v='http://ec.europa.eu/transport/road_safety/going_abroad/slovakia/speed_limits_en.htm' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Slovakia' />
+ </way>
+ <way id='-57771'>
+ <nd ref='-39955' />
+ <nd ref='-39953' />
+ <nd ref='-32627' />
+ <nd ref='-39951' />
+ <nd ref='-32625' />
+ <nd ref='-32623' />
+ <nd ref='-32621' />
+ <nd ref='-32619' />
+ <nd ref='-39931' />
+ <nd ref='-32505' />
+ <nd ref='-32507' />
+ <nd ref='-32509' />
+ <nd ref='-32513' />
+ <nd ref='-32511' />
+ <nd ref='-32525' />
+ <nd ref='-32523' />
+ <nd ref='-32521' />
+ <nd ref='-32527' />
+ <nd ref='-32519' />
+ <nd ref='-32517' />
+ <nd ref='-32515' />
+ <nd ref='-32537' />
+ <nd ref='-32533' />
+ <nd ref='-32535' />
+ <nd ref='-32529' />
+ <nd ref='-32531' />
+ <nd ref='-32617' />
+ <nd ref='-32571' />
+ <nd ref='-32545' />
+ <nd ref='-32543' />
+ <nd ref='-32539' />
+ <nd ref='-32541' />
+ <nd ref='-32547' />
+ <nd ref='-32553' />
+ <nd ref='-32549' />
+ <nd ref='-32551' />
+ <nd ref='-32559' />
+ <nd ref='-32555' />
+ <nd ref='-32557' />
+ <nd ref='-32569' />
+ <nd ref='-32561' />
+ <nd ref='-32563' />
+ <nd ref='-32567' />
+ <nd ref='-32565' />
+ <nd ref='-32573' />
+ <nd ref='-32575' />
+ <nd ref='-32577' />
+ <nd ref='-32579' />
+ <nd ref='-32613' />
+ <nd ref='-32593' />
+ <nd ref='-32595' />
+ <nd ref='-32591' />
+ <nd ref='-32597' />
+ <nd ref='-32599' />
+ <nd ref='-32601' />
+ <nd ref='-32603' />
+ <nd ref='-32607' />
+ <nd ref='-32605' />
+ <nd ref='-32609' />
+ <nd ref='-32611' />
+ <nd ref='-32587' />
+ <nd ref='-32581' />
+ <nd ref='-32583' />
+ <nd ref='-32585' />
+ <nd ref='-32589' />
+ <nd ref='-32615' />
+ <nd ref='-41973' />
+ <nd ref='-39929' />
+ <nd ref='-39927' />
+ <nd ref='-41975' />
+ <nd ref='-36497' />
+ <nd ref='-41977' />
+ <nd ref='-41979' />
+ <nd ref='-40347' />
+ <nd ref='-41981' />
+ <nd ref='-34073' />
+ <nd ref='-34071' />
+ <nd ref='-40345' />
+ <nd ref='-34061' />
+ <nd ref='-34065' />
+ <nd ref='-34063' />
+ <nd ref='-34067' />
+ <nd ref='-34069' />
+ <nd ref='-41983' />
+ <nd ref='-34057' />
+ <nd ref='-34059' />
+ <nd ref='-34055' />
+ <nd ref='-40343' />
+ <nd ref='-34037' />
+ <nd ref='-34035' />
+ <nd ref='-34039' />
+ <nd ref='-34041' />
+ <nd ref='-34043' />
+ <nd ref='-34045' />
+ <nd ref='-34047' />
+ <nd ref='-34049' />
+ <nd ref='-34051' />
+ <nd ref='-34053' />
+ <nd ref='-40341' />
+ <nd ref='-34025' />
+ <nd ref='-34027' />
+ <nd ref='-34029' />
+ <nd ref='-34033' />
+ <nd ref='-34031' />
+ <nd ref='-40339' />
+ <nd ref='-33997' />
+ <nd ref='-33999' />
+ <nd ref='-34001' />
+ <nd ref='-34003' />
+ <nd ref='-34005' />
+ <nd ref='-34007' />
+ <nd ref='-34009' />
+ <nd ref='-34011' />
+ <nd ref='-34013' />
+ <nd ref='-34015' />
+ <nd ref='-34017' />
+ <nd ref='-34019' />
+ <nd ref='-34021' />
+ <nd ref='-34023' />
+ <nd ref='-40337' />
+ <nd ref='-32731' />
+ <nd ref='-32729' />
+ <nd ref='-32727' />
+ <nd ref='-32725' />
+ <nd ref='-32723' />
+ <nd ref='-32721' />
+ <nd ref='-32717' />
+ <nd ref='-32719' />
+ <nd ref='-32711' />
+ <nd ref='-32713' />
+ <nd ref='-32715' />
+ <nd ref='-32709' />
+ <nd ref='-32703' />
+ <nd ref='-32705' />
+ <nd ref='-32707' />
+ <nd ref='-32699' />
+ <nd ref='-32701' />
+ <nd ref='-32695' />
+ <nd ref='-32697' />
+ <nd ref='-32693' />
+ <nd ref='-32691' />
+ <nd ref='-32689' />
+ <nd ref='-32685' />
+ <nd ref='-32683' />
+ <nd ref='-32687' />
+ <nd ref='-32681' />
+ <nd ref='-32679' />
+ <nd ref='-32677' />
+ <nd ref='-32675' />
+ <nd ref='-32673' />
+ <nd ref='-32671' />
+ <nd ref='-32669' />
+ <nd ref='-32667' />
+ <nd ref='-32665' />
+ <nd ref='-32663' />
+ <nd ref='-32659' />
+ <nd ref='-32661' />
+ <nd ref='-32657' />
+ <nd ref='-32655' />
+ <nd ref='-32653' />
+ <nd ref='-37215' />
+ <nd ref='-32651' />
+ <nd ref='-32649' />
+ <nd ref='-32647' />
+ <nd ref='-32645' />
+ <nd ref='-32643' />
+ <nd ref='-32641' />
+ <nd ref='-32639' />
+ <nd ref='-32635' />
+ <nd ref='-32637' />
+ <nd ref='-32633' />
+ <nd ref='-32631' />
+ <nd ref='-32629' />
+ <nd ref='-39955' />
+ <tag k='ISO3166-1:alpha2' v='SI' />
+ <tag k='maxspeed:motorway' v='130' />
+ <tag k='maxspeed:rural' v='90' />
+ <tag k='maxspeed:source' v='http://ec.europa.eu/transport/road_safety/going_abroad/slovenia/speed_limits_en.htm' />
+ <tag k='maxspeed:trunk' v='110' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Slovenia' />
+ </way>
+ <way id='-57773'>
+ <nd ref='-39591' />
+ <nd ref='-39589' />
+ <nd ref='-43017' />
+ <nd ref='-53539' />
+ <nd ref='-43019' />
+ <nd ref='-43041' />
+ <nd ref='-43043' />
+ <nd ref='-40893' />
+ <nd ref='-42889' />
+ <nd ref='-43039' />
+ <nd ref='-41985' />
+ <nd ref='-41987' />
+ <nd ref='-41989' />
+ <nd ref='-41991' />
+ <nd ref='-41993' />
+ <nd ref='-39203' />
+ <nd ref='-41995' />
+ <nd ref='-43037' />
+ <nd ref='-39209' />
+ <nd ref='-43035' />
+ <nd ref='-43033' />
+ <nd ref='-43031' />
+ <nd ref='-43029' />
+ <nd ref='-41541' />
+ <nd ref='-41539' />
+ <nd ref='-35101' />
+ <nd ref='-35099' />
+ <nd ref='-35097' />
+ <nd ref='-35095' />
+ <nd ref='-35093' />
+ <nd ref='-35091' />
+ <nd ref='-35103' />
+ <nd ref='-35105' />
+ <nd ref='-35107' />
+ <nd ref='-35109' />
+ <nd ref='-35111' />
+ <nd ref='-35117' />
+ <nd ref='-35113' />
+ <nd ref='-35115' />
+ <nd ref='-41537' />
+ <nd ref='-35119' />
+ <nd ref='-35121' />
+ <nd ref='-35123' />
+ <nd ref='-35131' />
+ <nd ref='-35129' />
+ <nd ref='-35127' />
+ <nd ref='-35125' />
+ <nd ref='-41535' />
+ <nd ref='-41533' />
+ <nd ref='-41531' />
+ <nd ref='-41529' />
+ <nd ref='-41527' />
+ <nd ref='-35133' />
+ <nd ref='-35141' />
+ <nd ref='-35135' />
+ <nd ref='-35137' />
+ <nd ref='-35139' />
+ <nd ref='-35149' />
+ <nd ref='-35145' />
+ <nd ref='-35143' />
+ <nd ref='-35147' />
+ <nd ref='-35155' />
+ <nd ref='-35153' />
+ <nd ref='-35151' />
+ <nd ref='-41525' />
+ <nd ref='-35157' />
+ <nd ref='-35159' />
+ <nd ref='-35161' />
+ <nd ref='-35163' />
+ <nd ref='-35165' />
+ <nd ref='-35177' />
+ <nd ref='-35175' />
+ <nd ref='-35173' />
+ <nd ref='-35171' />
+ <nd ref='-35169' />
+ <nd ref='-35167' />
+ <nd ref='-41523' />
+ <nd ref='-39593' />
+ <nd ref='-35231' />
+ <nd ref='-35229' />
+ <nd ref='-35227' />
+ <nd ref='-35225' />
+ <nd ref='-35223' />
+ <nd ref='-35221' />
+ <nd ref='-35219' />
+ <nd ref='-35217' />
+ <nd ref='-35213' />
+ <nd ref='-35211' />
+ <nd ref='-35209' />
+ <nd ref='-35215' />
+ <nd ref='-35203' />
+ <nd ref='-35205' />
+ <nd ref='-35207' />
+ <nd ref='-35201' />
+ <nd ref='-35199' />
+ <nd ref='-35197' />
+ <nd ref='-35195' />
+ <nd ref='-35193' />
+ <nd ref='-35191' />
+ <nd ref='-35185' />
+ <nd ref='-35183' />
+ <nd ref='-35187' />
+ <nd ref='-35189' />
+ <nd ref='-35181' />
+ <nd ref='-35179' />
+ <nd ref='-39591' />
+ <tag k='ISO3166-1:alpha2' v='SE' />
+ <tag k='maxspeed:motorway' v='110' />
+ <tag k='maxspeed:rural' v='70' />
+ <tag k='maxspeed:source' v='http://ec.europa.eu/transport/road_safety/going_abroad/sweden/speed_limits_en.htm' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Sweden' />
+ </way>
+ <way id='-57775'>
+ <nd ref='-42355' />
+ <nd ref='-41279' />
+ <nd ref='-41997' />
+ <nd ref='-41277' />
+ <nd ref='-34723' />
+ <nd ref='-34721' />
+ <nd ref='-41999' />
+ <nd ref='-41275' />
+ <nd ref='-34727' />
+ <nd ref='-42001' />
+ <nd ref='-34725' />
+ <nd ref='-42003' />
+ <nd ref='-42005' />
+ <nd ref='-42365' />
+ <nd ref='-42363' />
+ <nd ref='-42361' />
+ <nd ref='-42359' />
+ <nd ref='-42357' />
+ <nd ref='-34735' />
+ <nd ref='-34729' />
+ <nd ref='-34733' />
+ <nd ref='-34731' />
+ <nd ref='-42007' />
+ <nd ref='-42355' />
+ <tag k='ISO3166-1:alpha2' v='SZ' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Swaziland' />
+ </way>
+ <way id='-57777'>
+ <nd ref='-42009' />
+ <nd ref='-47247' />
+ <nd ref='-47249' />
+ <nd ref='-47245' />
+ <nd ref='-47243' />
+ <nd ref='-40323' />
+ <nd ref='-40321' />
+ <nd ref='-40319' />
+ <nd ref='-40317' />
+ <nd ref='-40315' />
+ <nd ref='-40313' />
+ <nd ref='-40311' />
+ <nd ref='-40309' />
+ <nd ref='-40307' />
+ <nd ref='-40305' />
+ <nd ref='-47241' />
+ <nd ref='-40303' />
+ <nd ref='-40301' />
+ <nd ref='-40299' />
+ <nd ref='-40383' />
+ <nd ref='-40381' />
+ <nd ref='-33625' />
+ <nd ref='-33627' />
+ <nd ref='-33629' />
+ <nd ref='-33631' />
+ <nd ref='-33633' />
+ <nd ref='-33635' />
+ <nd ref='-40379' />
+ <nd ref='-33695' />
+ <nd ref='-33689' />
+ <nd ref='-33691' />
+ <nd ref='-33693' />
+ <nd ref='-33697' />
+ <nd ref='-33699' />
+ <nd ref='-40327' />
+ <nd ref='-33687' />
+ <nd ref='-33683' />
+ <nd ref='-33681' />
+ <nd ref='-33679' />
+ <nd ref='-33685' />
+ <nd ref='-33677' />
+ <nd ref='-33675' />
+ <nd ref='-40335' />
+ <nd ref='-40733' />
+ <nd ref='-33655' />
+ <nd ref='-42011' />
+ <nd ref='-33653' />
+ <nd ref='-42013' />
+ <nd ref='-33563' />
+ <nd ref='-33565' />
+ <nd ref='-33567' />
+ <nd ref='-33569' />
+ <nd ref='-33571' />
+ <nd ref='-33575' />
+ <nd ref='-33573' />
+ <nd ref='-33583' />
+ <nd ref='-33581' />
+ <nd ref='-33577' />
+ <nd ref='-33579' />
+ <nd ref='-33587' />
+ <nd ref='-33589' />
+ <nd ref='-33591' />
+ <nd ref='-33593' />
+ <nd ref='-33595' />
+ <nd ref='-33597' />
+ <nd ref='-33599' />
+ <nd ref='-33585' />
+ <nd ref='-33601' />
+ <nd ref='-33603' />
+ <nd ref='-33605' />
+ <nd ref='-33607' />
+ <nd ref='-33609' />
+ <nd ref='-33611' />
+ <nd ref='-33613' />
+ <nd ref='-33615' />
+ <nd ref='-33617' />
+ <nd ref='-33619' />
+ <nd ref='-33621' />
+ <nd ref='-33623' />
+ <nd ref='-42015' />
+ <nd ref='-40741' />
+ <nd ref='-40739' />
+ <nd ref='-38883' />
+ <nd ref='-42017' />
+ <nd ref='-42019' />
+ <nd ref='-36333' />
+ <nd ref='-42021' />
+ <nd ref='-47287' />
+ <nd ref='-47289' />
+ <nd ref='-47291' />
+ <nd ref='-47293' />
+ <nd ref='-47295' />
+ <nd ref='-47297' />
+ <nd ref='-47299' />
+ <nd ref='-47301' />
+ <nd ref='-47303' />
+ <nd ref='-47305' />
+ <nd ref='-47307' />
+ <nd ref='-47309' />
+ <nd ref='-47311' />
+ <nd ref='-47285' />
+ <nd ref='-42023' />
+ <nd ref='-47279' />
+ <nd ref='-47281' />
+ <nd ref='-47283' />
+ <nd ref='-42025' />
+ <nd ref='-47277' />
+ <nd ref='-47275' />
+ <nd ref='-47265' />
+ <nd ref='-47267' />
+ <nd ref='-47269' />
+ <nd ref='-47271' />
+ <nd ref='-47273' />
+ <nd ref='-42027' />
+ <nd ref='-42029' />
+ <nd ref='-47263' />
+ <nd ref='-47261' />
+ <nd ref='-47259' />
+ <nd ref='-47257' />
+ <nd ref='-47255' />
+ <nd ref='-42031' />
+ <nd ref='-47251' />
+ <nd ref='-47253' />
+ <nd ref='-42033' />
+ <nd ref='-42035' />
+ <nd ref='-42037' />
+ <nd ref='-42039' />
+ <nd ref='-42041' />
+ <nd ref='-42043' />
+ <nd ref='-42045' />
+ <nd ref='-42047' />
+ <nd ref='-42049' />
+ <nd ref='-42051' />
+ <nd ref='-42053' />
+ <nd ref='-42055' />
+ <nd ref='-42057' />
+ <nd ref='-42059' />
+ <nd ref='-42061' />
+ <nd ref='-42063' />
+ <nd ref='-42065' />
+ <nd ref='-42067' />
+ <nd ref='-42069' />
+ <nd ref='-42071' />
+ <nd ref='-42073' />
+ <nd ref='-42075' />
+ <nd ref='-42077' />
+ <nd ref='-42079' />
+ <nd ref='-42009' />
+ <tag k='ISO3166-1:alpha2' v='SY' />
+ <tag k='name:en' v='Syrian Arab Republic' />
+ </way>
+ <way id='-57779'>
+ <nd ref='-41849' />
+ <nd ref='-41847' />
+ <nd ref='-48843' />
+ <nd ref='-48841' />
+ <nd ref='-48831' />
+ <nd ref='-48839' />
+ <nd ref='-48837' />
+ <nd ref='-48835' />
+ <nd ref='-48833' />
+ <nd ref='-48829' />
+ <nd ref='-48821' />
+ <nd ref='-48823' />
+ <nd ref='-48825' />
+ <nd ref='-48827' />
+ <nd ref='-48815' />
+ <nd ref='-48819' />
+ <nd ref='-48817' />
+ <nd ref='-48783' />
+ <nd ref='-48811' />
+ <nd ref='-48813' />
+ <nd ref='-48809' />
+ <nd ref='-48801' />
+ <nd ref='-48803' />
+ <nd ref='-48807' />
+ <nd ref='-48805' />
+ <nd ref='-48785' />
+ <nd ref='-48791' />
+ <nd ref='-48789' />
+ <nd ref='-48795' />
+ <nd ref='-48793' />
+ <nd ref='-48787' />
+ <nd ref='-48797' />
+ <nd ref='-48799' />
+ <nd ref='-48779' />
+ <nd ref='-48781' />
+ <nd ref='-38003' />
+ <nd ref='-49105' />
+ <nd ref='-49107' />
+ <nd ref='-49109' />
+ <nd ref='-49115' />
+ <nd ref='-49113' />
+ <nd ref='-49111' />
+ <nd ref='-49103' />
+ <nd ref='-49119' />
+ <nd ref='-49117' />
+ <nd ref='-49121' />
+ <nd ref='-49101' />
+ <nd ref='-49131' />
+ <nd ref='-49133' />
+ <nd ref='-49139' />
+ <nd ref='-49137' />
+ <nd ref='-49135' />
+ <nd ref='-49129' />
+ <nd ref='-49127' />
+ <nd ref='-49125' />
+ <nd ref='-49123' />
+ <nd ref='-49141' />
+ <nd ref='-49145' />
+ <nd ref='-49149' />
+ <nd ref='-49147' />
+ <nd ref='-49143' />
+ <nd ref='-49151' />
+ <nd ref='-49153' />
+ <nd ref='-49157' />
+ <nd ref='-49155' />
+ <nd ref='-38013' />
+ <nd ref='-38781' />
+ <nd ref='-38779' />
+ <nd ref='-30635' />
+ <nd ref='-38777' />
+ <nd ref='-30637' />
+ <nd ref='-30639' />
+ <nd ref='-38775' />
+ <nd ref='-30641' />
+ <nd ref='-38773' />
+ <nd ref='-30643' />
+ <nd ref='-38771' />
+ <nd ref='-38769' />
+ <nd ref='-38767' />
+ <nd ref='-30653' />
+ <nd ref='-30651' />
+ <nd ref='-30647' />
+ <nd ref='-30645' />
+ <nd ref='-30649' />
+ <nd ref='-38765' />
+ <nd ref='-38763' />
+ <nd ref='-30655' />
+ <nd ref='-30657' />
+ <nd ref='-30659' />
+ <nd ref='-30663' />
+ <nd ref='-30661' />
+ <nd ref='-38761' />
+ <nd ref='-30665' />
+ <nd ref='-30669' />
+ <nd ref='-30667' />
+ <nd ref='-30671' />
+ <nd ref='-30673' />
+ <nd ref='-30675' />
+ <nd ref='-38759' />
+ <nd ref='-30677' />
+ <nd ref='-30679' />
+ <nd ref='-30681' />
+ <nd ref='-30683' />
+ <nd ref='-30685' />
+ <nd ref='-38757' />
+ <nd ref='-38755' />
+ <nd ref='-30689' />
+ <nd ref='-30687' />
+ <nd ref='-38797' />
+ <nd ref='-38795' />
+ <nd ref='-41477' />
+ <nd ref='-41453' />
+ <nd ref='-31787' />
+ <nd ref='-31781' />
+ <nd ref='-31779' />
+ <nd ref='-31783' />
+ <nd ref='-31785' />
+ <nd ref='-41451' />
+ <nd ref='-41449' />
+ <nd ref='-41447' />
+ <nd ref='-41445' />
+ <nd ref='-41443' />
+ <nd ref='-41441' />
+ <nd ref='-41439' />
+ <nd ref='-41437' />
+ <nd ref='-41435' />
+ <nd ref='-41433' />
+ <nd ref='-31777' />
+ <nd ref='-41431' />
+ <nd ref='-41429' />
+ <nd ref='-41427' />
+ <nd ref='-41425' />
+ <nd ref='-40755' />
+ <nd ref='-40753' />
+ <nd ref='-41849' />
+ <tag k='ISO3166-1:alpha2' v='TD' />
+ <tag k='name:en' v='Chad' />
+ </way>
+ <way id='-57781'>
+ <nd ref='-37637' />
+ <nd ref='-48111' />
+ <nd ref='-48113' />
+ <nd ref='-37635' />
+ <nd ref='-37633' />
+ <nd ref='-37619' />
+ <nd ref='-48123' />
+ <nd ref='-48121' />
+ <nd ref='-48119' />
+ <nd ref='-48117' />
+ <nd ref='-48125' />
+ <nd ref='-48127' />
+ <nd ref='-48129' />
+ <nd ref='-48131' />
+ <nd ref='-48115' />
+ <nd ref='-48133' />
+ <nd ref='-48135' />
+ <nd ref='-48139' />
+ <nd ref='-48137' />
+ <nd ref='-48141' />
+ <nd ref='-37617' />
+ <nd ref='-37615' />
+ <nd ref='-37613' />
+ <nd ref='-39799' />
+ <nd ref='-42903' />
+ <nd ref='-39797' />
+ <nd ref='-48005' />
+ <nd ref='-48009' />
+ <nd ref='-48007' />
+ <nd ref='-48003' />
+ <nd ref='-48001' />
+ <nd ref='-48013' />
+ <nd ref='-48011' />
+ <nd ref='-48017' />
+ <nd ref='-48015' />
+ <nd ref='-48019' />
+ <nd ref='-48023' />
+ <nd ref='-48021' />
+ <nd ref='-47993' />
+ <nd ref='-47999' />
+ <nd ref='-47995' />
+ <nd ref='-47997' />
+ <nd ref='-47991' />
+ <nd ref='-48025' />
+ <nd ref='-48029' />
+ <nd ref='-48027' />
+ <nd ref='-48031' />
+ <nd ref='-48033' />
+ <nd ref='-48035' />
+ <nd ref='-48039' />
+ <nd ref='-48041' />
+ <nd ref='-48043' />
+ <nd ref='-48037' />
+ <nd ref='-47989' />
+ <nd ref='-48049' />
+ <nd ref='-48051' />
+ <nd ref='-48047' />
+ <nd ref='-48053' />
+ <nd ref='-48055' />
+ <nd ref='-48045' />
+ <nd ref='-48061' />
+ <nd ref='-48063' />
+ <nd ref='-48067' />
+ <nd ref='-48065' />
+ <nd ref='-48059' />
+ <nd ref='-48097' />
+ <nd ref='-48099' />
+ <nd ref='-48101' />
+ <nd ref='-48095' />
+ <nd ref='-48093' />
+ <nd ref='-48091' />
+ <nd ref='-48089' />
+ <nd ref='-48087' />
+ <nd ref='-48085' />
+ <nd ref='-48083' />
+ <nd ref='-48081' />
+ <nd ref='-48079' />
+ <nd ref='-48069' />
+ <nd ref='-48071' />
+ <nd ref='-48073' />
+ <nd ref='-48075' />
+ <nd ref='-48077' />
+ <nd ref='-48057' />
+ <nd ref='-48107' />
+ <nd ref='-48105' />
+ <nd ref='-48109' />
+ <nd ref='-48103' />
+ <nd ref='-47987' />
+ <nd ref='-39795' />
+ <nd ref='-39793' />
+ <nd ref='-39791' />
+ <nd ref='-39789' />
+ <nd ref='-39787' />
+ <nd ref='-39785' />
+ <nd ref='-39783' />
+ <nd ref='-39781' />
+ <nd ref='-39779' />
+ <nd ref='-47985' />
+ <nd ref='-39777' />
+ <nd ref='-39775' />
+ <nd ref='-39773' />
+ <nd ref='-39771' />
+ <nd ref='-39769' />
+ <nd ref='-37637' />
+ <tag k='ISO3166-1:alpha2' v='TG' />
+ <tag k='name:en' v='Togo' />
+ </way>
+ <way id='-57783'>
+ <nd ref='-40727' />
+ <nd ref='-49441' />
+ <nd ref='-49443' />
+ <nd ref='-49445' />
+ <nd ref='-49447' />
+ <nd ref='-49449' />
+ <nd ref='-49429' />
+ <nd ref='-49431' />
+ <nd ref='-49433' />
+ <nd ref='-49435' />
+ <nd ref='-49439' />
+ <nd ref='-49437' />
+ <nd ref='-49413' />
+ <nd ref='-49415' />
+ <nd ref='-49417' />
+ <nd ref='-49423' />
+ <nd ref='-49427' />
+ <nd ref='-49425' />
+ <nd ref='-49421' />
+ <nd ref='-49419' />
+ <nd ref='-49373' />
+ <nd ref='-49391' />
+ <nd ref='-49389' />
+ <nd ref='-49387' />
+ <nd ref='-49385' />
+ <nd ref='-49393' />
+ <nd ref='-49395' />
+ <nd ref='-49397' />
+ <nd ref='-49405' />
+ <nd ref='-49407' />
+ <nd ref='-49403' />
+ <nd ref='-49401' />
+ <nd ref='-49409' />
+ <nd ref='-49411' />
+ <nd ref='-49399' />
+ <nd ref='-49383' />
+ <nd ref='-49375' />
+ <nd ref='-49377' />
+ <nd ref='-49379' />
+ <nd ref='-49381' />
+ <nd ref='-49331' />
+ <nd ref='-49343' />
+ <nd ref='-49339' />
+ <nd ref='-49341' />
+ <nd ref='-49337' />
+ <nd ref='-49345' />
+ <nd ref='-49335' />
+ <nd ref='-49333' />
+ <nd ref='-49351' />
+ <nd ref='-49349' />
+ <nd ref='-49347' />
+ <nd ref='-49355' />
+ <nd ref='-49357' />
+ <nd ref='-49359' />
+ <nd ref='-49361' />
+ <nd ref='-49353' />
+ <nd ref='-49365' />
+ <nd ref='-49363' />
+ <nd ref='-49367' />
+ <nd ref='-49369' />
+ <nd ref='-49329' />
+ <nd ref='-49371' />
+ <nd ref='-40687' />
+ <nd ref='-32801' />
+ <nd ref='-32799' />
+ <nd ref='-32803' />
+ <nd ref='-32805' />
+ <nd ref='-32807' />
+ <nd ref='-32809' />
+ <nd ref='-32811' />
+ <nd ref='-32813' />
+ <nd ref='-32815' />
+ <nd ref='-32817' />
+ <nd ref='-32827' />
+ <nd ref='-32819' />
+ <nd ref='-32821' />
+ <nd ref='-32823' />
+ <nd ref='-32825' />
+ <nd ref='-32839' />
+ <nd ref='-32829' />
+ <nd ref='-32831' />
+ <nd ref='-32833' />
+ <nd ref='-32835' />
+ <nd ref='-32837' />
+ <nd ref='-32841' />
+ <nd ref='-32877' />
+ <nd ref='-32863' />
+ <nd ref='-32865' />
+ <nd ref='-32867' />
+ <nd ref='-32869' />
+ <nd ref='-32871' />
+ <nd ref='-32873' />
+ <nd ref='-32875' />
+ <nd ref='-32861' />
+ <nd ref='-32859' />
+ <nd ref='-32857' />
+ <nd ref='-32851' />
+ <nd ref='-32853' />
+ <nd ref='-32855' />
+ <nd ref='-32849' />
+ <nd ref='-32847' />
+ <nd ref='-32845' />
+ <nd ref='-32843' />
+ <nd ref='-40685' />
+ <nd ref='-40683' />
+ <nd ref='-42989' />
+ <nd ref='-42081' />
+ <nd ref='-41385' />
+ <nd ref='-43567' />
+ <nd ref='-43569' />
+ <nd ref='-43571' />
+ <nd ref='-43575' />
+ <nd ref='-43573' />
+ <nd ref='-43565' />
+ <nd ref='-43563' />
+ <nd ref='-43561' />
+ <nd ref='-43559' />
+ <nd ref='-41383' />
+ <nd ref='-43529' />
+ <nd ref='-43531' />
+ <nd ref='-43533' />
+ <nd ref='-43535' />
+ <nd ref='-43537' />
+ <nd ref='-43539' />
+ <nd ref='-43541' />
+ <nd ref='-43543' />
+ <nd ref='-43545' />
+ <nd ref='-43547' />
+ <nd ref='-43549' />
+ <nd ref='-43551' />
+ <nd ref='-43553' />
+ <nd ref='-43557' />
+ <nd ref='-43555' />
+ <nd ref='-41401' />
+ <nd ref='-43007' />
+ <nd ref='-42083' />
+ <nd ref='-42085' />
+ <nd ref='-41399' />
+ <nd ref='-42087' />
+ <nd ref='-42921' />
+ <nd ref='-42919' />
+ <nd ref='-42917' />
+ <nd ref='-43011' />
+ <nd ref='-43009' />
+ <nd ref='-42915' />
+ <nd ref='-50191' />
+ <nd ref='-50193' />
+ <nd ref='-50195' />
+ <nd ref='-50197' />
+ <nd ref='-50199' />
+ <nd ref='-50201' />
+ <nd ref='-41179' />
+ <nd ref='-50207' />
+ <nd ref='-50205' />
+ <nd ref='-50203' />
+ <nd ref='-41177' />
+ <nd ref='-50209' />
+ <nd ref='-41175' />
+ <nd ref='-50213' />
+ <nd ref='-50211' />
+ <nd ref='-50219' />
+ <nd ref='-50217' />
+ <nd ref='-50215' />
+ <nd ref='-41173' />
+ <nd ref='-50221' />
+ <nd ref='-41171' />
+ <nd ref='-50223' />
+ <nd ref='-50225' />
+ <nd ref='-50227' />
+ <nd ref='-41169' />
+ <nd ref='-41167' />
+ <nd ref='-41165' />
+ <nd ref='-41163' />
+ <nd ref='-41161' />
+ <nd ref='-41159' />
+ <nd ref='-50231' />
+ <nd ref='-50229' />
+ <nd ref='-50233' />
+ <nd ref='-41157' />
+ <nd ref='-41155' />
+ <nd ref='-41153' />
+ <nd ref='-50235' />
+ <nd ref='-41151' />
+ <nd ref='-41149' />
+ <nd ref='-50237' />
+ <nd ref='-50245' />
+ <nd ref='-41147' />
+ <nd ref='-50243' />
+ <nd ref='-50241' />
+ <nd ref='-50239' />
+ <nd ref='-50247' />
+ <nd ref='-50251' />
+ <nd ref='-50253' />
+ <nd ref='-50249' />
+ <nd ref='-50255' />
+ <nd ref='-41145' />
+ <nd ref='-50263' />
+ <nd ref='-50261' />
+ <nd ref='-50259' />
+ <nd ref='-50257' />
+ <nd ref='-41143' />
+ <nd ref='-50265' />
+ <nd ref='-41141' />
+ <nd ref='-50267' />
+ <nd ref='-50269' />
+ <nd ref='-41139' />
+ <nd ref='-41137' />
+ <nd ref='-50275' />
+ <nd ref='-50273' />
+ <nd ref='-50271' />
+ <nd ref='-41135' />
+ <nd ref='-50279' />
+ <nd ref='-50277' />
+ <nd ref='-41133' />
+ <nd ref='-41131' />
+ <nd ref='-41129' />
+ <nd ref='-41127' />
+ <nd ref='-50281' />
+ <nd ref='-50283' />
+ <nd ref='-41125' />
+ <nd ref='-41123' />
+ <nd ref='-41121' />
+ <nd ref='-41119' />
+ <nd ref='-50285' />
+ <nd ref='-50287' />
+ <nd ref='-41117' />
+ <nd ref='-41115' />
+ <nd ref='-50291' />
+ <nd ref='-50289' />
+ <nd ref='-50293' />
+ <nd ref='-41113' />
+ <nd ref='-50295' />
+ <nd ref='-41111' />
+ <nd ref='-50297' />
+ <nd ref='-50299' />
+ <nd ref='-41109' />
+ <nd ref='-50301' />
+ <nd ref='-50303' />
+ <nd ref='-50305' />
+ <nd ref='-50307' />
+ <nd ref='-50309' />
+ <nd ref='-50311' />
+ <nd ref='-50313' />
+ <nd ref='-50315' />
+ <nd ref='-40727' />
+ <tag k='ISO3166-1:alpha2' v='TH' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Thailand' />
+ </way>
+ <way id='-57785'>
+ <nd ref='-52267' />
+ <nd ref='-40669' />
+ <nd ref='-42089' />
+ <nd ref='-52267' />
+ </way>
+ <way id='-57787'>
+ <nd ref='-42091' />
+ <nd ref='-52069' />
+ <nd ref='-42093' />
+ <nd ref='-42095' />
+ <nd ref='-42097' />
+ <nd ref='-52071' />
+ <nd ref='-42091' />
+ </way>
+ <way id='-57789'>
+ <nd ref='-42161' />
+ <nd ref='-42099' />
+ <nd ref='-52067' />
+ <nd ref='-42101' />
+ <nd ref='-52065' />
+ <nd ref='-52063' />
+ <nd ref='-42103' />
+ <nd ref='-42105' />
+ <nd ref='-42107' />
+ <nd ref='-42321' />
+ <nd ref='-52061' />
+ <nd ref='-42109' />
+ <nd ref='-40651' />
+ <nd ref='-40649' />
+ <nd ref='-42111' />
+ <nd ref='-42113' />
+ <nd ref='-42115' />
+ <nd ref='-40647' />
+ <nd ref='-52135' />
+ <nd ref='-52133' />
+ <nd ref='-40645' />
+ <nd ref='-40643' />
+ <nd ref='-42117' />
+ <nd ref='-52137' />
+ <nd ref='-42119' />
+ <nd ref='-40641' />
+ <nd ref='-42121' />
+ <nd ref='-52139' />
+ <nd ref='-52145' />
+ <nd ref='-52147' />
+ <nd ref='-52141' />
+ <nd ref='-52143' />
+ <nd ref='-42123' />
+ <nd ref='-52149' />
+ <nd ref='-52151' />
+ <nd ref='-52153' />
+ <nd ref='-52161' />
+ <nd ref='-52155' />
+ <nd ref='-52157' />
+ <nd ref='-52159' />
+ <nd ref='-40639' />
+ <nd ref='-52163' />
+ <nd ref='-52173' />
+ <nd ref='-52171' />
+ <nd ref='-52169' />
+ <nd ref='-52167' />
+ <nd ref='-52165' />
+ <nd ref='-52175' />
+ <nd ref='-52179' />
+ <nd ref='-52177' />
+ <nd ref='-52181' />
+ <nd ref='-40637' />
+ <nd ref='-42125' />
+ <nd ref='-52183' />
+ <nd ref='-52185' />
+ <nd ref='-52187' />
+ <nd ref='-38545' />
+ <nd ref='-52191' />
+ <nd ref='-52189' />
+ <nd ref='-52193' />
+ <nd ref='-52195' />
+ <nd ref='-38543' />
+ <nd ref='-52443' />
+ <nd ref='-52441' />
+ <nd ref='-52439' />
+ <nd ref='-52437' />
+ <nd ref='-52435' />
+ <nd ref='-52433' />
+ <nd ref='-38541' />
+ <nd ref='-52445' />
+ <nd ref='-52447' />
+ <nd ref='-52449' />
+ <nd ref='-52451' />
+ <nd ref='-52453' />
+ <nd ref='-52455' />
+ <nd ref='-52457' />
+ <nd ref='-38539' />
+ <nd ref='-52459' />
+ <nd ref='-52467' />
+ <nd ref='-52465' />
+ <nd ref='-52469' />
+ <nd ref='-52461' />
+ <nd ref='-52463' />
+ <nd ref='-38537' />
+ <nd ref='-52483' />
+ <nd ref='-52485' />
+ <nd ref='-52487' />
+ <nd ref='-52481' />
+ <nd ref='-52475' />
+ <nd ref='-52477' />
+ <nd ref='-52479' />
+ <nd ref='-52471' />
+ <nd ref='-52473' />
+ <nd ref='-38535' />
+ <nd ref='-52489' />
+ <nd ref='-52491' />
+ <nd ref='-52493' />
+ <nd ref='-52499' />
+ <nd ref='-52497' />
+ <nd ref='-52495' />
+ <nd ref='-36905' />
+ <nd ref='-36903' />
+ <nd ref='-52509' />
+ <nd ref='-52507' />
+ <nd ref='-52505' />
+ <nd ref='-52503' />
+ <nd ref='-52501' />
+ <nd ref='-42127' />
+ <nd ref='-52513' />
+ <nd ref='-52511' />
+ <nd ref='-42129' />
+ <nd ref='-52515' />
+ <nd ref='-42131' />
+ <nd ref='-52519' />
+ <nd ref='-52517' />
+ <nd ref='-42133' />
+ <nd ref='-52521' />
+ <nd ref='-52523' />
+ <nd ref='-36901' />
+ <nd ref='-52531' />
+ <nd ref='-52529' />
+ <nd ref='-52527' />
+ <nd ref='-52525' />
+ <nd ref='-42135' />
+ <nd ref='-36899' />
+ <nd ref='-52545' />
+ <nd ref='-52543' />
+ <nd ref='-52533' />
+ <nd ref='-52541' />
+ <nd ref='-52539' />
+ <nd ref='-52537' />
+ <nd ref='-52535' />
+ <nd ref='-36957' />
+ <nd ref='-52547' />
+ <nd ref='-42137' />
+ <nd ref='-52549' />
+ <nd ref='-52551' />
+ <nd ref='-52553' />
+ <nd ref='-36955' />
+ <nd ref='-52565' />
+ <nd ref='-52569' />
+ <nd ref='-52567' />
+ <nd ref='-52563' />
+ <nd ref='-52561' />
+ <nd ref='-52559' />
+ <nd ref='-52557' />
+ <nd ref='-52555' />
+ <nd ref='-42139' />
+ <nd ref='-52573' />
+ <nd ref='-52577' />
+ <nd ref='-52585' />
+ <nd ref='-52583' />
+ <nd ref='-52581' />
+ <nd ref='-52579' />
+ <nd ref='-52575' />
+ <nd ref='-52571' />
+ <nd ref='-52589' />
+ <nd ref='-52595' />
+ <nd ref='-52591' />
+ <nd ref='-52593' />
+ <nd ref='-52587' />
+ <nd ref='-42141' />
+ <nd ref='-52599' />
+ <nd ref='-52597' />
+ <nd ref='-36953' />
+ <nd ref='-42143' />
+ <nd ref='-52247' />
+ <nd ref='-42145' />
+ <nd ref='-52241' />
+ <nd ref='-52243' />
+ <nd ref='-52245' />
+ <nd ref='-42147' />
+ <nd ref='-52231' />
+ <nd ref='-52233' />
+ <nd ref='-52235' />
+ <nd ref='-52237' />
+ <nd ref='-52239' />
+ <nd ref='-42149' />
+ <nd ref='-52229' />
+ <nd ref='-42151' />
+ <nd ref='-42153' />
+ <nd ref='-52227' />
+ <nd ref='-52207' />
+ <nd ref='-52209' />
+ <nd ref='-52211' />
+ <nd ref='-52215' />
+ <nd ref='-52213' />
+ <nd ref='-52217' />
+ <nd ref='-52219' />
+ <nd ref='-52221' />
+ <nd ref='-52223' />
+ <nd ref='-52225' />
+ <nd ref='-42155' />
+ <nd ref='-52131' />
+ <nd ref='-52103' />
+ <nd ref='-52127' />
+ <nd ref='-52129' />
+ <nd ref='-52121' />
+ <nd ref='-52123' />
+ <nd ref='-52125' />
+ <nd ref='-52119' />
+ <nd ref='-52117' />
+ <nd ref='-52115' />
+ <nd ref='-52105' />
+ <nd ref='-52107' />
+ <nd ref='-52109' />
+ <nd ref='-52111' />
+ <nd ref='-52113' />
+ <nd ref='-52089' />
+ <nd ref='-52087' />
+ <nd ref='-52095' />
+ <nd ref='-52093' />
+ <nd ref='-52091' />
+ <nd ref='-52097' />
+ <nd ref='-52101' />
+ <nd ref='-52099' />
+ <nd ref='-52085' />
+ <nd ref='-42157' />
+ <nd ref='-52077' />
+ <nd ref='-52079' />
+ <nd ref='-52081' />
+ <nd ref='-52083' />
+ <nd ref='-42159' />
+ <nd ref='-52073' />
+ <nd ref='-52075' />
+ <nd ref='-42161' />
+ </way>
+ <way id='-57791'>
+ <nd ref='-42163' />
+ <nd ref='-51839' />
+ <nd ref='-51841' />
+ <nd ref='-51843' />
+ <nd ref='-51845' />
+ <nd ref='-51847' />
+ <nd ref='-51849' />
+ <nd ref='-51851' />
+ <nd ref='-51853' />
+ <nd ref='-51855' />
+ <nd ref='-51857' />
+ <nd ref='-42165' />
+ <nd ref='-51859' />
+ <nd ref='-42167' />
+ <nd ref='-51861' />
+ <nd ref='-51863' />
+ <nd ref='-51865' />
+ <nd ref='-51867' />
+ <nd ref='-51869' />
+ <nd ref='-51877' />
+ <nd ref='-51875' />
+ <nd ref='-51873' />
+ <nd ref='-51871' />
+ <nd ref='-42169' />
+ <nd ref='-36951' />
+ <nd ref='-51945' />
+ <nd ref='-51947' />
+ <nd ref='-42171' />
+ <nd ref='-51941' />
+ <nd ref='-51939' />
+ <nd ref='-51943' />
+ <nd ref='-36949' />
+ <nd ref='-51933' />
+ <nd ref='-51931' />
+ <nd ref='-51935' />
+ <nd ref='-51937' />
+ <nd ref='-51929' />
+ <nd ref='-51891' />
+ <nd ref='-51889' />
+ <nd ref='-51887' />
+ <nd ref='-51885' />
+ <nd ref='-51883' />
+ <nd ref='-51881' />
+ <nd ref='-51879' />
+ <nd ref='-51927' />
+ <nd ref='-51921' />
+ <nd ref='-51923' />
+ <nd ref='-51925' />
+ <nd ref='-51917' />
+ <nd ref='-51919' />
+ <nd ref='-51915' />
+ <nd ref='-51913' />
+ <nd ref='-51911' />
+ <nd ref='-51909' />
+ <nd ref='-51907' />
+ <nd ref='-51905' />
+ <nd ref='-51903' />
+ <nd ref='-51901' />
+ <nd ref='-51899' />
+ <nd ref='-51895' />
+ <nd ref='-51897' />
+ <nd ref='-51893' />
+ <nd ref='-36947' />
+ <nd ref='-50125' />
+ <nd ref='-50127' />
+ <nd ref='-50123' />
+ <nd ref='-50119' />
+ <nd ref='-50121' />
+ <nd ref='-50129' />
+ <nd ref='-50131' />
+ <nd ref='-40219' />
+ <nd ref='-40217' />
+ <nd ref='-40215' />
+ <nd ref='-50139' />
+ <nd ref='-50135' />
+ <nd ref='-50137' />
+ <nd ref='-50133' />
+ <nd ref='-40213' />
+ <nd ref='-50145' />
+ <nd ref='-50149' />
+ <nd ref='-50147' />
+ <nd ref='-50143' />
+ <nd ref='-50141' />
+ <nd ref='-50151' />
+ <nd ref='-40211' />
+ <nd ref='-40209' />
+ <nd ref='-50153' />
+ <nd ref='-40207' />
+ <nd ref='-50161' />
+ <nd ref='-50165' />
+ <nd ref='-50163' />
+ <nd ref='-50169' />
+ <nd ref='-50167' />
+ <nd ref='-50159' />
+ <nd ref='-50157' />
+ <nd ref='-50155' />
+ <nd ref='-50175' />
+ <nd ref='-50173' />
+ <nd ref='-50171' />
+ <nd ref='-40205' />
+ <nd ref='-50179' />
+ <nd ref='-50181' />
+ <nd ref='-50183' />
+ <nd ref='-50185' />
+ <nd ref='-50177' />
+ <nd ref='-40203' />
+ <nd ref='-50187' />
+ <nd ref='-50189' />
+ <nd ref='-40201' />
+ <nd ref='-40199' />
+ <nd ref='-42173' />
+ <nd ref='-40543' />
+ <nd ref='-40541' />
+ <nd ref='-45701' />
+ <nd ref='-45703' />
+ <nd ref='-45705' />
+ <nd ref='-45707' />
+ <nd ref='-40539' />
+ <nd ref='-42175' />
+ <nd ref='-51777' />
+ <nd ref='-51775' />
+ <nd ref='-51773' />
+ <nd ref='-51781' />
+ <nd ref='-51785' />
+ <nd ref='-51783' />
+ <nd ref='-51779' />
+ <nd ref='-51813' />
+ <nd ref='-51815' />
+ <nd ref='-51811' />
+ <nd ref='-51795' />
+ <nd ref='-51793' />
+ <nd ref='-51787' />
+ <nd ref='-51789' />
+ <nd ref='-51791' />
+ <nd ref='-51797' />
+ <nd ref='-51799' />
+ <nd ref='-51801' />
+ <nd ref='-51803' />
+ <nd ref='-51805' />
+ <nd ref='-51807' />
+ <nd ref='-51809' />
+ <nd ref='-51817' />
+ <nd ref='-51819' />
+ <nd ref='-51833' />
+ <nd ref='-51831' />
+ <nd ref='-51829' />
+ <nd ref='-51827' />
+ <nd ref='-51825' />
+ <nd ref='-51823' />
+ <nd ref='-51821' />
+ <nd ref='-51835' />
+ <nd ref='-51837' />
+ <nd ref='-42163' />
+ <tag k='ISO3166-1:alpha2' v='TM' />
+ <tag k='name:en' v='Turkmenistan' />
+ </way>
+ <way id='-57793'>
+ <nd ref='-39967' />
+ <nd ref='-43091' />
+ <nd ref='-43093' />
+ <nd ref='-43095' />
+ <nd ref='-39965' />
+ <nd ref='-43097' />
+ <nd ref='-43103' />
+ <nd ref='-43101' />
+ <nd ref='-43099' />
+ <nd ref='-39963' />
+ <nd ref='-42177' />
+ <nd ref='-43105' />
+ <nd ref='-43107' />
+ <nd ref='-42181' />
+ <nd ref='-42183' />
+ <nd ref='-42185' />
+ <nd ref='-42187' />
+ <nd ref='-43081' />
+ <nd ref='-42179' />
+ <nd ref='-42483' />
+ <nd ref='-43109' />
+ <nd ref='-39961' />
+ <nd ref='-43083' />
+ <nd ref='-43085' />
+ <nd ref='-43089' />
+ <nd ref='-43087' />
+ <nd ref='-39971' />
+ <nd ref='-39969' />
+ <nd ref='-39967' />
+ <tag k='ISO3166-1:alpha2' v='TL' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Timor-Leste' />
+ </way>
+ <way id='-57795'>
+ <nd ref='-42189' />
+ <nd ref='-36475' />
+ <nd ref='-42191' />
+ <nd ref='-42193' />
+ <nd ref='-40769' />
+ <nd ref='-42195' />
+ <nd ref='-34103' />
+ <nd ref='-34105' />
+ <nd ref='-34107' />
+ <nd ref='-34109' />
+ <nd ref='-34111' />
+ <nd ref='-34113' />
+ <nd ref='-34115' />
+ <nd ref='-42197' />
+ <nd ref='-40767' />
+ <nd ref='-40765' />
+ <nd ref='-40763' />
+ <nd ref='-40761' />
+ <nd ref='-42199' />
+ <nd ref='-42201' />
+ <nd ref='-39233' />
+ <nd ref='-39231' />
+ <nd ref='-34121' />
+ <nd ref='-34117' />
+ <nd ref='-34119' />
+ <nd ref='-42203' />
+ <nd ref='-34123' />
+ <nd ref='-39229' />
+ <nd ref='-42205' />
+ <nd ref='-42207' />
+ <nd ref='-34125' />
+ <nd ref='-42209' />
+ <nd ref='-39227' />
+ <nd ref='-34133' />
+ <nd ref='-34131' />
+ <nd ref='-34127' />
+ <nd ref='-34129' />
+ <nd ref='-42211' />
+ <nd ref='-39225' />
+ <nd ref='-34135' />
+ <nd ref='-34137' />
+ <nd ref='-39223' />
+ <nd ref='-34139' />
+ <nd ref='-34143' />
+ <nd ref='-34141' />
+ <nd ref='-34155' />
+ <nd ref='-34153' />
+ <nd ref='-34151' />
+ <nd ref='-34149' />
+ <nd ref='-34145' />
+ <nd ref='-34147' />
+ <nd ref='-42213' />
+ <nd ref='-42215' />
+ <nd ref='-36473' />
+ <nd ref='-42189' />
+ <tag k='ISO3166-1:alpha2' v='TN' />
+ <tag k='name:en' v='Tunisia' />
+ </way>
+ <way id='-57797'>
+ <nd ref='-39767' />
+ <nd ref='-31775' />
+ <nd ref='-31773' />
+ <nd ref='-31771' />
+ <nd ref='-39765' />
+ <nd ref='-31769' />
+ <nd ref='-31767' />
+ <nd ref='-31765' />
+ <nd ref='-31763' />
+ <nd ref='-31759' />
+ <nd ref='-31757' />
+ <nd ref='-31761' />
+ <nd ref='-31755' />
+ <nd ref='-31751' />
+ <nd ref='-31753' />
+ <nd ref='-31749' />
+ <nd ref='-31747' />
+ <nd ref='-37161' />
+ <nd ref='-47715' />
+ <nd ref='-47713' />
+ <nd ref='-47719' />
+ <nd ref='-47711' />
+ <nd ref='-47721' />
+ <nd ref='-47723' />
+ <nd ref='-47709' />
+ <nd ref='-47717' />
+ <nd ref='-47699' />
+ <nd ref='-47701' />
+ <nd ref='-47703' />
+ <nd ref='-47705' />
+ <nd ref='-47707' />
+ <nd ref='-47697' />
+ <nd ref='-47695' />
+ <nd ref='-37159' />
+ <nd ref='-47693' />
+ <nd ref='-37157' />
+ <nd ref='-47725' />
+ <nd ref='-37263' />
+ <nd ref='-31669' />
+ <nd ref='-31671' />
+ <nd ref='-31673' />
+ <nd ref='-40271' />
+ <nd ref='-31661' />
+ <nd ref='-31663' />
+ <nd ref='-31665' />
+ <nd ref='-31655' />
+ <nd ref='-31659' />
+ <nd ref='-31657' />
+ <nd ref='-31667' />
+ <nd ref='-40269' />
+ <nd ref='-31641' />
+ <nd ref='-31639' />
+ <nd ref='-31643' />
+ <nd ref='-31637' />
+ <nd ref='-31645' />
+ <nd ref='-31647' />
+ <nd ref='-31649' />
+ <nd ref='-31631' />
+ <nd ref='-31633' />
+ <nd ref='-31651' />
+ <nd ref='-31635' />
+ <nd ref='-31653' />
+ <nd ref='-31623' />
+ <nd ref='-31627' />
+ <nd ref='-31625' />
+ <nd ref='-31629' />
+ <nd ref='-31617' />
+ <nd ref='-31619' />
+ <nd ref='-31621' />
+ <nd ref='-31615' />
+ <nd ref='-31613' />
+ <nd ref='-47361' />
+ <nd ref='-40267' />
+ <nd ref='-47363' />
+ <nd ref='-47351' />
+ <nd ref='-47353' />
+ <nd ref='-47355' />
+ <nd ref='-47357' />
+ <nd ref='-47359' />
+ <nd ref='-47341' />
+ <nd ref='-47349' />
+ <nd ref='-47343' />
+ <nd ref='-47345' />
+ <nd ref='-47347' />
+ <nd ref='-47339' />
+ <nd ref='-47337' />
+ <nd ref='-47335' />
+ <nd ref='-47333' />
+ <nd ref='-47331' />
+ <nd ref='-47329' />
+ <nd ref='-47327' />
+ <nd ref='-47325' />
+ <nd ref='-47323' />
+ <nd ref='-47321' />
+ <nd ref='-47319' />
+ <nd ref='-47317' />
+ <nd ref='-47315' />
+ <nd ref='-47313' />
+ <nd ref='-40275' />
+ <nd ref='-40273' />
+ <nd ref='-40325' />
+ <nd ref='-40323' />
+ <nd ref='-47243' />
+ <nd ref='-47245' />
+ <nd ref='-47249' />
+ <nd ref='-47247' />
+ <nd ref='-42009' />
+ <nd ref='-42079' />
+ <nd ref='-42077' />
+ <nd ref='-42075' />
+ <nd ref='-42073' />
+ <nd ref='-42071' />
+ <nd ref='-42069' />
+ <nd ref='-42067' />
+ <nd ref='-42065' />
+ <nd ref='-42063' />
+ <nd ref='-42061' />
+ <nd ref='-42059' />
+ <nd ref='-42057' />
+ <nd ref='-42055' />
+ <nd ref='-42053' />
+ <nd ref='-42051' />
+ <nd ref='-42049' />
+ <nd ref='-42047' />
+ <nd ref='-42045' />
+ <nd ref='-42043' />
+ <nd ref='-42041' />
+ <nd ref='-42039' />
+ <nd ref='-42037' />
+ <nd ref='-42035' />
+ <nd ref='-42033' />
+ <nd ref='-47253' />
+ <nd ref='-47251' />
+ <nd ref='-42031' />
+ <nd ref='-47255' />
+ <nd ref='-47257' />
+ <nd ref='-47259' />
+ <nd ref='-47261' />
+ <nd ref='-47263' />
+ <nd ref='-42029' />
+ <nd ref='-42027' />
+ <nd ref='-47273' />
+ <nd ref='-47271' />
+ <nd ref='-47269' />
+ <nd ref='-47267' />
+ <nd ref='-47265' />
+ <nd ref='-47275' />
+ <nd ref='-47277' />
+ <nd ref='-42025' />
+ <nd ref='-47283' />
+ <nd ref='-47281' />
+ <nd ref='-47279' />
+ <nd ref='-42023' />
+ <nd ref='-47285' />
+ <nd ref='-47311' />
+ <nd ref='-47309' />
+ <nd ref='-47307' />
+ <nd ref='-47305' />
+ <nd ref='-47303' />
+ <nd ref='-47301' />
+ <nd ref='-47299' />
+ <nd ref='-47297' />
+ <nd ref='-47295' />
+ <nd ref='-47293' />
+ <nd ref='-47291' />
+ <nd ref='-47289' />
+ <nd ref='-47287' />
+ <nd ref='-42021' />
+ <nd ref='-36333' />
+ <nd ref='-42019' />
+ <nd ref='-42017' />
+ <nd ref='-38883' />
+ <nd ref='-38799' />
+ <nd ref='-42795' />
+ <nd ref='-42221' />
+ <nd ref='-42223' />
+ <nd ref='-42225' />
+ <nd ref='-42227' />
+ <nd ref='-36613' />
+ <nd ref='-42229' />
+ <nd ref='-36611' />
+ <nd ref='-36609' />
+ <nd ref='-36607' />
+ <nd ref='-42231' />
+ <nd ref='-36605' />
+ <nd ref='-36603' />
+ <nd ref='-36601' />
+ <nd ref='-36599' />
+ <nd ref='-36597' />
+ <nd ref='-36595' />
+ <nd ref='-36593' />
+ <nd ref='-36591' />
+ <nd ref='-36589' />
+ <nd ref='-36587' />
+ <nd ref='-36585' />
+ <nd ref='-36583' />
+ <nd ref='-36581' />
+ <nd ref='-36579' />
+ <nd ref='-36577' />
+ <nd ref='-36575' />
+ <nd ref='-36573' />
+ <nd ref='-36571' />
+ <nd ref='-36569' />
+ <nd ref='-36567' />
+ <nd ref='-36565' />
+ <nd ref='-36563' />
+ <nd ref='-36561' />
+ <nd ref='-36559' />
+ <nd ref='-36557' />
+ <nd ref='-36555' />
+ <nd ref='-36553' />
+ <nd ref='-36551' />
+ <nd ref='-36549' />
+ <nd ref='-36547' />
+ <nd ref='-36545' />
+ <nd ref='-36543' />
+ <nd ref='-36541' />
+ <nd ref='-36539' />
+ <nd ref='-42219' />
+ <nd ref='-47095' />
+ <nd ref='-47097' />
+ <nd ref='-47099' />
+ <nd ref='-47101' />
+ <nd ref='-47129' />
+ <nd ref='-47131' />
+ <nd ref='-47133' />
+ <nd ref='-47103' />
+ <nd ref='-47107' />
+ <nd ref='-47127' />
+ <nd ref='-47125' />
+ <nd ref='-47109' />
+ <nd ref='-47105' />
+ <nd ref='-47113' />
+ <nd ref='-47111' />
+ <nd ref='-47115' />
+ <nd ref='-47117' />
+ <nd ref='-47119' />
+ <nd ref='-47123' />
+ <nd ref='-47121' />
+ <nd ref='-39857' />
+ <nd ref='-47239' />
+ <nd ref='-31707' />
+ <nd ref='-31705' />
+ <nd ref='-31699' />
+ <nd ref='-31701' />
+ <nd ref='-31703' />
+ <nd ref='-31695' />
+ <nd ref='-31697' />
+ <nd ref='-31693' />
+ <nd ref='-31677' />
+ <nd ref='-31679' />
+ <nd ref='-31675' />
+ <nd ref='-31681' />
+ <nd ref='-31691' />
+ <nd ref='-31687' />
+ <nd ref='-31685' />
+ <nd ref='-31683' />
+ <nd ref='-31689' />
+ <nd ref='-37749' />
+ <nd ref='-42217' />
+ <nd ref='-42791' />
+ <nd ref='-42793' />
+ <nd ref='-39767' />
+ <tag k='ISO3166-1:alpha2' v='TR' />
+ <tag k='name:en' v='Turkey' />
+ </way>
+ <way id='-57799'>
+ <nd ref='-42745' />
+ <nd ref='-42743' />
+ <nd ref='-38455' />
+ <nd ref='-42739' />
+ <nd ref='-38453' />
+ <nd ref='-38451' />
+ <nd ref='-38449' />
+ <nd ref='-42741' />
+ <nd ref='-38447' />
+ <nd ref='-42737' />
+ <nd ref='-42233' />
+ <nd ref='-42747' />
+ <nd ref='-42749' />
+ <nd ref='-42745' />
+ <tag k='ISO3166-1:alpha2' v='TW' />
+ <tag k='name:en' v='Taiwan' />
+ <tag k='note' v='Self admin.; Claimed by China' />
+ </way>
+ <way id='-57801'>
+ <nd ref='-42235' />
+ <nd ref='-40621' />
+ <nd ref='-34659' />
+ <nd ref='-34655' />
+ <nd ref='-34657' />
+ <nd ref='-40619' />
+ <nd ref='-40617' />
+ <nd ref='-34653' />
+ <nd ref='-34649' />
+ <nd ref='-34651' />
+ <nd ref='-40615' />
+ <nd ref='-34643' />
+ <nd ref='-40613' />
+ <nd ref='-34647' />
+ <nd ref='-34645' />
+ <nd ref='-42237' />
+ <nd ref='-41323' />
+ <nd ref='-48775' />
+ <nd ref='-48777' />
+ <nd ref='-48771' />
+ <nd ref='-48773' />
+ <nd ref='-48765' />
+ <nd ref='-48767' />
+ <nd ref='-48769' />
+ <nd ref='-48747' />
+ <nd ref='-48763' />
+ <nd ref='-48761' />
+ <nd ref='-48759' />
+ <nd ref='-48757' />
+ <nd ref='-48755' />
+ <nd ref='-48753' />
+ <nd ref='-48749' />
+ <nd ref='-48751' />
+ <nd ref='-41375' />
+ <nd ref='-31321' />
+ <nd ref='-31323' />
+ <nd ref='-31325' />
+ <nd ref='-41373' />
+ <nd ref='-31327' />
+ <nd ref='-31329' />
+ <nd ref='-31331' />
+ <nd ref='-41371' />
+ <nd ref='-31333' />
+ <nd ref='-31343' />
+ <nd ref='-31339' />
+ <nd ref='-31337' />
+ <nd ref='-31341' />
+ <nd ref='-31335' />
+ <nd ref='-41369' />
+ <nd ref='-31345' />
+ <nd ref='-31347' />
+ <nd ref='-41381' />
+ <nd ref='-42375' />
+ <nd ref='-31287' />
+ <nd ref='-31289' />
+ <nd ref='-31291' />
+ <nd ref='-31293' />
+ <nd ref='-31303' />
+ <nd ref='-31299' />
+ <nd ref='-31301' />
+ <nd ref='-31297' />
+ <nd ref='-31295' />
+ <nd ref='-31305' />
+ <nd ref='-31319' />
+ <nd ref='-31315' />
+ <nd ref='-31313' />
+ <nd ref='-31317' />
+ <nd ref='-31311' />
+ <nd ref='-31307' />
+ <nd ref='-31309' />
+ <nd ref='-38807' />
+ <nd ref='-34661' />
+ <nd ref='-38805' />
+ <nd ref='-37305' />
+ <nd ref='-42239' />
+ <nd ref='-34681' />
+ <nd ref='-34679' />
+ <nd ref='-34677' />
+ <nd ref='-34675' />
+ <nd ref='-37303' />
+ <nd ref='-34673' />
+ <nd ref='-34671' />
+ <nd ref='-34669' />
+ <nd ref='-34667' />
+ <nd ref='-34665' />
+ <nd ref='-34663' />
+ <nd ref='-37301' />
+ <nd ref='-42241' />
+ <nd ref='-34335' />
+ <nd ref='-34333' />
+ <nd ref='-42243' />
+ <nd ref='-34331' />
+ <nd ref='-41779' />
+ <nd ref='-34329' />
+ <nd ref='-34327' />
+ <nd ref='-34325' />
+ <nd ref='-41777' />
+ <nd ref='-34323' />
+ <nd ref='-34321' />
+ <nd ref='-34319' />
+ <nd ref='-42235' />
+ <tag k='ISO3166-1:alpha2' v='TZ' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Tanzania' />
+ </way>
+ <way id='-57803'>
+ <nd ref='-40621' />
+ <nd ref='-42235' />
+ <nd ref='-34319' />
+ <nd ref='-34321' />
+ <nd ref='-34323' />
+ <nd ref='-41777' />
+ <nd ref='-41783' />
+ <nd ref='-34313' />
+ <nd ref='-34315' />
+ <nd ref='-34317' />
+ <nd ref='-41781' />
+ <nd ref='-31015' />
+ <nd ref='-31013' />
+ <nd ref='-31011' />
+ <nd ref='-31009' />
+ <nd ref='-31007' />
+ <nd ref='-31017' />
+ <nd ref='-31039' />
+ <nd ref='-31021' />
+ <nd ref='-31019' />
+ <nd ref='-31029' />
+ <nd ref='-31027' />
+ <nd ref='-31025' />
+ <nd ref='-31023' />
+ <nd ref='-31037' />
+ <nd ref='-31035' />
+ <nd ref='-31031' />
+ <nd ref='-31033' />
+ <nd ref='-31045' />
+ <nd ref='-31041' />
+ <nd ref='-31043' />
+ <nd ref='-30997' />
+ <nd ref='-30999' />
+ <nd ref='-30995' />
+ <nd ref='-30991' />
+ <nd ref='-30993' />
+ <nd ref='-31001' />
+ <nd ref='-31003' />
+ <nd ref='-30989' />
+ <nd ref='-31005' />
+ <nd ref='-30985' />
+ <nd ref='-30987' />
+ <nd ref='-30981' />
+ <nd ref='-30983' />
+ <nd ref='-30979' />
+ <nd ref='-30975' />
+ <nd ref='-30977' />
+ <nd ref='-42245' />
+ <nd ref='-31077' />
+ <nd ref='-31079' />
+ <nd ref='-31073' />
+ <nd ref='-31071' />
+ <nd ref='-31069' />
+ <nd ref='-31067' />
+ <nd ref='-31075' />
+ <nd ref='-31063' />
+ <nd ref='-31065' />
+ <nd ref='-31061' />
+ <nd ref='-31059' />
+ <nd ref='-31057' />
+ <nd ref='-31055' />
+ <nd ref='-31053' />
+ <nd ref='-31051' />
+ <nd ref='-31049' />
+ <nd ref='-31047' />
+ <nd ref='-42247' />
+ <nd ref='-41859' />
+ <nd ref='-41857' />
+ <nd ref='-42249' />
+ <nd ref='-31127' />
+ <nd ref='-31129' />
+ <nd ref='-31131' />
+ <nd ref='-31137' />
+ <nd ref='-31135' />
+ <nd ref='-31133' />
+ <nd ref='-31139' />
+ <nd ref='-31153' />
+ <nd ref='-31145' />
+ <nd ref='-31143' />
+ <nd ref='-31141' />
+ <nd ref='-31151' />
+ <nd ref='-31149' />
+ <nd ref='-31147' />
+ <nd ref='-31165' />
+ <nd ref='-31155' />
+ <nd ref='-31157' />
+ <nd ref='-31159' />
+ <nd ref='-31161' />
+ <nd ref='-31163' />
+ <nd ref='-31187' />
+ <nd ref='-31185' />
+ <nd ref='-31179' />
+ <nd ref='-31177' />
+ <nd ref='-31181' />
+ <nd ref='-31183' />
+ <nd ref='-31169' />
+ <nd ref='-31167' />
+ <nd ref='-31175' />
+ <nd ref='-31171' />
+ <nd ref='-31173' />
+ <nd ref='-31213' />
+ <nd ref='-31189' />
+ <nd ref='-31191' />
+ <nd ref='-31193' />
+ <nd ref='-31201' />
+ <nd ref='-31195' />
+ <nd ref='-31199' />
+ <nd ref='-31197' />
+ <nd ref='-31203' />
+ <nd ref='-31205' />
+ <nd ref='-31211' />
+ <nd ref='-31209' />
+ <nd ref='-31207' />
+ <nd ref='-40621' />
+ <tag k='ISO3166-1:alpha2' v='UG' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Uganda' />
+ </way>
+ <way id='-57805'>
+ <nd ref='-42257' />
+ <nd ref='-42259' />
+ <nd ref='-42261' />
+ <nd ref='-42855' />
+ <nd ref='-42263' />
+ <nd ref='-42797' />
+ <nd ref='-50957' />
+ <nd ref='-50959' />
+ <nd ref='-50955' />
+ <nd ref='-50953' />
+ <nd ref='-50951' />
+ <nd ref='-50949' />
+ <nd ref='-50945' />
+ <nd ref='-50947' />
+ <nd ref='-50943' />
+ <nd ref='-50941' />
+ <nd ref='-50939' />
+ <nd ref='-50937' />
+ <nd ref='-42265' />
+ <nd ref='-41691' />
+ <nd ref='-40985' />
+ <nd ref='-50581' />
+ <nd ref='-50583' />
+ <nd ref='-50575' />
+ <nd ref='-50577' />
+ <nd ref='-50579' />
+ <nd ref='-50587' />
+ <nd ref='-50585' />
+ <nd ref='-50573' />
+ <nd ref='-50589' />
+ <nd ref='-50593' />
+ <nd ref='-50591' />
+ <nd ref='-50597' />
+ <nd ref='-50599' />
+ <nd ref='-50601' />
+ <nd ref='-40983' />
+ <nd ref='-50595' />
+ <nd ref='-40981' />
+ <nd ref='-50603' />
+ <nd ref='-50605' />
+ <nd ref='-50609' />
+ <nd ref='-50607' />
+ <nd ref='-50611' />
+ <nd ref='-50619' />
+ <nd ref='-50613' />
+ <nd ref='-50615' />
+ <nd ref='-50617' />
+ <nd ref='-50621' />
+ <nd ref='-40979' />
+ <nd ref='-40977' />
+ <nd ref='-50625' />
+ <nd ref='-50627' />
+ <nd ref='-50629' />
+ <nd ref='-50623' />
+ <nd ref='-50631' />
+ <nd ref='-50633' />
+ <nd ref='-50635' />
+ <nd ref='-50637' />
+ <nd ref='-50639' />
+ <nd ref='-50641' />
+ <nd ref='-50643' />
+ <nd ref='-50645' />
+ <nd ref='-40975' />
+ <nd ref='-40973' />
+ <nd ref='-40971' />
+ <nd ref='-50647' />
+ <nd ref='-50649' />
+ <nd ref='-50651' />
+ <nd ref='-50661' />
+ <nd ref='-50659' />
+ <nd ref='-50657' />
+ <nd ref='-50655' />
+ <nd ref='-50653' />
+ <nd ref='-40969' />
+ <nd ref='-50663' />
+ <nd ref='-50669' />
+ <nd ref='-50671' />
+ <nd ref='-50673' />
+ <nd ref='-50675' />
+ <nd ref='-50667' />
+ <nd ref='-50665' />
+ <nd ref='-50677' />
+ <nd ref='-40967' />
+ <nd ref='-50679' />
+ <nd ref='-50681' />
+ <nd ref='-50683' />
+ <nd ref='-50697' />
+ <nd ref='-50693' />
+ <nd ref='-50695' />
+ <nd ref='-50689' />
+ <nd ref='-50691' />
+ <nd ref='-50687' />
+ <nd ref='-50685' />
+ <nd ref='-50703' />
+ <nd ref='-50701' />
+ <nd ref='-50699' />
+ <nd ref='-40965' />
+ <nd ref='-40963' />
+ <nd ref='-50541' />
+ <nd ref='-50539' />
+ <nd ref='-50537' />
+ <nd ref='-50535' />
+ <nd ref='-50533' />
+ <nd ref='-50531' />
+ <nd ref='-50529' />
+ <nd ref='-40995' />
+ <nd ref='-40993' />
+ <nd ref='-50527' />
+ <nd ref='-50525' />
+ <nd ref='-50523' />
+ <nd ref='-50521' />
+ <nd ref='-50519' />
+ <nd ref='-50517' />
+ <nd ref='-50515' />
+ <nd ref='-50513' />
+ <nd ref='-50511' />
+ <nd ref='-50509' />
+ <nd ref='-40991' />
+ <nd ref='-50967' />
+ <nd ref='-50965' />
+ <nd ref='-50961' />
+ <nd ref='-50963' />
+ <nd ref='-41711' />
+ <nd ref='-50969' />
+ <nd ref='-50971' />
+ <nd ref='-50975' />
+ <nd ref='-50973' />
+ <nd ref='-50977' />
+ <nd ref='-50979' />
+ <nd ref='-41709' />
+ <nd ref='-50995' />
+ <nd ref='-50997' />
+ <nd ref='-50993' />
+ <nd ref='-50991' />
+ <nd ref='-50983' />
+ <nd ref='-50989' />
+ <nd ref='-50987' />
+ <nd ref='-50985' />
+ <nd ref='-50981' />
+ <nd ref='-41707' />
+ <nd ref='-51009' />
+ <nd ref='-51011' />
+ <nd ref='-51007' />
+ <nd ref='-51013' />
+ <nd ref='-50999' />
+ <nd ref='-51003' />
+ <nd ref='-51005' />
+ <nd ref='-51001' />
+ <nd ref='-39937' />
+ <nd ref='-51027' />
+ <nd ref='-51029' />
+ <nd ref='-51025' />
+ <nd ref='-51033' />
+ <nd ref='-51031' />
+ <nd ref='-51019' />
+ <nd ref='-51023' />
+ <nd ref='-51021' />
+ <nd ref='-51017' />
+ <nd ref='-51015' />
+ <nd ref='-39935' />
+ <nd ref='-51157' />
+ <nd ref='-51161' />
+ <nd ref='-51159' />
+ <nd ref='-41971' />
+ <nd ref='-51165' />
+ <nd ref='-51163' />
+ <nd ref='-42267' />
+ <nd ref='-42269' />
+ <nd ref='-51167' />
+ <nd ref='-41625' />
+ <nd ref='-51313' />
+ <nd ref='-51311' />
+ <nd ref='-41623' />
+ <nd ref='-41621' />
+ <nd ref='-51307' />
+ <nd ref='-51309' />
+ <nd ref='-42271' />
+ <nd ref='-51303' />
+ <nd ref='-51301' />
+ <nd ref='-51305' />
+ <nd ref='-42273' />
+ <nd ref='-51289' />
+ <nd ref='-51287' />
+ <nd ref='-51297' />
+ <nd ref='-51299' />
+ <nd ref='-51293' />
+ <nd ref='-51295' />
+ <nd ref='-51291' />
+ <nd ref='-42275' />
+ <nd ref='-51285' />
+ <nd ref='-42277' />
+ <nd ref='-42279' />
+ <nd ref='-51275' />
+ <nd ref='-51277' />
+ <nd ref='-51279' />
+ <nd ref='-51281' />
+ <nd ref='-51283' />
+ <nd ref='-51273' />
+ <nd ref='-37835' />
+ <nd ref='-51315' />
+ <nd ref='-51317' />
+ <nd ref='-51319' />
+ <nd ref='-51321' />
+ <nd ref='-42281' />
+ <nd ref='-51323' />
+ <nd ref='-51325' />
+ <nd ref='-51327' />
+ <nd ref='-37833' />
+ <nd ref='-51333' />
+ <nd ref='-51331' />
+ <nd ref='-51335' />
+ <nd ref='-51329' />
+ <nd ref='-42283' />
+ <nd ref='-37831' />
+ <nd ref='-51339' />
+ <nd ref='-51337' />
+ <nd ref='-51355' />
+ <nd ref='-51359' />
+ <nd ref='-51357' />
+ <nd ref='-51341' />
+ <nd ref='-51343' />
+ <nd ref='-51345' />
+ <nd ref='-51347' />
+ <nd ref='-51353' />
+ <nd ref='-51349' />
+ <nd ref='-51351' />
+ <nd ref='-42285' />
+ <nd ref='-42287' />
+ <nd ref='-51379' />
+ <nd ref='-37829' />
+ <nd ref='-51381' />
+ <nd ref='-51383' />
+ <nd ref='-51377' />
+ <nd ref='-51385' />
+ <nd ref='-51389' />
+ <nd ref='-51387' />
+ <nd ref='-51391' />
+ <nd ref='-51393' />
+ <nd ref='-51367' />
+ <nd ref='-51369' />
+ <nd ref='-51373' />
+ <nd ref='-51375' />
+ <nd ref='-51371' />
+ <nd ref='-51363' />
+ <nd ref='-51365' />
+ <nd ref='-51361' />
+ <nd ref='-37827' />
+ <nd ref='-51395' />
+ <nd ref='-51397' />
+ <nd ref='-51399' />
+ <nd ref='-51405' />
+ <nd ref='-51407' />
+ <nd ref='-51401' />
+ <nd ref='-51403' />
+ <nd ref='-51409' />
+ <nd ref='-37825' />
+ <nd ref='-51411' />
+ <nd ref='-51413' />
+ <nd ref='-51415' />
+ <nd ref='-41755' />
+ <nd ref='-51425' />
+ <nd ref='-51427' />
+ <nd ref='-51429' />
+ <nd ref='-51423' />
+ <nd ref='-41753' />
+ <nd ref='-41751' />
+ <nd ref='-41749' />
+ <nd ref='-51567' />
+ <nd ref='-51577' />
+ <nd ref='-51575' />
+ <nd ref='-51565' />
+ <nd ref='-51569' />
+ <nd ref='-51571' />
+ <nd ref='-51573' />
+ <nd ref='-51561' />
+ <nd ref='-51563' />
+ <nd ref='-51579' />
+ <nd ref='-51581' />
+ <nd ref='-51583' />
+ <nd ref='-51585' />
+ <nd ref='-51587' />
+ <nd ref='-51589' />
+ <nd ref='-51591' />
+ <nd ref='-51595' />
+ <nd ref='-51593' />
+ <nd ref='-51597' />
+ <nd ref='-51601' />
+ <nd ref='-51603' />
+ <nd ref='-51599' />
+ <nd ref='-51607' />
+ <nd ref='-51609' />
+ <nd ref='-51605' />
+ <nd ref='-51611' />
+ <nd ref='-51617' />
+ <nd ref='-51613' />
+ <nd ref='-51615' />
+ <nd ref='-51621' />
+ <nd ref='-51619' />
+ <nd ref='-51623' />
+ <nd ref='-51625' />
+ <nd ref='-51627' />
+ <nd ref='-51633' />
+ <nd ref='-51631' />
+ <nd ref='-51629' />
+ <nd ref='-51637' />
+ <nd ref='-51635' />
+ <nd ref='-51643' />
+ <nd ref='-51641' />
+ <nd ref='-51639' />
+ <nd ref='-51645' />
+ <nd ref='-51649' />
+ <nd ref='-51647' />
+ <nd ref='-51651' />
+ <nd ref='-51653' />
+ <nd ref='-51657' />
+ <nd ref='-51655' />
+ <nd ref='-41747' />
+ <nd ref='-51659' />
+ <nd ref='-51663' />
+ <nd ref='-51665' />
+ <nd ref='-51661' />
+ <nd ref='-51675' />
+ <nd ref='-51677' />
+ <nd ref='-51679' />
+ <nd ref='-51685' />
+ <nd ref='-51681' />
+ <nd ref='-51683' />
+ <nd ref='-51667' />
+ <nd ref='-51669' />
+ <nd ref='-51673' />
+ <nd ref='-51671' />
+ <nd ref='-41745' />
+ <nd ref='-51693' />
+ <nd ref='-51691' />
+ <nd ref='-51689' />
+ <nd ref='-51687' />
+ <nd ref='-51695' />
+ <nd ref='-51697' />
+ <nd ref='-51699' />
+ <nd ref='-51703' />
+ <nd ref='-51701' />
+ <nd ref='-51705' />
+ <nd ref='-51707' />
+ <nd ref='-51713' />
+ <nd ref='-51715' />
+ <nd ref='-51709' />
+ <nd ref='-51711' />
+ <nd ref='-41743' />
+ <nd ref='-41741' />
+ <nd ref='-41739' />
+ <nd ref='-51719' />
+ <nd ref='-51721' />
+ <nd ref='-51723' />
+ <nd ref='-51729' />
+ <nd ref='-51727' />
+ <nd ref='-51725' />
+ <nd ref='-51717' />
+ <nd ref='-41737' />
+ <nd ref='-51739' />
+ <nd ref='-51749' />
+ <nd ref='-51747' />
+ <nd ref='-51745' />
+ <nd ref='-51741' />
+ <nd ref='-51743' />
+ <nd ref='-51737' />
+ <nd ref='-51735' />
+ <nd ref='-51733' />
+ <nd ref='-51731' />
+ <nd ref='-51755' />
+ <nd ref='-51753' />
+ <nd ref='-51751' />
+ <nd ref='-51757' />
+ <nd ref='-41735' />
+ <nd ref='-41733' />
+ <nd ref='-51759' />
+ <nd ref='-41731' />
+ <nd ref='-41729' />
+ <nd ref='-51771' />
+ <nd ref='-51769' />
+ <nd ref='-51761' />
+ <nd ref='-51765' />
+ <nd ref='-51767' />
+ <nd ref='-51763' />
+ <nd ref='-41727' />
+ <nd ref='-42251' />
+ <nd ref='-42253' />
+ <nd ref='-42853' />
+ <nd ref='-42255' />
+ <nd ref='-42851' />
+ <nd ref='-42849' />
+ <nd ref='-42847' />
+ <nd ref='-42845' />
+ <nd ref='-42843' />
+ <nd ref='-42841' />
+ <nd ref='-42839' />
+ <nd ref='-42837' />
+ <nd ref='-42835' />
+ <nd ref='-42833' />
+ <nd ref='-42831' />
+ <nd ref='-42829' />
+ <nd ref='-42827' />
+ <nd ref='-42825' />
+ <nd ref='-42823' />
+ <nd ref='-42821' />
+ <nd ref='-42819' />
+ <nd ref='-42817' />
+ <nd ref='-42815' />
+ <nd ref='-42813' />
+ <nd ref='-42811' />
+ <nd ref='-42809' />
+ <nd ref='-42807' />
+ <nd ref='-42805' />
+ <nd ref='-42803' />
+ <nd ref='-42257' />
+ <tag k='ISO3166-1:alpha2' v='UA' />
+ <tag k='maxspeed:motorway' v='130' />
+ <tag k='maxspeed:rural' v='90' />
+ <tag k='maxspeed:trunk' v='110' />
+ <tag k='maxspeed:urban' v='60' />
+ <tag k='name:en' v='Ukraine' />
+ </way>
+ <way id='-57807'>
+ <nd ref='-37905' />
+ <nd ref='-36165' />
+ <nd ref='-36163' />
+ <nd ref='-36157' />
+ <nd ref='-36159' />
+ <nd ref='-36161' />
+ <nd ref='-36155' />
+ <nd ref='-36153' />
+ <nd ref='-37903' />
+ <nd ref='-36731' />
+ <nd ref='-37095' />
+ <nd ref='-36169' />
+ <nd ref='-36171' />
+ <nd ref='-36173' />
+ <nd ref='-37093' />
+ <nd ref='-36167' />
+ <nd ref='-37905' />
+ <tag k='ISO3166-1:alpha2' v='UY' />
+ <tag k='name:en' v='Uruguay' />
+ </way>
+ <way id='-57809'>
+ <nd ref='-42289' />
+ <nd ref='-42291' />
+ <nd ref='-42293' />
+ <nd ref='-42295' />
+ <nd ref='-42289' />
+ <tag k='name:en' v='Navassa Island' />
+ </way>
+ <way id='-57811'>
+ <nd ref='-42297' />
+ <nd ref='-42299' />
+ <nd ref='-42301' />
+ <nd ref='-42303' />
+ <nd ref='-42297' />
+ <tag k='name:en' v='Wake Island' />
+ </way>
+ <way id='-57813'>
+ <nd ref='-40665' />
+ <nd ref='-52051' />
+ <nd ref='-40667' />
+ <nd ref='-52265' />
+ <nd ref='-42307' />
+ <nd ref='-40665' />
+ </way>
+ <way id='-57815'>
+ <nd ref='-52263' />
+ <nd ref='-42309' />
+ <nd ref='-52053' />
+ <nd ref='-42311' />
+ <nd ref='-40661' />
+ <nd ref='-52055' />
+ <nd ref='-52059' />
+ <nd ref='-42313' />
+ <nd ref='-42315' />
+ <nd ref='-40663' />
+ <nd ref='-52057' />
+ <nd ref='-52263' />
+ </way>
+ <way id='-57817'>
+ <nd ref='-40413' />
+ <nd ref='-45667' />
+ <nd ref='-42705' />
+ <nd ref='-42707' />
+ <nd ref='-42709' />
+ <nd ref='-45669' />
+ <nd ref='-45671' />
+ <nd ref='-45673' />
+ <nd ref='-45675' />
+ <nd ref='-45677' />
+ <nd ref='-45679' />
+ <nd ref='-45681' />
+ <nd ref='-45683' />
+ <nd ref='-40411' />
+ <nd ref='-45685' />
+ <nd ref='-45687' />
+ <nd ref='-45689' />
+ <nd ref='-45691' />
+ <nd ref='-45693' />
+ <nd ref='-40409' />
+ <nd ref='-40657' />
+ <nd ref='-45697' />
+ <nd ref='-45699' />
+ <nd ref='-40655' />
+ <nd ref='-51949' />
+ <nd ref='-51951' />
+ <nd ref='-51955' />
+ <nd ref='-51953' />
+ <nd ref='-51957' />
+ <nd ref='-51959' />
+ <nd ref='-51961' />
+ <nd ref='-51963' />
+ <nd ref='-51965' />
+ <nd ref='-51967' />
+ <nd ref='-51969' />
+ <nd ref='-51971' />
+ <nd ref='-51973' />
+ <nd ref='-51975' />
+ <nd ref='-51981' />
+ <nd ref='-51979' />
+ <nd ref='-51977' />
+ <nd ref='-51983' />
+ <nd ref='-51985' />
+ <nd ref='-51987' />
+ <nd ref='-51989' />
+ <nd ref='-51991' />
+ <nd ref='-51993' />
+ <nd ref='-51995' />
+ <nd ref='-51997' />
+ <nd ref='-51999' />
+ <nd ref='-42317' />
+ <nd ref='-52007' />
+ <nd ref='-52003' />
+ <nd ref='-52005' />
+ <nd ref='-52001' />
+ <nd ref='-40653' />
+ <nd ref='-52027' />
+ <nd ref='-52025' />
+ <nd ref='-52015' />
+ <nd ref='-52013' />
+ <nd ref='-52023' />
+ <nd ref='-52017' />
+ <nd ref='-52019' />
+ <nd ref='-52021' />
+ <nd ref='-52011' />
+ <nd ref='-52029' />
+ <nd ref='-52031' />
+ <nd ref='-52009' />
+ <nd ref='-52049' />
+ <nd ref='-52047' />
+ <nd ref='-52045' />
+ <nd ref='-52043' />
+ <nd ref='-52039' />
+ <nd ref='-52037' />
+ <nd ref='-52041' />
+ <nd ref='-52035' />
+ <nd ref='-52033' />
+ <nd ref='-42319' />
+ <nd ref='-42321' />
+ <nd ref='-42107' />
+ <nd ref='-42105' />
+ <nd ref='-42103' />
+ <nd ref='-52063' />
+ <nd ref='-52065' />
+ <nd ref='-42101' />
+ <nd ref='-52067' />
+ <nd ref='-42099' />
+ <nd ref='-42161' />
+ <nd ref='-52075' />
+ <nd ref='-52073' />
+ <nd ref='-42159' />
+ <nd ref='-52083' />
+ <nd ref='-52081' />
+ <nd ref='-52079' />
+ <nd ref='-52077' />
+ <nd ref='-42157' />
+ <nd ref='-52085' />
+ <nd ref='-52099' />
+ <nd ref='-52101' />
+ <nd ref='-52097' />
+ <nd ref='-52091' />
+ <nd ref='-52093' />
+ <nd ref='-52095' />
+ <nd ref='-52087' />
+ <nd ref='-52089' />
+ <nd ref='-52113' />
+ <nd ref='-52111' />
+ <nd ref='-52109' />
+ <nd ref='-52107' />
+ <nd ref='-52105' />
+ <nd ref='-52115' />
+ <nd ref='-52117' />
+ <nd ref='-52119' />
+ <nd ref='-52125' />
+ <nd ref='-52123' />
+ <nd ref='-52121' />
+ <nd ref='-52129' />
+ <nd ref='-52127' />
+ <nd ref='-52103' />
+ <nd ref='-52131' />
+ <nd ref='-42155' />
+ <nd ref='-52225' />
+ <nd ref='-52223' />
+ <nd ref='-52221' />
+ <nd ref='-52219' />
+ <nd ref='-52217' />
+ <nd ref='-52213' />
+ <nd ref='-52215' />
+ <nd ref='-52211' />
+ <nd ref='-52209' />
+ <nd ref='-52207' />
+ <nd ref='-52227' />
+ <nd ref='-42153' />
+ <nd ref='-42151' />
+ <nd ref='-52229' />
+ <nd ref='-42149' />
+ <nd ref='-52239' />
+ <nd ref='-52237' />
+ <nd ref='-52235' />
+ <nd ref='-52233' />
+ <nd ref='-52231' />
+ <nd ref='-42147' />
+ <nd ref='-52245' />
+ <nd ref='-52243' />
+ <nd ref='-52241' />
+ <nd ref='-42145' />
+ <nd ref='-52247' />
+ <nd ref='-42143' />
+ <nd ref='-36953' />
+ <nd ref='-52251' />
+ <nd ref='-52249' />
+ <nd ref='-52257' />
+ <nd ref='-52259' />
+ <nd ref='-52261' />
+ <nd ref='-52255' />
+ <nd ref='-52253' />
+ <nd ref='-42169' />
+ <nd ref='-51871' />
+ <nd ref='-51873' />
+ <nd ref='-51875' />
+ <nd ref='-51877' />
+ <nd ref='-51869' />
+ <nd ref='-51867' />
+ <nd ref='-51865' />
+ <nd ref='-51863' />
+ <nd ref='-51861' />
+ <nd ref='-42167' />
+ <nd ref='-51859' />
+ <nd ref='-42165' />
+ <nd ref='-51857' />
+ <nd ref='-51855' />
+ <nd ref='-51853' />
+ <nd ref='-51851' />
+ <nd ref='-51849' />
+ <nd ref='-51847' />
+ <nd ref='-51845' />
+ <nd ref='-51843' />
+ <nd ref='-51841' />
+ <nd ref='-51839' />
+ <nd ref='-42163' />
+ <nd ref='-51837' />
+ <nd ref='-51835' />
+ <nd ref='-51821' />
+ <nd ref='-51823' />
+ <nd ref='-51825' />
+ <nd ref='-51827' />
+ <nd ref='-51829' />
+ <nd ref='-51831' />
+ <nd ref='-51833' />
+ <nd ref='-51819' />
+ <nd ref='-51817' />
+ <nd ref='-51809' />
+ <nd ref='-51807' />
+ <nd ref='-51805' />
+ <nd ref='-51803' />
+ <nd ref='-51801' />
+ <nd ref='-51799' />
+ <nd ref='-51797' />
+ <nd ref='-51791' />
+ <nd ref='-51789' />
+ <nd ref='-51787' />
+ <nd ref='-51793' />
+ <nd ref='-51795' />
+ <nd ref='-51811' />
+ <nd ref='-51815' />
+ <nd ref='-51813' />
+ <nd ref='-51779' />
+ <nd ref='-51783' />
+ <nd ref='-51785' />
+ <nd ref='-51781' />
+ <nd ref='-51773' />
+ <nd ref='-51775' />
+ <nd ref='-51777' />
+ <nd ref='-42175' />
+ <nd ref='-40539' />
+ <nd ref='-40537' />
+ <nd ref='-40535' />
+ <nd ref='-40533' />
+ <nd ref='-40531' />
+ <nd ref='-40529' />
+ <nd ref='-40527' />
+ <nd ref='-40525' />
+ <nd ref='-40523' />
+ <nd ref='-40521' />
+ <nd ref='-40519' />
+ <nd ref='-40517' />
+ <nd ref='-40515' />
+ <nd ref='-40513' />
+ <nd ref='-40511' />
+ <nd ref='-40509' />
+ <nd ref='-40507' />
+ <nd ref='-40505' />
+ <nd ref='-40503' />
+ <nd ref='-40501' />
+ <nd ref='-40499' />
+ <nd ref='-40497' />
+ <nd ref='-40495' />
+ <nd ref='-40493' />
+ <nd ref='-40491' />
+ <nd ref='-40489' />
+ <nd ref='-40487' />
+ <nd ref='-40485' />
+ <nd ref='-40483' />
+ <nd ref='-40481' />
+ <nd ref='-40479' />
+ <nd ref='-40477' />
+ <nd ref='-40475' />
+ <nd ref='-40473' />
+ <nd ref='-40471' />
+ <nd ref='-40469' />
+ <nd ref='-40467' />
+ <nd ref='-40465' />
+ <nd ref='-40463' />
+ <nd ref='-40461' />
+ <nd ref='-40459' />
+ <nd ref='-40457' />
+ <nd ref='-40455' />
+ <nd ref='-40453' />
+ <nd ref='-40451' />
+ <nd ref='-40449' />
+ <nd ref='-40447' />
+ <nd ref='-40445' />
+ <nd ref='-40443' />
+ <nd ref='-40441' />
+ <nd ref='-40439' />
+ <nd ref='-40437' />
+ <nd ref='-40435' />
+ <nd ref='-40433' />
+ <nd ref='-40431' />
+ <nd ref='-40429' />
+ <nd ref='-40427' />
+ <nd ref='-40425' />
+ <nd ref='-40423' />
+ <nd ref='-40421' />
+ <nd ref='-40419' />
+ <nd ref='-40417' />
+ <nd ref='-40415' />
+ <nd ref='-42695' />
+ <nd ref='-42697' />
+ <nd ref='-42699' />
+ <nd ref='-42701' />
+ <nd ref='-42703' />
+ <nd ref='-45663' />
+ <nd ref='-45665' />
+ <nd ref='-40413' />
+ </way>
+ <way id='-57819'>
+ <nd ref='-42323' />
+ <nd ref='-42325' />
+ <nd ref='-36517' />
+ <nd ref='-42327' />
+ <nd ref='-42329' />
+ <nd ref='-36515' />
+ <nd ref='-36513' />
+ <nd ref='-42331' />
+ <nd ref='-36511' />
+ <nd ref='-36507' />
+ <nd ref='-36499' />
+ <nd ref='-36501' />
+ <nd ref='-36503' />
+ <nd ref='-36505' />
+ <nd ref='-36509' />
+ <nd ref='-42333' />
+ <nd ref='-36519' />
+ <nd ref='-42323' />
+ <tag k='ISO3166-1:alpha2' v='VA' />
+ <tag k='name:en' v='Vatican (Holy Sea)' />
+ </way>
+ <way id='-57821'>
+ <nd ref='-42335' />
+ <nd ref='-36417' />
+ <nd ref='-36415' />
+ <nd ref='-53563' />
+ <nd ref='-36425' />
+ <nd ref='-36421' />
+ <nd ref='-36419' />
+ <nd ref='-35807' />
+ <nd ref='-35805' />
+ <nd ref='-36423' />
+ <nd ref='-42337' />
+ <nd ref='-42339' />
+ <nd ref='-36361' />
+ <nd ref='-36365' />
+ <nd ref='-39887' />
+ <nd ref='-39885' />
+ <nd ref='-35643' />
+ <nd ref='-35641' />
+ <nd ref='-35639' />
+ <nd ref='-35637' />
+ <nd ref='-35635' />
+ <nd ref='-35633' />
+ <nd ref='-35631' />
+ <nd ref='-35629' />
+ <nd ref='-35627' />
+ <nd ref='-35625' />
+ <nd ref='-35623' />
+ <nd ref='-35621' />
+ <nd ref='-35619' />
+ <nd ref='-39883' />
+ <nd ref='-39881' />
+ <nd ref='-35613' />
+ <nd ref='-35615' />
+ <nd ref='-35617' />
+ <nd ref='-39879' />
+ <nd ref='-37941' />
+ <nd ref='-35599' />
+ <nd ref='-35597' />
+ <nd ref='-35595' />
+ <nd ref='-35593' />
+ <nd ref='-35591' />
+ <nd ref='-35581' />
+ <nd ref='-35583' />
+ <nd ref='-35585' />
+ <nd ref='-35587' />
+ <nd ref='-35589' />
+ <nd ref='-35571' />
+ <nd ref='-35575' />
+ <nd ref='-35573' />
+ <nd ref='-35577' />
+ <nd ref='-35579' />
+ <nd ref='-35555' />
+ <nd ref='-35547' />
+ <nd ref='-35553' />
+ <nd ref='-35557' />
+ <nd ref='-35549' />
+ <nd ref='-35551' />
+ <nd ref='-35559' />
+ <nd ref='-35561' />
+ <nd ref='-35565' />
+ <nd ref='-35563' />
+ <nd ref='-35569' />
+ <nd ref='-35567' />
+ <nd ref='-37939' />
+ <nd ref='-35527' />
+ <nd ref='-35525' />
+ <nd ref='-35529' />
+ <nd ref='-35531' />
+ <nd ref='-35533' />
+ <nd ref='-35535' />
+ <nd ref='-35537' />
+ <nd ref='-35539' />
+ <nd ref='-35541' />
+ <nd ref='-35543' />
+ <nd ref='-35545' />
+ <nd ref='-37937' />
+ <nd ref='-37935' />
+ <nd ref='-38853' />
+ <nd ref='-35431' />
+ <nd ref='-35433' />
+ <nd ref='-35435' />
+ <nd ref='-38851' />
+ <nd ref='-35429' />
+ <nd ref='-35427' />
+ <nd ref='-35425' />
+ <nd ref='-35423' />
+ <nd ref='-35421' />
+ <nd ref='-35419' />
+ <nd ref='-35417' />
+ <nd ref='-35415' />
+ <nd ref='-35413' />
+ <nd ref='-38849' />
+ <nd ref='-35411' />
+ <nd ref='-35405' />
+ <nd ref='-35407' />
+ <nd ref='-35409' />
+ <nd ref='-35393' />
+ <nd ref='-35391' />
+ <nd ref='-35389' />
+ <nd ref='-35385' />
+ <nd ref='-35387' />
+ <nd ref='-35403' />
+ <nd ref='-35401' />
+ <nd ref='-35395' />
+ <nd ref='-35397' />
+ <nd ref='-35399' />
+ <nd ref='-35379' />
+ <nd ref='-35377' />
+ <nd ref='-35375' />
+ <nd ref='-35381' />
+ <nd ref='-35383' />
+ <nd ref='-38847' />
+ <nd ref='-36411' />
+ <nd ref='-38845' />
+ <nd ref='-36413' />
+ <nd ref='-42335' />
+ <tag k='ISO3166-1:alpha2' v='VE' />
+ <tag k='name:en' v='Venezuela, RB' />
+ </way>
+ <way id='-57823'>
+ <nd ref='-42759' />
+ <nd ref='-42755' />
+ <nd ref='-42753' />
+ <nd ref='-42341' />
+ <nd ref='-42343' />
+ <nd ref='-42989' />
+ <nd ref='-42761' />
+ <nd ref='-40681' />
+ <nd ref='-40679' />
+ <nd ref='-40677' />
+ <nd ref='-33555' />
+ <nd ref='-33557' />
+ <nd ref='-33559' />
+ <nd ref='-33561' />
+ <nd ref='-33551' />
+ <nd ref='-33549' />
+ <nd ref='-33553' />
+ <nd ref='-33547' />
+ <nd ref='-33545' />
+ <nd ref='-40675' />
+ <nd ref='-40673' />
+ <nd ref='-33537' />
+ <nd ref='-33535' />
+ <nd ref='-33533' />
+ <nd ref='-33531' />
+ <nd ref='-33529' />
+ <nd ref='-33527' />
+ <nd ref='-33525' />
+ <nd ref='-33523' />
+ <nd ref='-33539' />
+ <nd ref='-33543' />
+ <nd ref='-33541' />
+ <nd ref='-40671' />
+ <nd ref='-33427' />
+ <nd ref='-33425' />
+ <nd ref='-33423' />
+ <nd ref='-33429' />
+ <nd ref='-33433' />
+ <nd ref='-33431' />
+ <nd ref='-33435' />
+ <nd ref='-33437' />
+ <nd ref='-33439' />
+ <nd ref='-33443' />
+ <nd ref='-33441' />
+ <nd ref='-33445' />
+ <nd ref='-33447' />
+ <nd ref='-33449' />
+ <nd ref='-33451' />
+ <nd ref='-33453' />
+ <nd ref='-33455' />
+ <nd ref='-33457' />
+ <nd ref='-33459' />
+ <nd ref='-33473' />
+ <nd ref='-33471' />
+ <nd ref='-33469' />
+ <nd ref='-33467' />
+ <nd ref='-33465' />
+ <nd ref='-33463' />
+ <nd ref='-33461' />
+ <nd ref='-33485' />
+ <nd ref='-33481' />
+ <nd ref='-33483' />
+ <nd ref='-33475' />
+ <nd ref='-33477' />
+ <nd ref='-33479' />
+ <nd ref='-33521' />
+ <nd ref='-33519' />
+ <nd ref='-33517' />
+ <nd ref='-33515' />
+ <nd ref='-33513' />
+ <nd ref='-33509' />
+ <nd ref='-33511' />
+ <nd ref='-33507' />
+ <nd ref='-33497' />
+ <nd ref='-33495' />
+ <nd ref='-33493' />
+ <nd ref='-33491' />
+ <nd ref='-33489' />
+ <nd ref='-33487' />
+ <nd ref='-33505' />
+ <nd ref='-33499' />
+ <nd ref='-33501' />
+ <nd ref='-33503' />
+ <nd ref='-40725' />
+ <nd ref='-33211' />
+ <nd ref='-33209' />
+ <nd ref='-33213' />
+ <nd ref='-33215' />
+ <nd ref='-33219' />
+ <nd ref='-33217' />
+ <nd ref='-33221' />
+ <nd ref='-33223' />
+ <nd ref='-33225' />
+ <nd ref='-33227' />
+ <nd ref='-33229' />
+ <nd ref='-33231' />
+ <nd ref='-33233' />
+ <nd ref='-33235' />
+ <nd ref='-33237' />
+ <nd ref='-33239' />
+ <nd ref='-33241' />
+ <nd ref='-33245' />
+ <nd ref='-33243' />
+ <nd ref='-33249' />
+ <nd ref='-33247' />
+ <nd ref='-33251' />
+ <nd ref='-33253' />
+ <nd ref='-33255' />
+ <nd ref='-33257' />
+ <nd ref='-33259' />
+ <nd ref='-33261' />
+ <nd ref='-33263' />
+ <nd ref='-33265' />
+ <nd ref='-33267' />
+ <nd ref='-33269' />
+ <nd ref='-33271' />
+ <nd ref='-33273' />
+ <nd ref='-33275' />
+ <nd ref='-33277' />
+ <nd ref='-33279' />
+ <nd ref='-33289' />
+ <nd ref='-33281' />
+ <nd ref='-33283' />
+ <nd ref='-33285' />
+ <nd ref='-33287' />
+ <nd ref='-33301' />
+ <nd ref='-33293' />
+ <nd ref='-33291' />
+ <nd ref='-33295' />
+ <nd ref='-33297' />
+ <nd ref='-33299' />
+ <nd ref='-42345' />
+ <nd ref='-33303' />
+ <nd ref='-33305' />
+ <nd ref='-33307' />
+ <nd ref='-33309' />
+ <nd ref='-33313' />
+ <nd ref='-33311' />
+ <nd ref='-33331' />
+ <nd ref='-33315' />
+ <nd ref='-33317' />
+ <nd ref='-33319' />
+ <nd ref='-33329' />
+ <nd ref='-33327' />
+ <nd ref='-33325' />
+ <nd ref='-33323' />
+ <nd ref='-33381' />
+ <nd ref='-33321' />
+ <nd ref='-33349' />
+ <nd ref='-33347' />
+ <nd ref='-33345' />
+ <nd ref='-33333' />
+ <nd ref='-33335' />
+ <nd ref='-33337' />
+ <nd ref='-33339' />
+ <nd ref='-33341' />
+ <nd ref='-33343' />
+ <nd ref='-33353' />
+ <nd ref='-33355' />
+ <nd ref='-33357' />
+ <nd ref='-33359' />
+ <nd ref='-33351' />
+ <nd ref='-33361' />
+ <nd ref='-33363' />
+ <nd ref='-33367' />
+ <nd ref='-33365' />
+ <nd ref='-33369' />
+ <nd ref='-33371' />
+ <nd ref='-33379' />
+ <nd ref='-33373' />
+ <nd ref='-33375' />
+ <nd ref='-33377' />
+ <nd ref='-33421' />
+ <nd ref='-33419' />
+ <nd ref='-33417' />
+ <nd ref='-33413' />
+ <nd ref='-33415' />
+ <nd ref='-33399' />
+ <nd ref='-33401' />
+ <nd ref='-33403' />
+ <nd ref='-33405' />
+ <nd ref='-33407' />
+ <nd ref='-33409' />
+ <nd ref='-33411' />
+ <nd ref='-33385' />
+ <nd ref='-33383' />
+ <nd ref='-33387' />
+ <nd ref='-33389' />
+ <nd ref='-33391' />
+ <nd ref='-33393' />
+ <nd ref='-33395' />
+ <nd ref='-33397' />
+ <nd ref='-40723' />
+ <nd ref='-33145' />
+ <nd ref='-33161' />
+ <nd ref='-33159' />
+ <nd ref='-33157' />
+ <nd ref='-33155' />
+ <nd ref='-33151' />
+ <nd ref='-33153' />
+ <nd ref='-33147' />
+ <nd ref='-33149' />
+ <nd ref='-33167' />
+ <nd ref='-33165' />
+ <nd ref='-33163' />
+ <nd ref='-33191' />
+ <nd ref='-33169' />
+ <nd ref='-33177' />
+ <nd ref='-33175' />
+ <nd ref='-33173' />
+ <nd ref='-33171' />
+ <nd ref='-33189' />
+ <nd ref='-33185' />
+ <nd ref='-33183' />
+ <nd ref='-33187' />
+ <nd ref='-33181' />
+ <nd ref='-33179' />
+ <nd ref='-33193' />
+ <nd ref='-33195' />
+ <nd ref='-33199' />
+ <nd ref='-33197' />
+ <nd ref='-33201' />
+ <nd ref='-33203' />
+ <nd ref='-33205' />
+ <nd ref='-33207' />
+ <nd ref='-33135' />
+ <nd ref='-33141' />
+ <nd ref='-33133' />
+ <nd ref='-33131' />
+ <nd ref='-33137' />
+ <nd ref='-33127' />
+ <nd ref='-33129' />
+ <nd ref='-33123' />
+ <nd ref='-33125' />
+ <nd ref='-33121' />
+ <nd ref='-33119' />
+ <nd ref='-33117' />
+ <nd ref='-33115' />
+ <nd ref='-33113' />
+ <nd ref='-33105' />
+ <nd ref='-33107' />
+ <nd ref='-33103' />
+ <nd ref='-33101' />
+ <nd ref='-33109' />
+ <nd ref='-33111' />
+ <nd ref='-33099' />
+ <nd ref='-33097' />
+ <nd ref='-33095' />
+ <nd ref='-33093' />
+ <nd ref='-33139' />
+ <nd ref='-33091' />
+ <nd ref='-33089' />
+ <nd ref='-33087' />
+ <nd ref='-33085' />
+ <nd ref='-33083' />
+ <nd ref='-33081' />
+ <nd ref='-33079' />
+ <nd ref='-33077' />
+ <nd ref='-33075' />
+ <nd ref='-33067' />
+ <nd ref='-33069' />
+ <nd ref='-33071' />
+ <nd ref='-33065' />
+ <nd ref='-33063' />
+ <nd ref='-33061' />
+ <nd ref='-33073' />
+ <nd ref='-33053' />
+ <nd ref='-33059' />
+ <nd ref='-33055' />
+ <nd ref='-33057' />
+ <nd ref='-33049' />
+ <nd ref='-33051' />
+ <nd ref='-33047' />
+ <nd ref='-33143' />
+ <nd ref='-33045' />
+ <nd ref='-33041' />
+ <nd ref='-33037' />
+ <nd ref='-33035' />
+ <nd ref='-33039' />
+ <nd ref='-33043' />
+ <nd ref='-33033' />
+ <nd ref='-33031' />
+ <nd ref='-33027' />
+ <nd ref='-33029' />
+ <nd ref='-33025' />
+ <nd ref='-33023' />
+ <nd ref='-33021' />
+ <nd ref='-33019' />
+ <nd ref='-33017' />
+ <nd ref='-33015' />
+ <nd ref='-33013' />
+ <nd ref='-33011' />
+ <nd ref='-33009' />
+ <nd ref='-33007' />
+ <nd ref='-33005' />
+ <nd ref='-33003' />
+ <nd ref='-33001' />
+ <nd ref='-32999' />
+ <nd ref='-32997' />
+ <nd ref='-32995' />
+ <nd ref='-32993' />
+ <nd ref='-32991' />
+ <nd ref='-32989' />
+ <nd ref='-32987' />
+ <nd ref='-32985' />
+ <nd ref='-32983' />
+ <nd ref='-32981' />
+ <nd ref='-32979' />
+ <nd ref='-32977' />
+ <nd ref='-32973' />
+ <nd ref='-32975' />
+ <nd ref='-38457' />
+ <nd ref='-42757' />
+ <nd ref='-42759' />
+ <tag k='ISO3166-1:alpha2' v='VN' />
+ <tag k='name:en' v='Vietnam' />
+ </way>
+ <way id='-57825'>
+ <nd ref='-42347' />
+ <nd ref='-42349' />
+ <nd ref='-42351' />
+ <nd ref='-41935' />
+ <nd ref='-36321' />
+ <nd ref='-42353' />
+ <nd ref='-39201' />
+ <nd ref='-39199' />
+ <nd ref='-39317' />
+ <nd ref='-39315' />
+ <nd ref='-39313' />
+ <nd ref='-36319' />
+ <nd ref='-41829' />
+ <nd ref='-34201' />
+ <nd ref='-34199' />
+ <nd ref='-34197' />
+ <nd ref='-34195' />
+ <nd ref='-34193' />
+ <nd ref='-34191' />
+ <nd ref='-34189' />
+ <nd ref='-34187' />
+ <nd ref='-34185' />
+ <nd ref='-34183' />
+ <nd ref='-34181' />
+ <nd ref='-34179' />
+ <nd ref='-41561' />
+ <nd ref='-42347' />
+ <tag k='ISO3166-1:alpha2' v='YE' />
+ <tag k='name:en' v='Yemen, Rep.' />
+ </way>
+ <way id='-57827'>
+ <nd ref='-42403' />
+ <nd ref='-48341' />
+ <nd ref='-48345' />
+ <nd ref='-48349' />
+ <nd ref='-48351' />
+ <nd ref='-48347' />
+ <nd ref='-48343' />
+ <nd ref='-48353' />
+ <nd ref='-48355' />
+ <nd ref='-48365' />
+ <nd ref='-48363' />
+ <nd ref='-48361' />
+ <nd ref='-48359' />
+ <nd ref='-48357' />
+ <nd ref='-41279' />
+ <nd ref='-42355' />
+ <nd ref='-42007' />
+ <nd ref='-34731' />
+ <nd ref='-34733' />
+ <nd ref='-34729' />
+ <nd ref='-34735' />
+ <nd ref='-42357' />
+ <nd ref='-42359' />
+ <nd ref='-42361' />
+ <nd ref='-42363' />
+ <nd ref='-42365' />
+ <nd ref='-42005' />
+ <nd ref='-42003' />
+ <nd ref='-34725' />
+ <nd ref='-42001' />
+ <nd ref='-34727' />
+ <nd ref='-41275' />
+ <nd ref='-41273' />
+ <nd ref='-41271' />
+ <nd ref='-41269' />
+ <nd ref='-41267' />
+ <nd ref='-36719' />
+ <nd ref='-41265' />
+ <nd ref='-36721' />
+ <nd ref='-36713' />
+ <nd ref='-41423' />
+ <nd ref='-41421' />
+ <nd ref='-36717' />
+ <nd ref='-36715' />
+ <nd ref='-34781' />
+ <nd ref='-34779' />
+ <nd ref='-34777' />
+ <nd ref='-34775' />
+ <nd ref='-42367' />
+ <nd ref='-37989' />
+ <nd ref='-37987' />
+ <nd ref='-42369' />
+ <nd ref='-48233' />
+ <nd ref='-48235' />
+ <nd ref='-48227' />
+ <nd ref='-48229' />
+ <nd ref='-48231' />
+ <nd ref='-48225' />
+ <nd ref='-48241' />
+ <nd ref='-48277' />
+ <nd ref='-48279' />
+ <nd ref='-48239' />
+ <nd ref='-48281' />
+ <nd ref='-48255' />
+ <nd ref='-48285' />
+ <nd ref='-48283' />
+ <nd ref='-48251' />
+ <nd ref='-48253' />
+ <nd ref='-48249' />
+ <nd ref='-48243' />
+ <nd ref='-48247' />
+ <nd ref='-48245' />
+ <nd ref='-48237' />
+ <nd ref='-48259' />
+ <nd ref='-48257' />
+ <nd ref='-48261' />
+ <nd ref='-48263' />
+ <nd ref='-48265' />
+ <nd ref='-48267' />
+ <nd ref='-48287' />
+ <nd ref='-48269' />
+ <nd ref='-48289' />
+ <nd ref='-48271' />
+ <nd ref='-48273' />
+ <nd ref='-48293' />
+ <nd ref='-48291' />
+ <nd ref='-48295' />
+ <nd ref='-48275' />
+ <nd ref='-48297' />
+ <nd ref='-48223' />
+ <nd ref='-48299' />
+ <nd ref='-48219' />
+ <nd ref='-48221' />
+ <nd ref='-48217' />
+ <nd ref='-48213' />
+ <nd ref='-48215' />
+ <nd ref='-48211' />
+ <nd ref='-48301' />
+ <nd ref='-48303' />
+ <nd ref='-48305' />
+ <nd ref='-48307' />
+ <nd ref='-48309' />
+ <nd ref='-48311' />
+ <nd ref='-48209' />
+ <nd ref='-48313' />
+ <nd ref='-48207' />
+ <nd ref='-48205' />
+ <nd ref='-48437' />
+ <nd ref='-48433' />
+ <nd ref='-48435' />
+ <nd ref='-48431' />
+ <nd ref='-42371' />
+ <nd ref='-48317' />
+ <nd ref='-48327' />
+ <nd ref='-48339' />
+ <nd ref='-48329' />
+ <nd ref='-48331' />
+ <nd ref='-48319' />
+ <nd ref='-48335' />
+ <nd ref='-48333' />
+ <nd ref='-48337' />
+ <nd ref='-48321' />
+ <nd ref='-48323' />
+ <nd ref='-48325' />
+ <nd ref='-42403' />
+ </way>
+ <way id='-57829'>
+ <nd ref='-42375' />
+ <nd ref='-31271' />
+ <nd ref='-31273' />
+ <nd ref='-31265' />
+ <nd ref='-31267' />
+ <nd ref='-31269' />
+ <nd ref='-31281' />
+ <nd ref='-31279' />
+ <nd ref='-31277' />
+ <nd ref='-31275' />
+ <nd ref='-31283' />
+ <nd ref='-31255' />
+ <nd ref='-31253' />
+ <nd ref='-31259' />
+ <nd ref='-31257' />
+ <nd ref='-31261' />
+ <nd ref='-31263' />
+ <nd ref='-31251' />
+ <nd ref='-31249' />
+ <nd ref='-31247' />
+ <nd ref='-31245' />
+ <nd ref='-31285' />
+ <nd ref='-31235' />
+ <nd ref='-31233' />
+ <nd ref='-31237' />
+ <nd ref='-31241' />
+ <nd ref='-31239' />
+ <nd ref='-31243' />
+ <nd ref='-31227' />
+ <nd ref='-31223' />
+ <nd ref='-31225' />
+ <nd ref='-31229' />
+ <nd ref='-31231' />
+ <nd ref='-31221' />
+ <nd ref='-31219' />
+ <nd ref='-31215' />
+ <nd ref='-31217' />
+ <nd ref='-41379' />
+ <nd ref='-48659' />
+ <nd ref='-48657' />
+ <nd ref='-48655' />
+ <nd ref='-48645' />
+ <nd ref='-48653' />
+ <nd ref='-48651' />
+ <nd ref='-48649' />
+ <nd ref='-48647' />
+ <nd ref='-42377' />
+ <nd ref='-48643' />
+ <nd ref='-48663' />
+ <nd ref='-48641' />
+ <nd ref='-48661' />
+ <nd ref='-48639' />
+ <nd ref='-41377' />
+ <nd ref='-41289' />
+ <nd ref='-41287' />
+ <nd ref='-48671' />
+ <nd ref='-48669' />
+ <nd ref='-48667' />
+ <nd ref='-48665' />
+ <nd ref='-42379' />
+ <nd ref='-48681' />
+ <nd ref='-48679' />
+ <nd ref='-48677' />
+ <nd ref='-48675' />
+ <nd ref='-48673' />
+ <nd ref='-42381' />
+ <nd ref='-42383' />
+ <nd ref='-42385' />
+ <nd ref='-48685' />
+ <nd ref='-48683' />
+ <nd ref='-48689' />
+ <nd ref='-48687' />
+ <nd ref='-42387' />
+ <nd ref='-48699' />
+ <nd ref='-48697' />
+ <nd ref='-48701' />
+ <nd ref='-48703' />
+ <nd ref='-48695' />
+ <nd ref='-48693' />
+ <nd ref='-48691' />
+ <nd ref='-42389' />
+ <nd ref='-41419' />
+ <nd ref='-34809' />
+ <nd ref='-41417' />
+ <nd ref='-34793' />
+ <nd ref='-34795' />
+ <nd ref='-34797' />
+ <nd ref='-34799' />
+ <nd ref='-42391' />
+ <nd ref='-34827' />
+ <nd ref='-34829' />
+ <nd ref='-42393' />
+ <nd ref='-36975' />
+ <nd ref='-36973' />
+ <nd ref='-34837' />
+ <nd ref='-34835' />
+ <nd ref='-34833' />
+ <nd ref='-34831' />
+ <nd ref='-36971' />
+ <nd ref='-33935' />
+ <nd ref='-33937' />
+ <nd ref='-33939' />
+ <nd ref='-33933' />
+ <nd ref='-33927' />
+ <nd ref='-33931' />
+ <nd ref='-33929' />
+ <nd ref='-33941' />
+ <nd ref='-33953' />
+ <nd ref='-33951' />
+ <nd ref='-33949' />
+ <nd ref='-33947' />
+ <nd ref='-33945' />
+ <nd ref='-33943' />
+ <nd ref='-38813' />
+ <nd ref='-42395' />
+ <nd ref='-33955' />
+ <nd ref='-33957' />
+ <nd ref='-33959' />
+ <nd ref='-33961' />
+ <nd ref='-33963' />
+ <nd ref='-33965' />
+ <nd ref='-38811' />
+ <nd ref='-34701' />
+ <nd ref='-34699' />
+ <nd ref='-42397' />
+ <nd ref='-34709' />
+ <nd ref='-34707' />
+ <nd ref='-34705' />
+ <nd ref='-34703' />
+ <nd ref='-38809' />
+ <nd ref='-38807' />
+ <nd ref='-31309' />
+ <nd ref='-31307' />
+ <nd ref='-31311' />
+ <nd ref='-31317' />
+ <nd ref='-31313' />
+ <nd ref='-31315' />
+ <nd ref='-31319' />
+ <nd ref='-31305' />
+ <nd ref='-31295' />
+ <nd ref='-31297' />
+ <nd ref='-31301' />
+ <nd ref='-31299' />
+ <nd ref='-31303' />
+ <nd ref='-31293' />
+ <nd ref='-31291' />
+ <nd ref='-31289' />
+ <nd ref='-31287' />
+ <nd ref='-42375' />
+ <tag k='ISO3166-1:alpha2' v='ZM' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Zambia' />
+ </way>
+ <way id='-57831'>
+ <nd ref='-41287' />
+ <nd ref='-41285' />
+ <nd ref='-48625' />
+ <nd ref='-48627' />
+ <nd ref='-48629' />
+ <nd ref='-48631' />
+ <nd ref='-48633' />
+ <nd ref='-48635' />
+ <nd ref='-48637' />
+ <nd ref='-48607' />
+ <nd ref='-48623' />
+ <nd ref='-48609' />
+ <nd ref='-48621' />
+ <nd ref='-48611' />
+ <nd ref='-48613' />
+ <nd ref='-48619' />
+ <nd ref='-48615' />
+ <nd ref='-48617' />
+ <nd ref='-41283' />
+ <nd ref='-48597' />
+ <nd ref='-48605' />
+ <nd ref='-48603' />
+ <nd ref='-48599' />
+ <nd ref='-48601' />
+ <nd ref='-48591' />
+ <nd ref='-48593' />
+ <nd ref='-48595' />
+ <nd ref='-48589' />
+ <nd ref='-48587' />
+ <nd ref='-48585' />
+ <nd ref='-48583' />
+ <nd ref='-48581' />
+ <nd ref='-48579' />
+ <nd ref='-48577' />
+ <nd ref='-48575' />
+ <nd ref='-48573' />
+ <nd ref='-48571' />
+ <nd ref='-48567' />
+ <nd ref='-48569' />
+ <nd ref='-48565' />
+ <nd ref='-42399' />
+ <nd ref='-48563' />
+ <nd ref='-48561' />
+ <nd ref='-48557' />
+ <nd ref='-48559' />
+ <nd ref='-48547' />
+ <nd ref='-48549' />
+ <nd ref='-48551' />
+ <nd ref='-48555' />
+ <nd ref='-48553' />
+ <nd ref='-48545' />
+ <nd ref='-48543' />
+ <nd ref='-48541' />
+ <nd ref='-48539' />
+ <nd ref='-48537' />
+ <nd ref='-42401' />
+ <nd ref='-41281' />
+ <nd ref='-48315' />
+ <nd ref='-42403' />
+ <nd ref='-48325' />
+ <nd ref='-48323' />
+ <nd ref='-48321' />
+ <nd ref='-48337' />
+ <nd ref='-48333' />
+ <nd ref='-48335' />
+ <nd ref='-48319' />
+ <nd ref='-48331' />
+ <nd ref='-48329' />
+ <nd ref='-48339' />
+ <nd ref='-48327' />
+ <nd ref='-48317' />
+ <nd ref='-42371' />
+ <nd ref='-48429' />
+ <nd ref='-48413' />
+ <nd ref='-48421' />
+ <nd ref='-48419' />
+ <nd ref='-48423' />
+ <nd ref='-48415' />
+ <nd ref='-48425' />
+ <nd ref='-48417' />
+ <nd ref='-48427' />
+ <nd ref='-48405' />
+ <nd ref='-48407' />
+ <nd ref='-48411' />
+ <nd ref='-48409' />
+ <nd ref='-48401' />
+ <nd ref='-48403' />
+ <nd ref='-48399' />
+ <nd ref='-48397' />
+ <nd ref='-48395' />
+ <nd ref='-48367' />
+ <nd ref='-48385' />
+ <nd ref='-48381' />
+ <nd ref='-48383' />
+ <nd ref='-48369' />
+ <nd ref='-48379' />
+ <nd ref='-48377' />
+ <nd ref='-48375' />
+ <nd ref='-48373' />
+ <nd ref='-48371' />
+ <nd ref='-48393' />
+ <nd ref='-48387' />
+ <nd ref='-48389' />
+ <nd ref='-48391' />
+ <nd ref='-34801' />
+ <nd ref='-41419' />
+ <nd ref='-42389' />
+ <nd ref='-48691' />
+ <nd ref='-48693' />
+ <nd ref='-48695' />
+ <nd ref='-48703' />
+ <nd ref='-48701' />
+ <nd ref='-48697' />
+ <nd ref='-48699' />
+ <nd ref='-42387' />
+ <nd ref='-48687' />
+ <nd ref='-48689' />
+ <nd ref='-48683' />
+ <nd ref='-48685' />
+ <nd ref='-42385' />
+ <nd ref='-42383' />
+ <nd ref='-42381' />
+ <nd ref='-48673' />
+ <nd ref='-48675' />
+ <nd ref='-48677' />
+ <nd ref='-48679' />
+ <nd ref='-48681' />
+ <nd ref='-42379' />
+ <nd ref='-48665' />
+ <nd ref='-48667' />
+ <nd ref='-48669' />
+ <nd ref='-48671' />
+ <nd ref='-41287' />
+ <tag k='ISO3166-1:alpha2' v='ZW' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Zimbabwe' />
+ </way>
+ <way id='-57833'>
+ <nd ref='-42305' />
+ <nd ref='-42555' />
+ <nd ref='-38395' />
+ <nd ref='-43231' />
+ <nd ref='-43233' />
+ <nd ref='-43237' />
+ <nd ref='-43235' />
+ <nd ref='-43239' />
+ <nd ref='-43243' />
+ <nd ref='-43241' />
+ <nd ref='-43249' />
+ <nd ref='-43251' />
+ <nd ref='-43247' />
+ <nd ref='-43245' />
+ <nd ref='-43255' />
+ <nd ref='-43259' />
+ <nd ref='-43263' />
+ <nd ref='-43261' />
+ <nd ref='-43267' />
+ <nd ref='-43269' />
+ <nd ref='-43265' />
+ <nd ref='-43257' />
+ <nd ref='-43271' />
+ <nd ref='-43275' />
+ <nd ref='-43277' />
+ <nd ref='-43281' />
+ <nd ref='-43283' />
+ <nd ref='-43279' />
+ <nd ref='-43273' />
+ <nd ref='-43253' />
+ <nd ref='-43285' />
+ <nd ref='-43295' />
+ <nd ref='-43297' />
+ <nd ref='-43287' />
+ <nd ref='-43289' />
+ <nd ref='-43293' />
+ <nd ref='-43291' />
+ <nd ref='-42453' />
+ <nd ref='-42451' />
+ <nd ref='-42449' />
+ <nd ref='-42447' />
+ <nd ref='-42445' />
+ <nd ref='-42443' />
+ <nd ref='-42441' />
+ <nd ref='-42439' />
+ <nd ref='-42547' />
+ <nd ref='-42549' />
+ <nd ref='-42551' />
+ <nd ref='-42553' />
+ <nd ref='-42305' />
+ <tag k='ISO3166-2' v='US-AK' />
+ <tag k='name:en' v='Alaska' />
+ </way>
+ <way id='-57835'>
+ <nd ref='-41045' />
+ <nd ref='-43445' />
+ <nd ref='-43447' />
+ <nd ref='-43443' />
+ <nd ref='-43441' />
+ <nd ref='-43437' />
+ <nd ref='-43435' />
+ <nd ref='-43433' />
+ <nd ref='-43439' />
+ <nd ref='-43431' />
+ <nd ref='-43429' />
+ <nd ref='-41043' />
+ <nd ref='-43427' />
+ <nd ref='-41041' />
+ <nd ref='-43423' />
+ <nd ref='-43425' />
+ <nd ref='-43421' />
+ <nd ref='-43419' />
+ <nd ref='-43417' />
+ <nd ref='-41039' />
+ <nd ref='-41037' />
+ <nd ref='-41035' />
+ <nd ref='-41033' />
+ <nd ref='-41031' />
+ <nd ref='-41029' />
+ <nd ref='-43415' />
+ <nd ref='-41027' />
+ <nd ref='-41025' />
+ <nd ref='-41023' />
+ <nd ref='-41021' />
+ <nd ref='-43413' />
+ <nd ref='-41019' />
+ <nd ref='-43411' />
+ <nd ref='-43409' />
+ <nd ref='-41017' />
+ <nd ref='-43407' />
+ <nd ref='-41015' />
+ <nd ref='-41013' />
+ <nd ref='-41011' />
+ <nd ref='-43405' />
+ <nd ref='-41009' />
+ <nd ref='-41007' />
+ <nd ref='-41005' />
+ <nd ref='-54625' />
+ <nd ref='-41003' />
+ <nd ref='-41083' />
+ <nd ref='-36821' />
+ <nd ref='-36819' />
+ <nd ref='-36823' />
+ <nd ref='-36817' />
+ <nd ref='-41081' />
+ <nd ref='-41079' />
+ <nd ref='-42435' />
+ <nd ref='-42433' />
+ <nd ref='-54813' />
+ <nd ref='-56825' />
+ <nd ref='-42419' />
+ <nd ref='-42421' />
+ <nd ref='-42423' />
+ <nd ref='-42425' />
+ <nd ref='-42427' />
+ <nd ref='-42429' />
+ <nd ref='-42431' />
+ <nd ref='-55155' />
+ <nd ref='-55153' />
+ <nd ref='-54197' />
+ <nd ref='-54205' />
+ <nd ref='-56307' />
+ <nd ref='-54209' />
+ <nd ref='-56233' />
+ <nd ref='-38393' />
+ <nd ref='-38391' />
+ <nd ref='-43301' />
+ <nd ref='-38389' />
+ <nd ref='-38387' />
+ <nd ref='-43299' />
+ <nd ref='-38385' />
+ <nd ref='-38383' />
+ <nd ref='-38381' />
+ <nd ref='-38379' />
+ <nd ref='-43303' />
+ <nd ref='-38377' />
+ <nd ref='-38375' />
+ <nd ref='-38373' />
+ <nd ref='-38371' />
+ <nd ref='-38369' />
+ <nd ref='-38367' />
+ <nd ref='-38365' />
+ <nd ref='-43305' />
+ <nd ref='-38363' />
+ <nd ref='-38361' />
+ <nd ref='-43307' />
+ <nd ref='-43309' />
+ <nd ref='-43311' />
+ <nd ref='-38359' />
+ <nd ref='-38357' />
+ <nd ref='-38355' />
+ <nd ref='-38353' />
+ <nd ref='-43313' />
+ <nd ref='-38351' />
+ <nd ref='-38349' />
+ <nd ref='-38347' />
+ <nd ref='-38345' />
+ <nd ref='-38343' />
+ <nd ref='-38341' />
+ <nd ref='-43315' />
+ <nd ref='-43317' />
+ <nd ref='-38339' />
+ <nd ref='-38337' />
+ <nd ref='-38335' />
+ <nd ref='-38333' />
+ <nd ref='-38331' />
+ <nd ref='-43319' />
+ <nd ref='-43321' />
+ <nd ref='-38329' />
+ <nd ref='-38327' />
+ <nd ref='-38325' />
+ <nd ref='-38323' />
+ <nd ref='-38321' />
+ <nd ref='-38319' />
+ <nd ref='-43323' />
+ <nd ref='-43325' />
+ <nd ref='-38317' />
+ <nd ref='-43327' />
+ <nd ref='-38315' />
+ <nd ref='-43329' />
+ <nd ref='-38313' />
+ <nd ref='-38311' />
+ <nd ref='-38309' />
+ <nd ref='-38307' />
+ <nd ref='-38305' />
+ <nd ref='-38303' />
+ <nd ref='-38301' />
+ <nd ref='-38299' />
+ <nd ref='-38297' />
+ <nd ref='-38295' />
+ <nd ref='-38293' />
+ <nd ref='-38291' />
+ <nd ref='-38289' />
+ <nd ref='-38287' />
+ <nd ref='-38285' />
+ <nd ref='-43331' />
+ <nd ref='-38283' />
+ <nd ref='-38281' />
+ <nd ref='-38279' />
+ <nd ref='-38277' />
+ <nd ref='-38275' />
+ <nd ref='-38273' />
+ <nd ref='-38271' />
+ <nd ref='-38269' />
+ <nd ref='-38267' />
+ <nd ref='-38265' />
+ <nd ref='-38263' />
+ <nd ref='-38261' />
+ <nd ref='-38259' />
+ <nd ref='-38257' />
+ <nd ref='-38255' />
+ <nd ref='-38253' />
+ <nd ref='-38251' />
+ <nd ref='-38249' />
+ <nd ref='-38247' />
+ <nd ref='-38245' />
+ <nd ref='-38243' />
+ <nd ref='-38241' />
+ <nd ref='-38239' />
+ <nd ref='-38237' />
+ <nd ref='-38235' />
+ <nd ref='-38233' />
+ <nd ref='-38231' />
+ <nd ref='-38229' />
+ <nd ref='-38227' />
+ <nd ref='-38225' />
+ <nd ref='-38223' />
+ <nd ref='-38221' />
+ <nd ref='-38219' />
+ <nd ref='-38217' />
+ <nd ref='-38215' />
+ <nd ref='-38213' />
+ <nd ref='-38211' />
+ <nd ref='-38209' />
+ <nd ref='-38207' />
+ <nd ref='-38205' />
+ <nd ref='-38203' />
+ <nd ref='-38201' />
+ <nd ref='-38199' />
+ <nd ref='-43333' />
+ <nd ref='-43335' />
+ <nd ref='-43337' />
+ <nd ref='-38197' />
+ <nd ref='-38195' />
+ <nd ref='-38193' />
+ <nd ref='-38191' />
+ <nd ref='-38189' />
+ <nd ref='-38187' />
+ <nd ref='-38185' />
+ <nd ref='-38183' />
+ <nd ref='-38181' />
+ <nd ref='-38179' />
+ <nd ref='-38177' />
+ <nd ref='-38175' />
+ <nd ref='-38173' />
+ <nd ref='-38171' />
+ <nd ref='-56119' />
+ <nd ref='-38169' />
+ <nd ref='-38167' />
+ <nd ref='-38165' />
+ <nd ref='-56709' />
+ <nd ref='-56631' />
+ <nd ref='-38163' />
+ <nd ref='-38161' />
+ <nd ref='-38159' />
+ <nd ref='-43353' />
+ <nd ref='-43351' />
+ <nd ref='-43349' />
+ <nd ref='-43347' />
+ <nd ref='-43343' />
+ <nd ref='-43345' />
+ <nd ref='-43341' />
+ <nd ref='-43339' />
+ <nd ref='-43357' />
+ <nd ref='-43355' />
+ <nd ref='-43359' />
+ <nd ref='-43361' />
+ <nd ref='-43365' />
+ <nd ref='-43363' />
+ <nd ref='-43369' />
+ <nd ref='-43367' />
+ <nd ref='-38157' />
+ <nd ref='-38155' />
+ <nd ref='-38153' />
+ <nd ref='-38151' />
+ <nd ref='-38149' />
+ <nd ref='-38147' />
+ <nd ref='-38145' />
+ <nd ref='-38143' />
+ <nd ref='-38141' />
+ <nd ref='-38139' />
+ <nd ref='-38137' />
+ <nd ref='-38135' />
+ <nd ref='-38133' />
+ <nd ref='-38131' />
+ <nd ref='-38129' />
+ <nd ref='-38127' />
+ <nd ref='-38125' />
+ <nd ref='-38123' />
+ <nd ref='-54389' />
+ <nd ref='-56657' />
+ <nd ref='-38121' />
+ <nd ref='-38119' />
+ <nd ref='-38117' />
+ <nd ref='-38115' />
+ <nd ref='-38113' />
+ <nd ref='-38111' />
+ <nd ref='-38109' />
+ <nd ref='-38107' />
+ <nd ref='-38105' />
+ <nd ref='-38103' />
+ <nd ref='-38101' />
+ <nd ref='-43371' />
+ <nd ref='-43373' />
+ <nd ref='-38099' />
+ <nd ref='-43375' />
+ <nd ref='-43377' />
+ <nd ref='-38097' />
+ <nd ref='-38095' />
+ <nd ref='-43379' />
+ <nd ref='-43381' />
+ <nd ref='-43383' />
+ <nd ref='-43385' />
+ <nd ref='-38093' />
+ <nd ref='-43387' />
+ <nd ref='-43389' />
+ <nd ref='-38091' />
+ <nd ref='-38089' />
+ <nd ref='-38087' />
+ <nd ref='-38085' />
+ <nd ref='-38083' />
+ <nd ref='-43391' />
+ <nd ref='-43393' />
+ <nd ref='-38081' />
+ <nd ref='-38079' />
+ <nd ref='-38077' />
+ <nd ref='-38075' />
+ <nd ref='-38073' />
+ <nd ref='-54415' />
+ <nd ref='-38071' />
+ <nd ref='-38069' />
+ <nd ref='-43395' />
+ <nd ref='-43397' />
+ <nd ref='-38067' />
+ <nd ref='-38065' />
+ <nd ref='-38063' />
+ <nd ref='-38061' />
+ <nd ref='-38059' />
+ <nd ref='-43399' />
+ <nd ref='-38057' />
+ <nd ref='-38055' />
+ <nd ref='-36305' />
+ <nd ref='-38053' />
+ <nd ref='-38051' />
+ <nd ref='-38049' />
+ <nd ref='-38047' />
+ <nd ref='-36303' />
+ <nd ref='-38045' />
+ <nd ref='-38043' />
+ <nd ref='-38041' />
+ <nd ref='-38039' />
+ <nd ref='-38037' />
+ <nd ref='-38035' />
+ <nd ref='-38033' />
+ <nd ref='-38031' />
+ <nd ref='-36301' />
+ <nd ref='-38029' />
+ <nd ref='-38027' />
+ <nd ref='-38025' />
+ <nd ref='-38023' />
+ <nd ref='-38021' />
+ <nd ref='-38019' />
+ <nd ref='-42457' />
+ <nd ref='-42463' />
+ <nd ref='-42459' />
+ <nd ref='-42461' />
+ <nd ref='-38017' />
+ <nd ref='-57169' />
+ <nd ref='-57167' />
+ <nd ref='-56113' />
+ <nd ref='-56111' />
+ <nd ref='-57165' />
+ <nd ref='-56543' />
+ <nd ref='-54873' />
+ <nd ref='-55911' />
+ <nd ref='-57171' />
+ <nd ref='-57173' />
+ <nd ref='-56693' />
+ <nd ref='-55083' />
+ <nd ref='-57175' />
+ <nd ref='-42465' />
+ <nd ref='-42565' />
+ <nd ref='-42467' />
+ <nd ref='-54919' />
+ <nd ref='-54623' />
+ <nd ref='-57007' />
+ <nd ref='-57005' />
+ <nd ref='-57009' />
+ <nd ref='-36451' />
+ <nd ref='-41045' />
+ </way>
+ <way id='-57837'>
+ <nd ref='-42469' />
+ <nd ref='-42409' />
+ <nd ref='-42411' />
+ <nd ref='-42415' />
+ <nd ref='-42413' />
+ <nd ref='-42417' />
+ <nd ref='-54473' />
+ <nd ref='-42471' />
+ <nd ref='-42563' />
+ <nd ref='-42561' />
+ <nd ref='-57405' />
+ <nd ref='-42473' />
+ <nd ref='-42469' />
+ <tag k='ISO3166-1:alpha2' v='GL' />
+ <tag k='name:en' v='Greenland' />
+ <tag k='note' v='not in EU' />
+ </way>
+ <way id='-57839'>
+ <nd ref='-57409' />
+ <nd ref='-42497' />
+ <nd ref='-42499' />
+ <nd ref='-42501' />
+ <nd ref='-42503' />
+ <nd ref='-53709' />
+ <nd ref='-57409' />
+ </way>
+ <way id='-57841'>
+ <nd ref='-42505' />
+ <nd ref='-42507' />
+ <nd ref='-42509' />
+ <nd ref='-42511' />
+ <nd ref='-42513' />
+ <nd ref='-40011' />
+ <nd ref='-42505' />
+ <tag k='ISO3166-1:alpha2' v='LK' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Sri Lanka' />
+ </way>
+ <way id='-57843'>
+ <nd ref='-42515' />
+ <nd ref='-42517' />
+ <nd ref='-42519' />
+ <nd ref='-42521' />
+ <nd ref='-42515' />
+ </way>
+ <way id='-57845'>
+ <nd ref='-39209' />
+ <nd ref='-39207' />
+ <nd ref='-42667' />
+ <nd ref='-57349' />
+ <nd ref='-57353' />
+ <nd ref='-42545' />
+ <nd ref='-41519' />
+ <nd ref='-35361' />
+ <nd ref='-35363' />
+ <nd ref='-35365' />
+ <nd ref='-35367' />
+ <nd ref='-35369' />
+ <nd ref='-35371' />
+ <nd ref='-35373' />
+ <nd ref='-41521' />
+ <nd ref='-35359' />
+ <nd ref='-35357' />
+ <nd ref='-35355' />
+ <nd ref='-39581' />
+ <nd ref='-35353' />
+ <nd ref='-35351' />
+ <nd ref='-35349' />
+ <nd ref='-35347' />
+ <nd ref='-35343' />
+ <nd ref='-35345' />
+ <nd ref='-35341' />
+ <nd ref='-35339' />
+ <nd ref='-35337' />
+ <nd ref='-35335' />
+ <nd ref='-35333' />
+ <nd ref='-35331' />
+ <nd ref='-35323' />
+ <nd ref='-35321' />
+ <nd ref='-35319' />
+ <nd ref='-35317' />
+ <nd ref='-35315' />
+ <nd ref='-35313' />
+ <nd ref='-35311' />
+ <nd ref='-35309' />
+ <nd ref='-35307' />
+ <nd ref='-35305' />
+ <nd ref='-35303' />
+ <nd ref='-35301' />
+ <nd ref='-35235' />
+ <nd ref='-35237' />
+ <nd ref='-35299' />
+ <nd ref='-39603' />
+ <nd ref='-35233' />
+ <nd ref='-39601' />
+ <nd ref='-39599' />
+ <nd ref='-39597' />
+ <nd ref='-39595' />
+ <nd ref='-39593' />
+ <nd ref='-41523' />
+ <nd ref='-35167' />
+ <nd ref='-35169' />
+ <nd ref='-35171' />
+ <nd ref='-35173' />
+ <nd ref='-35175' />
+ <nd ref='-35177' />
+ <nd ref='-35165' />
+ <nd ref='-35163' />
+ <nd ref='-35161' />
+ <nd ref='-35159' />
+ <nd ref='-35157' />
+ <nd ref='-41525' />
+ <nd ref='-35151' />
+ <nd ref='-35153' />
+ <nd ref='-35155' />
+ <nd ref='-35147' />
+ <nd ref='-35143' />
+ <nd ref='-35145' />
+ <nd ref='-35149' />
+ <nd ref='-35139' />
+ <nd ref='-35137' />
+ <nd ref='-35135' />
+ <nd ref='-35141' />
+ <nd ref='-35133' />
+ <nd ref='-41527' />
+ <nd ref='-41529' />
+ <nd ref='-41531' />
+ <nd ref='-41533' />
+ <nd ref='-41535' />
+ <nd ref='-35125' />
+ <nd ref='-35127' />
+ <nd ref='-35129' />
+ <nd ref='-35131' />
+ <nd ref='-35123' />
+ <nd ref='-35121' />
+ <nd ref='-35119' />
+ <nd ref='-41537' />
+ <nd ref='-35115' />
+ <nd ref='-35113' />
+ <nd ref='-35117' />
+ <nd ref='-35111' />
+ <nd ref='-35109' />
+ <nd ref='-35107' />
+ <nd ref='-35105' />
+ <nd ref='-35103' />
+ <nd ref='-35091' />
+ <nd ref='-35093' />
+ <nd ref='-35095' />
+ <nd ref='-35097' />
+ <nd ref='-35099' />
+ <nd ref='-35101' />
+ <nd ref='-41539' />
+ <nd ref='-41541' />
+ <nd ref='-43029' />
+ <nd ref='-43031' />
+ <nd ref='-43033' />
+ <nd ref='-43035' />
+ <nd ref='-39209' />
+ <tag k='name:en' v='Metropolitan Norway' />
+ </way>
+ <way id='-57847'>
+ <nd ref='-42557' />
+ <nd ref='-42559' />
+ <nd ref='-57351' />
+ <nd ref='-42563' />
+ <nd ref='-42557' />
+ <tag k='ISO3166-1:alpha2' v='IS' />
+ <tag k='name:en' v='Iceland' />
+ </way>
+ <way id='-57849'>
+ <nd ref='-42565' />
+ <nd ref='-42567' />
+ <nd ref='-42569' />
+ <nd ref='-42571' />
+ <nd ref='-42573' />
+ <nd ref='-42575' />
+ <nd ref='-42465' />
+ <nd ref='-42565' />
+ <tag k='ISO3166-1:alpha2' v='BS' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Bahamas, The' />
+ </way>
+ <way id='-57851'>
+ <nd ref='-36367' />
+ <nd ref='-42581' />
+ <nd ref='-42583' />
+ <nd ref='-42579' />
+ <nd ref='-42577' />
+ <nd ref='-53669' />
+ <nd ref='-36367' />
+ <tag k='ISO3166-1:alpha2' v='VI' />
+ <tag k='ISO3166-2' v='US-VI' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='United States Virgin Islands' />
+ <tag k='note' v='The U.S. Virgin Islands is the only U.S. jurisdiction which drives on the left' />
+ </way>
+ <way id='-57853'>
+ <nd ref='-42585' />
+ <nd ref='-42589' />
+ <nd ref='-42591' />
+ <nd ref='-42593' />
+ <nd ref='-42585' />
+ <tag k='ISO3166-1:alpha2' v='MV' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Maldives' />
+ </way>
+ <way id='-57855'>
+ <nd ref='-42595' />
+ <nd ref='-42597' />
+ <nd ref='-53877' />
+ <nd ref='-42599' />
+ <nd ref='-53873' />
+ <nd ref='-42601' />
+ <nd ref='-42595' />
+ <tag k='ISO3166-1:alpha2' v='IO' />
+ <tag k='driving_side' v='right' />
+ <tag k='name:en' v='British Indian Ocean Territory' />
+ </way>
+ <way id='-57857'>
+ <nd ref='-42603' />
+ <nd ref='-42605' />
+ <nd ref='-42607' />
+ <nd ref='-42603' />
+ <tag k='name:en' v='Crozet Islands, Kerguelen Islands, Saint-Paul and New-Amsterdam Islands' />
+ </way>
+ <way id='-57859'>
+ <nd ref='-42609' />
+ <nd ref='-42611' />
+ <nd ref='-42613' />
+ <nd ref='-42615' />
+ <nd ref='-42609' />
+ <tag k='ISO3166-1:alpha2' v='RE' />
+ <tag k='ISO3166-2' v='FR-RE' />
+ <tag k='name:en' v='Réunion' />
+ </way>
+ <way id='-57861'>
+ <nd ref='-42611' />
+ <nd ref='-42621' />
+ <nd ref='-42617' />
+ <nd ref='-42619' />
+ <nd ref='-42613' />
+ <nd ref='-42611' />
+ <tag k='ISO3166-1:alpha2' v='MU' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Mauritius' />
+ </way>
+ <way id='-57863'>
+ <nd ref='-42623' />
+ <nd ref='-42625' />
+ <nd ref='-42627' />
+ <nd ref='-42633' />
+ <nd ref='-42643' />
+ <nd ref='-42629' />
+ <nd ref='-42631' />
+ <nd ref='-42623' />
+ <tag k='ISO3166-1:alpha2' v='SC' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Seychelles' />
+ </way>
+ <way id='-57865'>
+ <nd ref='-42635' />
+ <nd ref='-42637' />
+ <nd ref='-42639' />
+ <nd ref='-42641' />
+ <nd ref='-42635' />
+ <tag k='ISO3166-1:alpha2' v='KM' />
+ <tag k='name:en' v='Comoros' />
+ </way>
+ <way id='-57867'>
+ <nd ref='-42669' />
+ <nd ref='-42671' />
+ <nd ref='-42673' />
+ <nd ref='-42669' />
+ <tag k='ISO3166-1:alpha2' v='FO' />
+ <tag k='name:en' v='Faroe Islands' />
+ <tag k='note' v='not in EU' />
+ </way>
+ <way id='-57869'>
+ <nd ref='-42675' />
+ <nd ref='-42551' />
+ <nd ref='-42553' />
+ <nd ref='-42305' />
+ <nd ref='-42555' />
+ <nd ref='-42677' />
+ <nd ref='-42675' />
+ </way>
+ <way id='-57871'>
+ <nd ref='-42691' />
+ <nd ref='-42693' />
+ <nd ref='-38399' />
+ <nd ref='-38401' />
+ <nd ref='-42691' />
+ <tag k='ISO3166-1:alpha2' v='PM' />
+ <tag k='ISO3166-2' v='FR-PM' />
+ <tag k='name:en' v='Saint Pierre and Miquelon' />
+ </way>
+ <way id='-57873'>
+ <nd ref='-42531' />
+ <nd ref='-42711' />
+ <nd ref='-53601' />
+ <nd ref='-42713' />
+ <nd ref='-42715' />
+ <nd ref='-42717' />
+ <nd ref='-42719' />
+ <nd ref='-42721' />
+ <nd ref='-42535' />
+ <nd ref='-42525' />
+ <nd ref='-42527' />
+ <nd ref='-42529' />
+ <nd ref='-42531' />
+ <tag k='ISO3166-1:alpha2' v='JP' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Japan' />
+ </way>
+ <way id='-57875'>
+ <nd ref='-41725' />
+ <nd ref='-31737' />
+ <nd ref='-31743' />
+ <nd ref='-31741' />
+ <nd ref='-31739' />
+ <nd ref='-31745' />
+ <nd ref='-31709' />
+ <nd ref='-31711' />
+ <nd ref='-31713' />
+ <nd ref='-31715' />
+ <nd ref='-31717' />
+ <nd ref='-31733' />
+ <nd ref='-31731' />
+ <nd ref='-31723' />
+ <nd ref='-31721' />
+ <nd ref='-31719' />
+ <nd ref='-31725' />
+ <nd ref='-31727' />
+ <nd ref='-31729' />
+ <nd ref='-31735' />
+ <nd ref='-37299' />
+ <nd ref='-47817' />
+ <nd ref='-47801' />
+ <nd ref='-47803' />
+ <nd ref='-47809' />
+ <nd ref='-47811' />
+ <nd ref='-47813' />
+ <nd ref='-47815' />
+ <nd ref='-47807' />
+ <nd ref='-47805' />
+ <nd ref='-37265' />
+ <nd ref='-47795' />
+ <nd ref='-47797' />
+ <nd ref='-47799' />
+ <nd ref='-47793' />
+ <nd ref='-47787' />
+ <nd ref='-47789' />
+ <nd ref='-47791' />
+ <nd ref='-47785' />
+ <nd ref='-37267' />
+ <nd ref='-41723' />
+ <nd ref='-42987' />
+ <nd ref='-40545' />
+ <nd ref='-40547' />
+ <nd ref='-45387' />
+ <nd ref='-45389' />
+ <nd ref='-45391' />
+ <nd ref='-45385' />
+ <nd ref='-45393' />
+ <nd ref='-40549' />
+ <nd ref='-45395' />
+ <nd ref='-40551' />
+ <nd ref='-45397' />
+ <nd ref='-45399' />
+ <nd ref='-45403' />
+ <nd ref='-45401' />
+ <nd ref='-40553' />
+ <nd ref='-40555' />
+ <nd ref='-45407' />
+ <nd ref='-45409' />
+ <nd ref='-45411' />
+ <nd ref='-45405' />
+ <nd ref='-40557' />
+ <nd ref='-40559' />
+ <nd ref='-45413' />
+ <nd ref='-45415' />
+ <nd ref='-45417' />
+ <nd ref='-45419' />
+ <nd ref='-40561' />
+ <nd ref='-45421' />
+ <nd ref='-45423' />
+ <nd ref='-40563' />
+ <nd ref='-45425' />
+ <nd ref='-45427' />
+ <nd ref='-45437' />
+ <nd ref='-45435' />
+ <nd ref='-45429' />
+ <nd ref='-45431' />
+ <nd ref='-45433' />
+ <nd ref='-45439' />
+ <nd ref='-45441' />
+ <nd ref='-45443' />
+ <nd ref='-45445' />
+ <nd ref='-45447' />
+ <nd ref='-45449' />
+ <nd ref='-45451' />
+ <nd ref='-45453' />
+ <nd ref='-45455' />
+ <nd ref='-40565' />
+ <nd ref='-45457' />
+ <nd ref='-45459' />
+ <nd ref='-45461' />
+ <nd ref='-45463' />
+ <nd ref='-45465' />
+ <nd ref='-45467' />
+ <nd ref='-40567' />
+ <nd ref='-45469' />
+ <nd ref='-45471' />
+ <nd ref='-45473' />
+ <nd ref='-45475' />
+ <nd ref='-45477' />
+ <nd ref='-45479' />
+ <nd ref='-45481' />
+ <nd ref='-40569' />
+ <nd ref='-45483' />
+ <nd ref='-45485' />
+ <nd ref='-45487' />
+ <nd ref='-45489' />
+ <nd ref='-45491' />
+ <nd ref='-40571' />
+ <nd ref='-40573' />
+ <nd ref='-40575' />
+ <nd ref='-45493' />
+ <nd ref='-45501' />
+ <nd ref='-45503' />
+ <nd ref='-45499' />
+ <nd ref='-45497' />
+ <nd ref='-45495' />
+ <nd ref='-45505' />
+ <nd ref='-45517' />
+ <nd ref='-45515' />
+ <nd ref='-45513' />
+ <nd ref='-45507' />
+ <nd ref='-45509' />
+ <nd ref='-45511' />
+ <nd ref='-45519' />
+ <nd ref='-45521' />
+ <nd ref='-45523' />
+ <nd ref='-45525' />
+ <nd ref='-45527' />
+ <nd ref='-45529' />
+ <nd ref='-45531' />
+ <nd ref='-45533' />
+ <nd ref='-40577' />
+ <nd ref='-45535' />
+ <nd ref='-45537' />
+ <nd ref='-45539' />
+ <nd ref='-45541' />
+ <nd ref='-45543' />
+ <nd ref='-45545' />
+ <nd ref='-45555' />
+ <nd ref='-45553' />
+ <nd ref='-45547' />
+ <nd ref='-45549' />
+ <nd ref='-45551' />
+ <nd ref='-45557' />
+ <nd ref='-45559' />
+ <nd ref='-45561' />
+ <nd ref='-45563' />
+ <nd ref='-40579' />
+ <nd ref='-45565' />
+ <nd ref='-45567' />
+ <nd ref='-45569' />
+ <nd ref='-45571' />
+ <nd ref='-45573' />
+ <nd ref='-40581' />
+ <nd ref='-40583' />
+ <nd ref='-45575' />
+ <nd ref='-45577' />
+ <nd ref='-40585' />
+ <nd ref='-40587' />
+ <nd ref='-40589' />
+ <nd ref='-40591' />
+ <nd ref='-40593' />
+ <nd ref='-45579' />
+ <nd ref='-40389' />
+ <nd ref='-40391' />
+ <nd ref='-45581' />
+ <nd ref='-45583' />
+ <nd ref='-40393' />
+ <nd ref='-45587' />
+ <nd ref='-45589' />
+ <nd ref='-45591' />
+ <nd ref='-45585' />
+ <nd ref='-45593' />
+ <nd ref='-45595' />
+ <nd ref='-45597' />
+ <nd ref='-45599' />
+ <nd ref='-45601' />
+ <nd ref='-45603' />
+ <nd ref='-45605' />
+ <nd ref='-45607' />
+ <nd ref='-45609' />
+ <nd ref='-40395' />
+ <nd ref='-40397' />
+ <nd ref='-45611' />
+ <nd ref='-45613' />
+ <nd ref='-45615' />
+ <nd ref='-40399' />
+ <nd ref='-40401' />
+ <nd ref='-43053' />
+ <nd ref='-43055' />
+ <nd ref='-45617' />
+ <nd ref='-45619' />
+ <nd ref='-45621' />
+ <nd ref='-45623' />
+ <nd ref='-45625' />
+ <nd ref='-45627' />
+ <nd ref='-45629' />
+ <nd ref='-45631' />
+ <nd ref='-45633' />
+ <nd ref='-45635' />
+ <nd ref='-45637' />
+ <nd ref='-45639' />
+ <nd ref='-45641' />
+ <nd ref='-45643' />
+ <nd ref='-45645' />
+ <nd ref='-45647' />
+ <nd ref='-45649' />
+ <nd ref='-45651' />
+ <nd ref='-45653' />
+ <nd ref='-40403' />
+ <nd ref='-40405' />
+ <nd ref='-38583' />
+ <nd ref='-45657' />
+ <nd ref='-45655' />
+ <nd ref='-41253' />
+ <nd ref='-45659' />
+ <nd ref='-45661' />
+ <nd ref='-41721' />
+ <nd ref='-41255' />
+ <nd ref='-31447' />
+ <nd ref='-31449' />
+ <nd ref='-31445' />
+ <nd ref='-31443' />
+ <nd ref='-41257' />
+ <nd ref='-31437' />
+ <nd ref='-31439' />
+ <nd ref='-31441' />
+ <nd ref='-41259' />
+ <nd ref='-31435' />
+ <nd ref='-31429' />
+ <nd ref='-31431' />
+ <nd ref='-31427' />
+ <nd ref='-31425' />
+ <nd ref='-31423' />
+ <nd ref='-31421' />
+ <nd ref='-31419' />
+ <nd ref='-31433' />
+ <nd ref='-31411' />
+ <nd ref='-31409' />
+ <nd ref='-31407' />
+ <nd ref='-31415' />
+ <nd ref='-31413' />
+ <nd ref='-31417' />
+ <nd ref='-31397' />
+ <nd ref='-31399' />
+ <nd ref='-31401' />
+ <nd ref='-31403' />
+ <nd ref='-31405' />
+ <nd ref='-41261' />
+ <nd ref='-41263' />
+ <nd ref='-31395' />
+ <nd ref='-31393' />
+ <nd ref='-31389' />
+ <nd ref='-31391' />
+ <nd ref='-31385' />
+ <nd ref='-31387' />
+ <nd ref='-31383' />
+ <nd ref='-31381' />
+ <nd ref='-41719' />
+ <nd ref='-31379' />
+ <nd ref='-31377' />
+ <nd ref='-31375' />
+ <nd ref='-41183' />
+ <nd ref='-31373' />
+ <nd ref='-31371' />
+ <nd ref='-31369' />
+ <nd ref='-31365' />
+ <nd ref='-31367' />
+ <nd ref='-31363' />
+ <nd ref='-41185' />
+ <nd ref='-41187' />
+ <nd ref='-31361' />
+ <nd ref='-31359' />
+ <nd ref='-41717' />
+ <nd ref='-31355' />
+ <nd ref='-31353' />
+ <nd ref='-31351' />
+ <nd ref='-31357' />
+ <nd ref='-31349' />
+ <nd ref='-41189' />
+ <nd ref='-41191' />
+ <nd ref='-43833' />
+ <nd ref='-43839' />
+ <nd ref='-43841' />
+ <nd ref='-43843' />
+ <nd ref='-43835' />
+ <nd ref='-43837' />
+ <nd ref='-41193' />
+ <nd ref='-38653' />
+ <nd ref='-38655' />
+ <nd ref='-38657' />
+ <nd ref='-43829' />
+ <nd ref='-43831' />
+ <nd ref='-38659' />
+ <nd ref='-43827' />
+ <nd ref='-43825' />
+ <nd ref='-38661' />
+ <nd ref='-43823' />
+ <nd ref='-38663' />
+ <nd ref='-43821' />
+ <nd ref='-38665' />
+ <nd ref='-38667' />
+ <nd ref='-43819' />
+ <nd ref='-43817' />
+ <nd ref='-43815' />
+ <nd ref='-43813' />
+ <nd ref='-38669' />
+ <nd ref='-43811' />
+ <nd ref='-38671' />
+ <nd ref='-38673' />
+ <nd ref='-43809' />
+ <nd ref='-43805' />
+ <nd ref='-43807' />
+ <nd ref='-43801' />
+ <nd ref='-43803' />
+ <nd ref='-38405' />
+ <nd ref='-38407' />
+ <nd ref='-43799' />
+ <nd ref='-43797' />
+ <nd ref='-43795' />
+ <nd ref='-43793' />
+ <nd ref='-38409' />
+ <nd ref='-43791' />
+ <nd ref='-43789' />
+ <nd ref='-43783' />
+ <nd ref='-43785' />
+ <nd ref='-43787' />
+ <nd ref='-43781' />
+ <nd ref='-43769' />
+ <nd ref='-43771' />
+ <nd ref='-43773' />
+ <nd ref='-43775' />
+ <nd ref='-43777' />
+ <nd ref='-43779' />
+ <nd ref='-43767' />
+ <nd ref='-43765' />
+ <nd ref='-43763' />
+ <nd ref='-43761' />
+ <nd ref='-43759' />
+ <nd ref='-43757' />
+ <nd ref='-43755' />
+ <nd ref='-43753' />
+ <nd ref='-43751' />
+ <nd ref='-43749' />
+ <nd ref='-38411' />
+ <nd ref='-38413' />
+ <nd ref='-43747' />
+ <nd ref='-43745' />
+ <nd ref='-38415' />
+ <nd ref='-43743' />
+ <nd ref='-43741' />
+ <nd ref='-43739' />
+ <nd ref='-43737' />
+ <nd ref='-43735' />
+ <nd ref='-38417' />
+ <nd ref='-43733' />
+ <nd ref='-38419' />
+ <nd ref='-38421' />
+ <nd ref='-43729' />
+ <nd ref='-43731' />
+ <nd ref='-43727' />
+ <nd ref='-43725' />
+ <nd ref='-43723' />
+ <nd ref='-43721' />
+ <nd ref='-43719' />
+ <nd ref='-38423' />
+ <nd ref='-43715' />
+ <nd ref='-43717' />
+ <nd ref='-43713' />
+ <nd ref='-43711' />
+ <nd ref='-43707' />
+ <nd ref='-43709' />
+ <nd ref='-43701' />
+ <nd ref='-43703' />
+ <nd ref='-43705' />
+ <nd ref='-43699' />
+ <nd ref='-43695' />
+ <nd ref='-43697' />
+ <nd ref='-43693' />
+ <nd ref='-38425' />
+ <nd ref='-43691' />
+ <nd ref='-43689' />
+ <nd ref='-43687' />
+ <nd ref='-43685' />
+ <nd ref='-41637' />
+ <nd ref='-43681' />
+ <nd ref='-43683' />
+ <nd ref='-41639' />
+ <nd ref='-42537' />
+ <nd ref='-42535' />
+ <nd ref='-42525' />
+ <nd ref='-42527' />
+ <nd ref='-42529' />
+ <nd ref='-42531' />
+ <nd ref='-42523' />
+ <nd ref='-42533' />
+ <nd ref='-41715' />
+ <nd ref='-42539' />
+ <nd ref='-42541' />
+ <nd ref='-42543' />
+ <nd ref='-53833' />
+ <nd ref='-53831' />
+ <nd ref='-57353' />
+ <nd ref='-42545' />
+ <nd ref='-41519' />
+ <nd ref='-35361' />
+ <nd ref='-35363' />
+ <nd ref='-35365' />
+ <nd ref='-35367' />
+ <nd ref='-35369' />
+ <nd ref='-35371' />
+ <nd ref='-35373' />
+ <nd ref='-41521' />
+ <nd ref='-35329' />
+ <nd ref='-35327' />
+ <nd ref='-35325' />
+ <nd ref='-39583' />
+ <nd ref='-39585' />
+ <nd ref='-35297' />
+ <nd ref='-39587' />
+ <nd ref='-35295' />
+ <nd ref='-35293' />
+ <nd ref='-35289' />
+ <nd ref='-35291' />
+ <nd ref='-35287' />
+ <nd ref='-35285' />
+ <nd ref='-35283' />
+ <nd ref='-35281' />
+ <nd ref='-35279' />
+ <nd ref='-35277' />
+ <nd ref='-35275' />
+ <nd ref='-35273' />
+ <nd ref='-35271' />
+ <nd ref='-35269' />
+ <nd ref='-35267' />
+ <nd ref='-35265' />
+ <nd ref='-35263' />
+ <nd ref='-35261' />
+ <nd ref='-35259' />
+ <nd ref='-35255' />
+ <nd ref='-35257' />
+ <nd ref='-35253' />
+ <nd ref='-35251' />
+ <nd ref='-35249' />
+ <nd ref='-35247' />
+ <nd ref='-35245' />
+ <nd ref='-35239' />
+ <nd ref='-35241' />
+ <nd ref='-35243' />
+ <nd ref='-41775' />
+ <nd ref='-43021' />
+ <nd ref='-43023' />
+ <nd ref='-43025' />
+ <nd ref='-43027' />
+ <nd ref='-39541' />
+ <nd ref='-39543' />
+ <nd ref='-35011' />
+ <nd ref='-35013' />
+ <nd ref='-35009' />
+ <nd ref='-35015' />
+ <nd ref='-35005' />
+ <nd ref='-35007' />
+ <nd ref='-39545' />
+ <nd ref='-39547' />
+ <nd ref='-39549' />
+ <nd ref='-35001' />
+ <nd ref='-34999' />
+ <nd ref='-35003' />
+ <nd ref='-39551' />
+ <nd ref='-34987' />
+ <nd ref='-34985' />
+ <nd ref='-34989' />
+ <nd ref='-34991' />
+ <nd ref='-34993' />
+ <nd ref='-34995' />
+ <nd ref='-34997' />
+ <nd ref='-39553' />
+ <nd ref='-34925' />
+ <nd ref='-34927' />
+ <nd ref='-34929' />
+ <nd ref='-34941' />
+ <nd ref='-34939' />
+ <nd ref='-34935' />
+ <nd ref='-34937' />
+ <nd ref='-34931' />
+ <nd ref='-34933' />
+ <nd ref='-34945' />
+ <nd ref='-34943' />
+ <nd ref='-37809' />
+ <nd ref='-51543' />
+ <nd ref='-51557' />
+ <nd ref='-51559' />
+ <nd ref='-51555' />
+ <nd ref='-51551' />
+ <nd ref='-51553' />
+ <nd ref='-51549' />
+ <nd ref='-51545' />
+ <nd ref='-51547' />
+ <nd ref='-37811' />
+ <nd ref='-51541' />
+ <nd ref='-51531' />
+ <nd ref='-51533' />
+ <nd ref='-51537' />
+ <nd ref='-51539' />
+ <nd ref='-51535' />
+ <nd ref='-37813' />
+ <nd ref='-51519' />
+ <nd ref='-51529' />
+ <nd ref='-51527' />
+ <nd ref='-51525' />
+ <nd ref='-51521' />
+ <nd ref='-51523' />
+ <nd ref='-51509' />
+ <nd ref='-51517' />
+ <nd ref='-51515' />
+ <nd ref='-51513' />
+ <nd ref='-51511' />
+ <nd ref='-41773' />
+ <nd ref='-41771' />
+ <nd ref='-51497' />
+ <nd ref='-51505' />
+ <nd ref='-51507' />
+ <nd ref='-51503' />
+ <nd ref='-51501' />
+ <nd ref='-51499' />
+ <nd ref='-41769' />
+ <nd ref='-41767' />
+ <nd ref='-51483' />
+ <nd ref='-51495' />
+ <nd ref='-51493' />
+ <nd ref='-51491' />
+ <nd ref='-51485' />
+ <nd ref='-51487' />
+ <nd ref='-51489' />
+ <nd ref='-37815' />
+ <nd ref='-51481' />
+ <nd ref='-41765' />
+ <nd ref='-51479' />
+ <nd ref='-37817' />
+ <nd ref='-37819' />
+ <nd ref='-51477' />
+ <nd ref='-51475' />
+ <nd ref='-37821' />
+ <nd ref='-51465' />
+ <nd ref='-51467' />
+ <nd ref='-51469' />
+ <nd ref='-51471' />
+ <nd ref='-51473' />
+ <nd ref='-41763' />
+ <nd ref='-51463' />
+ <nd ref='-51461' />
+ <nd ref='-37823' />
+ <nd ref='-51459' />
+ <nd ref='-51457' />
+ <nd ref='-51455' />
+ <nd ref='-51453' />
+ <nd ref='-51443' />
+ <nd ref='-51451' />
+ <nd ref='-51449' />
+ <nd ref='-51447' />
+ <nd ref='-51445' />
+ <nd ref='-41761' />
+ <nd ref='-51439' />
+ <nd ref='-51441' />
+ <nd ref='-41759' />
+ <nd ref='-51431' />
+ <nd ref='-51435' />
+ <nd ref='-51437' />
+ <nd ref='-51433' />
+ <nd ref='-41757' />
+ <nd ref='-51419' />
+ <nd ref='-51417' />
+ <nd ref='-51421' />
+ <nd ref='-41755' />
+ <nd ref='-51425' />
+ <nd ref='-51427' />
+ <nd ref='-51429' />
+ <nd ref='-51423' />
+ <nd ref='-41753' />
+ <nd ref='-41751' />
+ <nd ref='-41749' />
+ <nd ref='-51567' />
+ <nd ref='-51577' />
+ <nd ref='-51575' />
+ <nd ref='-51565' />
+ <nd ref='-51569' />
+ <nd ref='-51571' />
+ <nd ref='-51573' />
+ <nd ref='-51561' />
+ <nd ref='-51563' />
+ <nd ref='-51579' />
+ <nd ref='-51581' />
+ <nd ref='-51583' />
+ <nd ref='-51585' />
+ <nd ref='-51587' />
+ <nd ref='-51589' />
+ <nd ref='-51591' />
+ <nd ref='-51595' />
+ <nd ref='-51593' />
+ <nd ref='-51597' />
+ <nd ref='-51601' />
+ <nd ref='-51603' />
+ <nd ref='-51599' />
+ <nd ref='-51607' />
+ <nd ref='-51609' />
+ <nd ref='-51605' />
+ <nd ref='-51611' />
+ <nd ref='-51617' />
+ <nd ref='-51613' />
+ <nd ref='-51615' />
+ <nd ref='-51621' />
+ <nd ref='-51619' />
+ <nd ref='-51623' />
+ <nd ref='-51625' />
+ <nd ref='-51627' />
+ <nd ref='-51633' />
+ <nd ref='-51631' />
+ <nd ref='-51629' />
+ <nd ref='-51637' />
+ <nd ref='-51635' />
+ <nd ref='-51643' />
+ <nd ref='-51641' />
+ <nd ref='-51639' />
+ <nd ref='-51645' />
+ <nd ref='-51649' />
+ <nd ref='-51647' />
+ <nd ref='-51651' />
+ <nd ref='-51653' />
+ <nd ref='-51657' />
+ <nd ref='-51655' />
+ <nd ref='-41747' />
+ <nd ref='-51659' />
+ <nd ref='-51663' />
+ <nd ref='-51665' />
+ <nd ref='-51661' />
+ <nd ref='-51675' />
+ <nd ref='-51677' />
+ <nd ref='-51679' />
+ <nd ref='-51685' />
+ <nd ref='-51681' />
+ <nd ref='-51683' />
+ <nd ref='-51667' />
+ <nd ref='-51669' />
+ <nd ref='-51673' />
+ <nd ref='-51671' />
+ <nd ref='-41745' />
+ <nd ref='-51693' />
+ <nd ref='-51691' />
+ <nd ref='-51689' />
+ <nd ref='-51687' />
+ <nd ref='-51695' />
+ <nd ref='-51697' />
+ <nd ref='-51699' />
+ <nd ref='-51703' />
+ <nd ref='-51701' />
+ <nd ref='-51705' />
+ <nd ref='-51707' />
+ <nd ref='-51713' />
+ <nd ref='-51715' />
+ <nd ref='-51709' />
+ <nd ref='-51711' />
+ <nd ref='-41743' />
+ <nd ref='-41741' />
+ <nd ref='-41739' />
+ <nd ref='-51719' />
+ <nd ref='-51721' />
+ <nd ref='-51723' />
+ <nd ref='-51729' />
+ <nd ref='-51727' />
+ <nd ref='-51725' />
+ <nd ref='-51717' />
+ <nd ref='-41737' />
+ <nd ref='-51739' />
+ <nd ref='-51749' />
+ <nd ref='-51747' />
+ <nd ref='-51745' />
+ <nd ref='-51741' />
+ <nd ref='-51743' />
+ <nd ref='-51737' />
+ <nd ref='-51735' />
+ <nd ref='-51733' />
+ <nd ref='-51731' />
+ <nd ref='-51755' />
+ <nd ref='-51753' />
+ <nd ref='-51751' />
+ <nd ref='-51757' />
+ <nd ref='-41735' />
+ <nd ref='-41733' />
+ <nd ref='-51759' />
+ <nd ref='-41731' />
+ <nd ref='-41729' />
+ <nd ref='-51771' />
+ <nd ref='-51769' />
+ <nd ref='-51761' />
+ <nd ref='-51765' />
+ <nd ref='-51767' />
+ <nd ref='-51763' />
+ <nd ref='-41727' />
+ <nd ref='-42251' />
+ <nd ref='-42253' />
+ <nd ref='-42853' />
+ <nd ref='-42255' />
+ <nd ref='-42851' />
+ <nd ref='-42849' />
+ <nd ref='-42847' />
+ <nd ref='-42845' />
+ <nd ref='-42843' />
+ <nd ref='-42841' />
+ <nd ref='-42839' />
+ <nd ref='-42837' />
+ <nd ref='-42835' />
+ <nd ref='-42833' />
+ <nd ref='-42831' />
+ <nd ref='-42829' />
+ <nd ref='-42827' />
+ <nd ref='-42825' />
+ <nd ref='-42823' />
+ <nd ref='-42821' />
+ <nd ref='-42819' />
+ <nd ref='-42817' />
+ <nd ref='-42815' />
+ <nd ref='-42813' />
+ <nd ref='-42811' />
+ <nd ref='-42809' />
+ <nd ref='-42807' />
+ <nd ref='-42805' />
+ <nd ref='-42803' />
+ <nd ref='-42257' />
+ <nd ref='-42259' />
+ <nd ref='-42261' />
+ <nd ref='-42855' />
+ <nd ref='-57397' />
+ <nd ref='-42857' />
+ <nd ref='-57357' />
+ <nd ref='-41725' />
+ </way>
+ <way id='-57877'>
+ <nd ref='-42925' />
+ <nd ref='-42941' />
+ <nd ref='-42927' />
+ <nd ref='-42929' />
+ <nd ref='-42925' />
+ </way>
+ <way id='-57879'>
+ <nd ref='-42971' />
+ <nd ref='-42931' />
+ <nd ref='-42933' />
+ <nd ref='-42935' />
+ <nd ref='-42971' />
+ </way>
+ <way id='-57881'>
+ <nd ref='-42937' />
+ <nd ref='-42939' />
+ <nd ref='-42927' />
+ <nd ref='-42941' />
+ <nd ref='-42937' />
+ <tag k='ISO3166-1:alpha2' v='TV' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Tuvalu' />
+ </way>
+ <way id='-57883'>
+ <nd ref='-39605' />
+ <nd ref='-42943' />
+ <nd ref='-42945' />
+ <nd ref='-39607' />
+ <nd ref='-39605' />
+ <tag k='ISO3166-1:alpha2' v='VU' />
+ <tag k='name:en' v='Vanuatu' />
+ </way>
+ <way id='-57885'>
+ <nd ref='-42943' />
+ <nd ref='-42953' />
+ <nd ref='-42955' />
+ <nd ref='-42957' />
+ <nd ref='-42963' />
+ <nd ref='-42959' />
+ <nd ref='-42961' />
+ <nd ref='-43119' />
+ <nd ref='-43117' />
+ <nd ref='-42947' />
+ <nd ref='-42949' />
+ <nd ref='-42951' />
+ <nd ref='-42945' />
+ <nd ref='-42943' />
+ <tag k='ISO3166-1:alpha2' v='SB' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Solomon Islands' />
+ </way>
+ <way id='-57887'>
+ <nd ref='-53597' />
+ <nd ref='-42965' />
+ <nd ref='-42967' />
+ <nd ref='-53599' />
+ <nd ref='-53597' />
+ <tag k='ISO3166-1:alpha2' v='MP' />
+ <tag k='ISO3166-2' v='US-MP' />
+ <tag k='name:en' v='Northern Mariana Islands' />
+ </way>
+ <way id='-57889'>
+ <nd ref='-42971' />
+ <nd ref='-42973' />
+ <nd ref='-42975' />
+ <nd ref='-42977' />
+ <nd ref='-42985' />
+ <nd ref='-42971' />
+ <tag k='ISO3166-1:alpha2' v='MH' />
+ <tag k='name:en' v='Marshall Islands' />
+ </way>
+ <way id='-57891'>
+ <nd ref='-42979' />
+ <nd ref='-42981' />
+ <nd ref='-42983' />
+ <nd ref='-42985' />
+ <nd ref='-42977' />
+ <nd ref='-42979' />
+ <tag k='ISO3166-1:alpha2' v='FM' />
+ <tag k='name:en' v='Micronesia, Federated States of' />
+ </way>
+ <way id='-57893'>
+ <nd ref='-37973' />
+ <nd ref='-37971' />
+ <nd ref='-43577' />
+ <nd ref='-43579' />
+ <nd ref='-43581' />
+ <nd ref='-43583' />
+ <nd ref='-43585' />
+ <nd ref='-43587' />
+ <nd ref='-43589' />
+ <nd ref='-43079' />
+ <nd ref='-37969' />
+ <nd ref='-37967' />
+ <nd ref='-43073' />
+ <nd ref='-43077' />
+ <nd ref='-43075' />
+ <nd ref='-37965' />
+ <nd ref='-43071' />
+ <nd ref='-37975' />
+ <nd ref='-41413' />
+ <nd ref='-37963' />
+ <nd ref='-37961' />
+ <nd ref='-37959' />
+ <nd ref='-37957' />
+ <nd ref='-43591' />
+ <nd ref='-43593' />
+ <nd ref='-43595' />
+ <nd ref='-43597' />
+ <nd ref='-37955' />
+ <nd ref='-37953' />
+ <nd ref='-37951' />
+ <nd ref='-41415' />
+ <nd ref='-41403' />
+ <nd ref='-43057' />
+ <nd ref='-43059' />
+ <nd ref='-43061' />
+ <nd ref='-43063' />
+ <nd ref='-41405' />
+ <nd ref='-41407' />
+ <nd ref='-43065' />
+ <nd ref='-41409' />
+ <nd ref='-43069' />
+ <nd ref='-43067' />
+ <nd ref='-43643' />
+ <nd ref='-43641' />
+ <nd ref='-43639' />
+ <nd ref='-43637' />
+ <nd ref='-43635' />
+ <nd ref='-43633' />
+ <nd ref='-43631' />
+ <nd ref='-43629' />
+ <nd ref='-43627' />
+ <nd ref='-43625' />
+ <nd ref='-43623' />
+ <nd ref='-43621' />
+ <nd ref='-43619' />
+ <nd ref='-43617' />
+ <nd ref='-43615' />
+ <nd ref='-43613' />
+ <nd ref='-43611' />
+ <nd ref='-43609' />
+ <nd ref='-43607' />
+ <nd ref='-43605' />
+ <nd ref='-43603' />
+ <nd ref='-43601' />
+ <nd ref='-43599' />
+ <nd ref='-39977' />
+ <nd ref='-39975' />
+ <nd ref='-41411' />
+ <nd ref='-42765' />
+ <nd ref='-42763' />
+ <nd ref='-42993' />
+ <nd ref='-42991' />
+ <nd ref='-41387' />
+ <nd ref='-41883' />
+ <nd ref='-41881' />
+ <nd ref='-41879' />
+ <nd ref='-41877' />
+ <nd ref='-41389' />
+ <nd ref='-41391' />
+ <nd ref='-41393' />
+ <nd ref='-41875' />
+ <nd ref='-41895' />
+ <nd ref='-43003' />
+ <nd ref='-43001' />
+ <nd ref='-42999' />
+ <nd ref='-42997' />
+ <nd ref='-41893' />
+ <nd ref='-41891' />
+ <nd ref='-41889' />
+ <nd ref='-41395' />
+ <nd ref='-41397' />
+ <nd ref='-43005' />
+ <nd ref='-42777' />
+ <nd ref='-41399' />
+ <nd ref='-42085' />
+ <nd ref='-42083' />
+ <nd ref='-43007' />
+ <nd ref='-41401' />
+ <nd ref='-43555' />
+ <nd ref='-43557' />
+ <nd ref='-43553' />
+ <nd ref='-43551' />
+ <nd ref='-43549' />
+ <nd ref='-43547' />
+ <nd ref='-43545' />
+ <nd ref='-43543' />
+ <nd ref='-43541' />
+ <nd ref='-43539' />
+ <nd ref='-43537' />
+ <nd ref='-43535' />
+ <nd ref='-43533' />
+ <nd ref='-43531' />
+ <nd ref='-43529' />
+ <nd ref='-41383' />
+ <nd ref='-43559' />
+ <nd ref='-43561' />
+ <nd ref='-43563' />
+ <nd ref='-43565' />
+ <nd ref='-43573' />
+ <nd ref='-43575' />
+ <nd ref='-43571' />
+ <nd ref='-43569' />
+ <nd ref='-43567' />
+ <nd ref='-41385' />
+ <nd ref='-42081' />
+ <nd ref='-42343' />
+ <nd ref='-42341' />
+ <nd ref='-37973' />
+ <tag k='ISO3166-1:alpha2' v='MY' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Malaysia' />
+ </way>
+ <way id='-57895'>
+ <nd ref='-39973' />
+ <nd ref='-43113' />
+ <nd ref='-43115' />
+ <nd ref='-43111' />
+ <nd ref='-41615' />
+ <nd ref='-41613' />
+ <nd ref='-42789' />
+ <nd ref='-42483' />
+ <nd ref='-42179' />
+ <nd ref='-43081' />
+ <nd ref='-42187' />
+ <nd ref='-42185' />
+ <nd ref='-42183' />
+ <nd ref='-42181' />
+ <nd ref='-43107' />
+ <nd ref='-43105' />
+ <nd ref='-42177' />
+ <nd ref='-39963' />
+ <nd ref='-43099' />
+ <nd ref='-43101' />
+ <nd ref='-43103' />
+ <nd ref='-43097' />
+ <nd ref='-39965' />
+ <nd ref='-43095' />
+ <nd ref='-43093' />
+ <nd ref='-43091' />
+ <nd ref='-39967' />
+ <nd ref='-39969' />
+ <nd ref='-39971' />
+ <nd ref='-43087' />
+ <nd ref='-43089' />
+ <nd ref='-43085' />
+ <nd ref='-43083' />
+ <nd ref='-39961' />
+ <nd ref='-43109' />
+ <nd ref='-42787' />
+ <nd ref='-42785' />
+ <nd ref='-42783' />
+ <nd ref='-42781' />
+ <nd ref='-42779' />
+ <nd ref='-42777' />
+ <nd ref='-43005' />
+ <nd ref='-41397' />
+ <nd ref='-42995' />
+ <nd ref='-41887' />
+ <nd ref='-41885' />
+ <nd ref='-41883' />
+ <nd ref='-41387' />
+ <nd ref='-42991' />
+ <nd ref='-42993' />
+ <nd ref='-42763' />
+ <nd ref='-42765' />
+ <nd ref='-41411' />
+ <nd ref='-39975' />
+ <nd ref='-39977' />
+ <nd ref='-43599' />
+ <nd ref='-43601' />
+ <nd ref='-43603' />
+ <nd ref='-43605' />
+ <nd ref='-43607' />
+ <nd ref='-43609' />
+ <nd ref='-43611' />
+ <nd ref='-43613' />
+ <nd ref='-43615' />
+ <nd ref='-43617' />
+ <nd ref='-43619' />
+ <nd ref='-43621' />
+ <nd ref='-43623' />
+ <nd ref='-43625' />
+ <nd ref='-43627' />
+ <nd ref='-43629' />
+ <nd ref='-43631' />
+ <nd ref='-43633' />
+ <nd ref='-43635' />
+ <nd ref='-43637' />
+ <nd ref='-43639' />
+ <nd ref='-43641' />
+ <nd ref='-43643' />
+ <nd ref='-43067' />
+ <nd ref='-43069' />
+ <nd ref='-41409' />
+ <nd ref='-42775' />
+ <nd ref='-42773' />
+ <nd ref='-42771' />
+ <nd ref='-42769' />
+ <nd ref='-42767' />
+ <nd ref='-39973' />
+ <tag k='ISO3166-1:alpha2' v='ID' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Indonesia' />
+ </way>
+ <way id='-57897'>
+ <nd ref='-42769' />
+ <nd ref='-42979' />
+ <nd ref='-42981' />
+ <nd ref='-42767' />
+ <nd ref='-42769' />
+ <tag k='ISO3166-1:alpha2' v='PW' />
+ <tag k='name:en' v='Palau' />
+ </way>
+ <way id='-57899'>
+ <nd ref='-42771' />
+ <nd ref='-43401' />
+ <nd ref='-42745' />
+ <nd ref='-42743' />
+ <nd ref='-43403' />
+ <nd ref='-41403' />
+ <nd ref='-43057' />
+ <nd ref='-43059' />
+ <nd ref='-43061' />
+ <nd ref='-43063' />
+ <nd ref='-41405' />
+ <nd ref='-41407' />
+ <nd ref='-43065' />
+ <nd ref='-41409' />
+ <nd ref='-42775' />
+ <nd ref='-42773' />
+ <nd ref='-42771' />
+ <tag k='ISO3166-1:alpha2' v='PH' />
+ <tag k='name:en' v='Philippines' />
+ </way>
+ <way id='-57901'>
+ <nd ref='-42663' />
+ <nd ref='-40197' />
+ <nd ref='-43941' />
+ <nd ref='-43939' />
+ <nd ref='-43937' />
+ <nd ref='-43933' />
+ <nd ref='-43935' />
+ <nd ref='-43931' />
+ <nd ref='-43929' />
+ <nd ref='-43927' />
+ <nd ref='-43925' />
+ <nd ref='-43923' />
+ <nd ref='-43921' />
+ <nd ref='-43919' />
+ <nd ref='-43861' />
+ <nd ref='-43905' />
+ <nd ref='-43903' />
+ <nd ref='-43901' />
+ <nd ref='-43899' />
+ <nd ref='-43907' />
+ <nd ref='-43917' />
+ <nd ref='-43915' />
+ <nd ref='-43913' />
+ <nd ref='-43911' />
+ <nd ref='-43909' />
+ <nd ref='-43897' />
+ <nd ref='-43895' />
+ <nd ref='-43893' />
+ <nd ref='-43891' />
+ <nd ref='-43889' />
+ <nd ref='-43887' />
+ <nd ref='-43885' />
+ <nd ref='-43883' />
+ <nd ref='-43881' />
+ <nd ref='-43879' />
+ <nd ref='-43877' />
+ <nd ref='-43875' />
+ <nd ref='-43873' />
+ <nd ref='-43871' />
+ <nd ref='-43869' />
+ <nd ref='-43867' />
+ <nd ref='-43863' />
+ <nd ref='-43865' />
+ <nd ref='-43857' />
+ <nd ref='-43859' />
+ <nd ref='-43845' />
+ <nd ref='-43855' />
+ <nd ref='-43853' />
+ <nd ref='-43847' />
+ <nd ref='-43851' />
+ <nd ref='-43849' />
+ <nd ref='-39757' />
+ <nd ref='-42681' />
+ <nd ref='-42679' />
+ <nd ref='-39763' />
+ <nd ref='-36831' />
+ <nd ref='-42665' />
+ <nd ref='-42667' />
+ <nd ref='-37555' />
+ <nd ref='-37553' />
+ <nd ref='-39693' />
+ <nd ref='-39691' />
+ <nd ref='-53531' />
+ <nd ref='-57355' />
+ <nd ref='-39761' />
+ <nd ref='-42659' />
+ <nd ref='-42661' />
+ <nd ref='-53537' />
+ <nd ref='-53535' />
+ <nd ref='-53533' />
+ <nd ref='-42663' />
+ <tag k='name:en' v='Metropolitan United Kingdom' />
+ </way>
+ <way id='-57903'>
+ <nd ref='-39689' />
+ <nd ref='-42653' />
+ <nd ref='-42655' />
+ <nd ref='-42657' />
+ <nd ref='-42651' />
+ <nd ref='-39689' />
+ <tag k='ISO3166-1:alpha2' v='JE' />
+ <tag k='name:en' v='Jersey' />
+ <tag k='note' v='not in EU' />
+ </way>
+ <way id='-57905'>
+ <nd ref='-42651' />
+ <nd ref='-39759' />
+ <nd ref='-57355' />
+ <nd ref='-53531' />
+ <nd ref='-39691' />
+ <nd ref='-42657' />
+ <nd ref='-42651' />
+ <tag k='ISO3166-1:alpha2' v='GG' />
+ <tag k='name:en' v='Guerney' />
+ <tag k='note' v='not in EU' />
+ </way>
+ <way id='-57907'>
+ <nd ref='-42661' />
+ <nd ref='-42663' />
+ <nd ref='-53533' />
+ <nd ref='-53535' />
+ <nd ref='-53537' />
+ <nd ref='-42661' />
+ <tag k='ISO3166-1:alpha2' v='IM' />
+ <tag k='name:en' v='Isle of Man' />
+ <tag k='note' v='not in EU' />
+ </way>
+ <way id='-57909'>
+ <nd ref='-43019' />
+ <nd ref='-53539' />
+ <nd ref='-53541' />
+ <nd ref='-53543' />
+ <nd ref='-53545' />
+ <nd ref='-53547' />
+ <nd ref='-43041' />
+ <nd ref='-43019' />
+ <tag k='ISO3166-1:alpha2' v='AX' />
+ <tag k='name:en' v='Åland Islands' />
+ <tag k='note' v='Autonomous Finnish region' />
+ </way>
+ <way id='-57911'>
+ <nd ref='-53549' />
+ <nd ref='-42579' />
+ <nd ref='-42583' />
+ <nd ref='-42581' />
+ <nd ref='-36367' />
+ <nd ref='-36369' />
+ <nd ref='-53551' />
+ <nd ref='-53549' />
+ <tag k='ISO3166-1:alpha2' v='VG' />
+ <tag k='name:en' v='British Virgin Islands' />
+ </way>
+ <way id='-57913'>
+ <nd ref='-53553' />
+ <nd ref='-53555' />
+ <nd ref='-53557' />
+ <nd ref='-53559' />
+ <nd ref='-53553' />
+ <tag k='ISO3166-1:alpha2' v='AQ' />
+ <tag k='name:en' v='Antarctica' />
+ </way>
+ <way id='-57915'>
+ <nd ref='-53561' />
+ <nd ref='-36413' />
+ <nd ref='-42335' />
+ <nd ref='-36417' />
+ <nd ref='-53561' />
+ <tag k='ISO3166-1:alpha2' v='AW' />
+ <tag k='ISO3166-2' v='NL-AW' />
+ <tag k='name:en' v='Aruba' />
+ </way>
+ <way id='-57917'>
+ <nd ref='-53567' />
+ <nd ref='-53569' />
+ <nd ref='-53571' />
+ <nd ref='-53573' />
+ <nd ref='-53567' />
+ <tag k='ISO3166-1:alpha2' v='CX' />
+ <tag k='name:en' v='Christmas Island' />
+ </way>
+ <way id='-57919'>
+ <nd ref='-53575' />
+ <nd ref='-53577' />
+ <nd ref='-53579' />
+ <nd ref='-53581' />
+ <nd ref='-53575' />
+ <tag k='ISO3166-1:alpha2' v='CC' />
+ <tag k='name:en' v='Cocos (Keeling) Islands' />
+ </way>
+ <way id='-57921'>
+ <nd ref='-36673' />
+ <nd ref='-53583' />
+ <nd ref='-36677' />
+ <nd ref='-36663' />
+ <nd ref='-36673' />
+ <tag k='ISO3166-1:alpha2' v='TK' />
+ <tag k='name:en' v='Tokelau' />
+ </way>
+ <way id='-57923'>
+ <nd ref='-36633' />
+ <nd ref='-53585' />
+ <nd ref='-53587' />
+ <nd ref='-36683' />
+ <nd ref='-36675' />
+ <nd ref='-53583' />
+ <nd ref='-36673' />
+ <nd ref='-36633' />
+ <tag k='ISO3166-1:alpha2' v='CK' />
+ <tag k='name:en' v='Cook Islands' />
+ </way>
+ <way id='-57925'>
+ <nd ref='-53589' />
+ <nd ref='-53591' />
+ <nd ref='-36743' />
+ <nd ref='-36737' />
+ <nd ref='-53589' />
+ <tag k='ISO3166-1:alpha2' v='FK' />
+ <tag k='name:en' v='Falkland Islands' />
+ </way>
+ <way id='-57927'>
+ <nd ref='-53593' />
+ <nd ref='-36741' />
+ <nd ref='-36739' />
+ <nd ref='-53595' />
+ <nd ref='-53593' />
+ <tag k='ISO3166-1:alpha2' v='GS' />
+ <tag k='name:en' v='South Georgia and South Sandwich Islands' />
+ </way>
+ <way id='-57929'>
+ <nd ref='-53599' />
+ <nd ref='-42969' />
+ <nd ref='-53597' />
+ <nd ref='-53599' />
+ <tag k='ISO3166-1:alpha2' v='GU' />
+ <tag k='ISO3166-2' v='US-GU' />
+ <tag k='name:en' v='Guam' />
+ </way>
+ <way id='-57931'>
+ <nd ref='-42481' />
+ <nd ref='-53603' />
+ <nd ref='-53605' />
+ <nd ref='-42481' />
+ <tag k='ISO3166-1:alpha2' v='HM' />
+ <tag k='name:en' v='Heard Island and McDonald Islands' />
+ </way>
+ <way id='-57933'>
+ <nd ref='-53607' />
+ <nd ref='-53609' />
+ <nd ref='-53611' />
+ <nd ref='-53613' />
+ <nd ref='-53623' />
+ <nd ref='-53643' />
+ <nd ref='-53641' />
+ <nd ref='-53639' />
+ <nd ref='-53627' />
+ <nd ref='-53629' />
+ <nd ref='-53637' />
+ <nd ref='-53635' />
+ <nd ref='-53633' />
+ <nd ref='-53631' />
+ <nd ref='-53625' />
+ <nd ref='-53621' />
+ <nd ref='-53615' />
+ <nd ref='-53617' />
+ <nd ref='-53619' />
+ <nd ref='-53607' />
+ <tag k='ISO3166-1:alpha2' v='HK' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Hong Kong' />
+ </way>
+ <way id='-57935'>
+ <nd ref='-53645' />
+ <nd ref='-53647' />
+ <nd ref='-53649' />
+ <nd ref='-53651' />
+ <nd ref='-53645' />
+ <tag k='name:en' v='Midway Atoll' />
+ </way>
+ <way id='-57937'>
+ <nd ref='-53653' />
+ <nd ref='-53655' />
+ <nd ref='-53657' />
+ <nd ref='-53659' />
+ <nd ref='-53653' />
+ <tag k='name:en' v='Johnston Atoll' />
+ </way>
+ <way id='-57939'>
+ <nd ref='-36695' />
+ <nd ref='-53661' />
+ <nd ref='-36687' />
+ <nd ref='-36689' />
+ <nd ref='-36695' />
+ <tag k='name:en' v='Kingman Reef and Palmyra Atoll' />
+ </way>
+ <way id='-57941'>
+ <nd ref='-53663' />
+ <nd ref='-36685' />
+ <nd ref='-36693' />
+ <nd ref='-36691' />
+ <nd ref='-53663' />
+ <tag k='name:en' v='Jarvis Island' />
+ </way>
+ <way id='-57943'>
+ <nd ref='-36669' />
+ <nd ref='-53667' />
+ <nd ref='-36667' />
+ <nd ref='-53665' />
+ <nd ref='-36669' />
+ <tag k='name:en' v='Howland Island and Baker Island' />
+ </way>
+ <way id='-57945'>
+ <nd ref='-53669' />
+ <nd ref='-39213' />
+ <nd ref='-39211' />
+ <nd ref='-36367' />
+ <nd ref='-53669' />
+ <tag k='ISO3166-1:alpha2' v='PR' />
+ <tag k='ISO3166-2' v='US-PR' />
+ <tag k='name:en' v='Puerto Rico' />
+ </way>
+ <way id='-57947'>
+ <nd ref='-53671' />
+ <nd ref='-53673' />
+ <nd ref='-53675' />
+ <nd ref='-53677' />
+ <nd ref='-53679' />
+ <nd ref='-53681' />
+ <nd ref='-53683' />
+ <nd ref='-53685' />
+ <nd ref='-53687' />
+ <nd ref='-53689' />
+ <nd ref='-53691' />
+ <nd ref='-53693' />
+ <nd ref='-53695' />
+ <nd ref='-53697' />
+ <nd ref='-53699' />
+ <nd ref='-53671' />
+ <tag k='ISO3166-1:alpha2' v='MO' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Macau' />
+ </way>
+ <way id='-57949'>
+ <nd ref='-42639' />
+ <nd ref='-53703' />
+ <nd ref='-53701' />
+ <nd ref='-53705' />
+ <nd ref='-42639' />
+ <tag k='ISO3166-1:alpha2' v='YT' />
+ <tag k='ISO3166-2' v='FR-YT' />
+ <tag k='name:en' v='Mayotte' />
+ </way>
+ <way id='-57951'>
+ <nd ref='-36641' />
+ <nd ref='-36635' />
+ <nd ref='-36625' />
+ <nd ref='-36629' />
+ <nd ref='-36641' />
+ </way>
+ <way id='-57953'>
+ <nd ref='-36639' />
+ <nd ref='-36651' />
+ <nd ref='-36633' />
+ <nd ref='-53585' />
+ <nd ref='-53707' />
+ <nd ref='-36639' />
+ <tag k='ISO3166-1:alpha2' v='NU' />
+ <tag k='name:en' v='Niue' />
+ </way>
+ <way id='-57955'>
+ <nd ref='-42503' />
+ <nd ref='-53709' />
+ <nd ref='-53889' />
+ <nd ref='-53711' />
+ <nd ref='-42503' />
+ <tag k='ISO3166-1:alpha2' v='NF' />
+ <tag k='name:en' v='Norfolk Island' />
+ </way>
+ <way id='-57957'>
+ <nd ref='-53713' />
+ <nd ref='-53715' />
+ <nd ref='-53717' />
+ <nd ref='-53719' />
+ <nd ref='-53721' />
+ <nd ref='-53723' />
+ <nd ref='-39305' />
+ <nd ref='-39303' />
+ <nd ref='-53713' />
+ <tag k='name:en' v='Gaza Strip' />
+ </way>
+ <way id='-57959'>
+ <nd ref='-53725' />
+ <nd ref='-53727' />
+ <nd ref='-53729' />
+ <nd ref='-53731' />
+ <nd ref='-53733' />
+ <nd ref='-53735' />
+ <nd ref='-53737' />
+ <nd ref='-53739' />
+ <nd ref='-53741' />
+ <nd ref='-53743' />
+ <nd ref='-53745' />
+ <nd ref='-53747' />
+ <nd ref='-53749' />
+ <nd ref='-53751' />
+ <nd ref='-53753' />
+ <nd ref='-53755' />
+ <nd ref='-53757' />
+ <nd ref='-53759' />
+ <nd ref='-53761' />
+ <nd ref='-53763' />
+ <nd ref='-53765' />
+ <nd ref='-53767' />
+ <nd ref='-53769' />
+ <nd ref='-53771' />
+ <nd ref='-53773' />
+ <nd ref='-53775' />
+ <nd ref='-53777' />
+ <nd ref='-53779' />
+ <nd ref='-53781' />
+ <nd ref='-53783' />
+ <nd ref='-53785' />
+ <nd ref='-53787' />
+ <nd ref='-53789' />
+ <nd ref='-53791' />
+ <nd ref='-53793' />
+ <nd ref='-53795' />
+ <nd ref='-53797' />
+ <nd ref='-53799' />
+ <nd ref='-53801' />
+ <nd ref='-53803' />
+ <nd ref='-53805' />
+ <nd ref='-53807' />
+ <nd ref='-53809' />
+ <nd ref='-53811' />
+ <nd ref='-53813' />
+ <nd ref='-53815' />
+ <nd ref='-53817' />
+ <nd ref='-53819' />
+ <nd ref='-53821' />
+ <nd ref='-53823' />
+ <nd ref='-53825' />
+ <nd ref='-53827' />
+ <nd ref='-53829' />
+ <nd ref='-33707' />
+ <nd ref='-33709' />
+ <nd ref='-33711' />
+ <nd ref='-33713' />
+ <nd ref='-40329' />
+ <nd ref='-53725' />
+ <tag k='name:en' v='West Bank' />
+ </way>
+ <way id='-57961'>
+ <nd ref='-36383' />
+ <nd ref='-39627' />
+ <nd ref='-36393' />
+ <nd ref='-36391' />
+ <nd ref='-36389' />
+ <nd ref='-36387' />
+ <nd ref='-36381' />
+ <nd ref='-36379' />
+ <nd ref='-36377' />
+ <nd ref='-36375' />
+ <nd ref='-36385' />
+ <nd ref='-36383' />
+ <tag k='ISO3166-1:alpha2' v='MF' />
+ <tag k='ISO3166-2' v='FR-MF' />
+ <tag k='name:en' v='Saint-Martin' />
+ </way>
+ <way id='-57963'>
+ <nd ref='-39627' />
+ <nd ref='-39629' />
+ <nd ref='-39623' />
+ <nd ref='-39625' />
+ <nd ref='-36383' />
+ <nd ref='-39627' />
+ <tag k='ISO3166-1:alpha2' v='BL' />
+ <tag k='ISO3166-2' v='FR-BL' />
+ <tag k='name:en' v='Saint-Barthélemy' />
+ </way>
+ <way id='-57965'>
+ <nd ref='-42629' />
+ <nd ref='-53835' />
+ <nd ref='-42643' />
+ <nd ref='-42629' />
+ <tag k='name:en' v='Glorioso Islands' />
+ </way>
+ <way id='-57967'>
+ <nd ref='-34719' />
+ <nd ref='-42647' />
+ <nd ref='-42645' />
+ <nd ref='-53837' />
+ <nd ref='-34719' />
+ <tag k='name:en' v='Juan de Nova Island, Bassas da India, Europa Island' />
+ </way>
+ <way id='-57969'>
+ <nd ref='-53839' />
+ <nd ref='-53841' />
+ <nd ref='-53843' />
+ <nd ref='-53845' />
+ <nd ref='-53839' />
+ <tag k='name:en' v='Tromelin Island' />
+ </way>
+ <way id='-57971'>
+ <nd ref='-53847' />
+ <nd ref='-53849' />
+ <nd ref='-36729' />
+ <nd ref='-53847' />
+ <tag k='ISO3166-1:alpha2' v='AC' />
+ <tag k='name:en' v='Ascension Island' />
+ <tag k='note' v='officially in SH but AC also exists' />
+ </way>
+ <way id='-57973'>
+ <nd ref='-42685' />
+ <nd ref='-36853' />
+ <nd ref='-36851' />
+ <nd ref='-36459' />
+ <nd ref='-53851' />
+ <nd ref='-53853' />
+ <nd ref='-42685' />
+ <tag k='ISO3166-1:alpha2' v='IC' />
+ <tag k='ISO3166-2' v='ES-CN' />
+ <tag k='name:en' v='Canary Islands' />
+ <tag k='note' v='officially in ES but IC also exists' />
+ </way>
+ <way id='-57975'>
+ <nd ref='-39517' />
+ <nd ref='-36839' />
+ <nd ref='-40897' />
+ <nd ref='-39335' />
+ <nd ref='-39337' />
+ <nd ref='-39339' />
+ <nd ref='-39517' />
+ <tag k='ISO3166-2' v='ES-CE' />
+ <tag k='name:en' v='Ceuta' />
+ </way>
+ <way id='-57977'>
+ <nd ref='-39333' />
+ <nd ref='-36467' />
+ <nd ref='-36469' />
+ <nd ref='-39329' />
+ <nd ref='-39331' />
+ <nd ref='-36465' />
+ <nd ref='-39333' />
+ <tag k='ISO3166-2' v='ES-ML' />
+ <tag k='name:en' v='Melilla' />
+ </way>
+ <way id='-57979'>
+ <nd ref='-53857' />
+ <nd ref='-53859' />
+ <nd ref='-53861' />
+ <nd ref='-53857' />
+ </way>
+ <way id='-57981'>
+ <nd ref='-40899' />
+ <nd ref='-53863' />
+ <nd ref='-53865' />
+ <nd ref='-40901' />
+ <nd ref='-40899' />
+ </way>
+ <way id='-57983'>
+ <nd ref='-36461' />
+ <nd ref='-53867' />
+ <nd ref='-53869' />
+ <nd ref='-53871' />
+ <nd ref='-36461' />
+ </way>
+ <way id='-57985'>
+ <nd ref='-42599' />
+ <nd ref='-53873' />
+ <nd ref='-53875' />
+ <nd ref='-53877' />
+ <nd ref='-42599' />
+ <tag k='ISO3166-1:alpha2' v='DG' />
+ <tag k='name:en' v='Diego Garcia' />
+ <tag k='note' v='Officially in IO but DG also exists' />
+ </way>
+ <way id='-57987'>
+ <nd ref='-53879' />
+ <nd ref='-53881' />
+ <nd ref='-53883' />
+ <nd ref='-53885' />
+ <nd ref='-53879' />
+ <tag k='ISO3166-1:alpha2' v='TA' />
+ <tag k='name:en' v='Tristan da Cunha' />
+ <tag k='note' v='Officially in SH but TA also exists' />
+ </way>
+ <way id='-57989'>
+ <nd ref='-44939' />
+ <nd ref='-44937' />
+ <nd ref='-44935' />
+ <nd ref='-44925' />
+ <nd ref='-44933' />
+ <nd ref='-44927' />
+ <nd ref='-44929' />
+ <nd ref='-44931' />
+ <nd ref='-44939' />
+ <tag k='name:en' v='Büsingen am Hochrhein' />
+ </way>
+ <way id='-57991'>
+ <nd ref='-39023' />
+ <nd ref='-39025' />
+ <nd ref='-39027' />
+ <nd ref='-44911' />
+ <nd ref='-44913' />
+ <nd ref='-44915' />
+ <nd ref='-44923' />
+ <nd ref='-44921' />
+ <nd ref='-44917' />
+ <nd ref='-44919' />
+ <nd ref='-39029' />
+ <nd ref='-38675' />
+ <nd ref='-39031' />
+ <nd ref='-38729' />
+ <nd ref='-38727' />
+ <nd ref='-44909' />
+ <nd ref='-44907' />
+ <nd ref='-44905' />
+ <nd ref='-44903' />
+ <nd ref='-44901' />
+ <nd ref='-38725' />
+ <nd ref='-44891' />
+ <nd ref='-44893' />
+ <nd ref='-44895' />
+ <nd ref='-44899' />
+ <nd ref='-44897' />
+ <nd ref='-38723' />
+ <nd ref='-44887' />
+ <nd ref='-44889' />
+ <nd ref='-38721' />
+ <nd ref='-44877' />
+ <nd ref='-44881' />
+ <nd ref='-44883' />
+ <nd ref='-44885' />
+ <nd ref='-44879' />
+ <nd ref='-44875' />
+ <nd ref='-44873' />
+ <nd ref='-44871' />
+ <nd ref='-44869' />
+ <nd ref='-38719' />
+ <nd ref='-39033' />
+ <nd ref='-44867' />
+ <nd ref='-44865' />
+ <nd ref='-44863' />
+ <nd ref='-44861' />
+ <nd ref='-44859' />
+ <nd ref='-44857' />
+ <nd ref='-38717' />
+ <nd ref='-44855' />
+ <nd ref='-44853' />
+ <nd ref='-38715' />
+ <nd ref='-44851' />
+ <nd ref='-44849' />
+ <nd ref='-44847' />
+ <nd ref='-44845' />
+ <nd ref='-44841' />
+ <nd ref='-44843' />
+ <nd ref='-38713' />
+ <nd ref='-44839' />
+ <nd ref='-44837' />
+ <nd ref='-44835' />
+ <nd ref='-44833' />
+ <nd ref='-44829' />
+ <nd ref='-44831' />
+ <nd ref='-38711' />
+ <nd ref='-44825' />
+ <nd ref='-44823' />
+ <nd ref='-44821' />
+ <nd ref='-44827' />
+ <nd ref='-44817' />
+ <nd ref='-44819' />
+ <nd ref='-38709' />
+ <nd ref='-44815' />
+ <nd ref='-44813' />
+ <nd ref='-44809' />
+ <nd ref='-44811' />
+ <nd ref='-39035' />
+ <nd ref='-44807' />
+ <nd ref='-39037' />
+ <nd ref='-38707' />
+ <nd ref='-38705' />
+ <nd ref='-39039' />
+ <nd ref='-44805' />
+ <nd ref='-44803' />
+ <nd ref='-44801' />
+ <nd ref='-44799' />
+ <nd ref='-44797' />
+ <nd ref='-44773' />
+ <nd ref='-44785' />
+ <nd ref='-44787' />
+ <nd ref='-44795' />
+ <nd ref='-44793' />
+ <nd ref='-44791' />
+ <nd ref='-44789' />
+ <nd ref='-44783' />
+ <nd ref='-44781' />
+ <nd ref='-44779' />
+ <nd ref='-44777' />
+ <nd ref='-44775' />
+ <nd ref='-38703' />
+ <nd ref='-44591' />
+ <nd ref='-44589' />
+ <nd ref='-44603' />
+ <nd ref='-44601' />
+ <nd ref='-44599' />
+ <nd ref='-44597' />
+ <nd ref='-44595' />
+ <nd ref='-44593' />
+ <nd ref='-44567' />
+ <nd ref='-44583' />
+ <nd ref='-44585' />
+ <nd ref='-44587' />
+ <nd ref='-44581' />
+ <nd ref='-44579' />
+ <nd ref='-44577' />
+ <nd ref='-44575' />
+ <nd ref='-44573' />
+ <nd ref='-44571' />
+ <nd ref='-44569' />
+ <nd ref='-39649' />
+ <nd ref='-38701' />
+ <nd ref='-39651' />
+ <nd ref='-38699' />
+ <nd ref='-44565' />
+ <nd ref='-44563' />
+ <nd ref='-44555' />
+ <nd ref='-44557' />
+ <nd ref='-44561' />
+ <nd ref='-44559' />
+ <nd ref='-38697' />
+ <nd ref='-38695' />
+ <nd ref='-39653' />
+ <nd ref='-39655' />
+ <nd ref='-44553' />
+ <nd ref='-39657' />
+ <nd ref='-39659' />
+ <nd ref='-44551' />
+ <nd ref='-44549' />
+ <nd ref='-44457' />
+ <nd ref='-44461' />
+ <nd ref='-44463' />
+ <nd ref='-44547' />
+ <nd ref='-44459' />
+ <nd ref='-44545' />
+ <nd ref='-44465' />
+ <nd ref='-44543' />
+ <nd ref='-44537' />
+ <nd ref='-44541' />
+ <nd ref='-44539' />
+ <nd ref='-44469' />
+ <nd ref='-44477' />
+ <nd ref='-44535' />
+ <nd ref='-44533' />
+ <nd ref='-44531' />
+ <nd ref='-44529' />
+ <nd ref='-44527' />
+ <nd ref='-44479' />
+ <nd ref='-44523' />
+ <nd ref='-44525' />
+ <nd ref='-44521' />
+ <nd ref='-44483' />
+ <nd ref='-44481' />
+ <nd ref='-44517' />
+ <nd ref='-44519' />
+ <nd ref='-44509' />
+ <nd ref='-44511' />
+ <nd ref='-44515' />
+ <nd ref='-44513' />
+ <nd ref='-44507' />
+ <nd ref='-44505' />
+ <nd ref='-44485' />
+ <nd ref='-44503' />
+ <nd ref='-44501' />
+ <nd ref='-44499' />
+ <nd ref='-44489' />
+ <nd ref='-44497' />
+ <nd ref='-44487' />
+ <nd ref='-44475' />
+ <nd ref='-44493' />
+ <nd ref='-44495' />
+ <nd ref='-44491' />
+ <nd ref='-44473' />
+ <nd ref='-44471' />
+ <nd ref='-44467' />
+ <nd ref='-38693' />
+ <nd ref='-44441' />
+ <nd ref='-44455' />
+ <nd ref='-44453' />
+ <nd ref='-44451' />
+ <nd ref='-44449' />
+ <nd ref='-44447' />
+ <nd ref='-44443' />
+ <nd ref='-44445' />
+ <nd ref='-40349' />
+ <nd ref='-38691' />
+ <nd ref='-44435' />
+ <nd ref='-44437' />
+ <nd ref='-44439' />
+ <nd ref='-40351' />
+ <nd ref='-44611' />
+ <nd ref='-44613' />
+ <nd ref='-44615' />
+ <nd ref='-44617' />
+ <nd ref='-44619' />
+ <nd ref='-44621' />
+ <nd ref='-44623' />
+ <nd ref='-44627' />
+ <nd ref='-44625' />
+ <nd ref='-44629' />
+ <nd ref='-44631' />
+ <nd ref='-44633' />
+ <nd ref='-44637' />
+ <nd ref='-44635' />
+ <nd ref='-44643' />
+ <nd ref='-44645' />
+ <nd ref='-44641' />
+ <nd ref='-44639' />
+ <nd ref='-44647' />
+ <nd ref='-44649' />
+ <nd ref='-44651' />
+ <nd ref='-44659' />
+ <nd ref='-44661' />
+ <nd ref='-44653' />
+ <nd ref='-44663' />
+ <nd ref='-44665' />
+ <nd ref='-44655' />
+ <nd ref='-44657' />
+ <nd ref='-44667' />
+ <nd ref='-44669' />
+ <nd ref='-40353' />
+ <nd ref='-44671' />
+ <nd ref='-44673' />
+ <nd ref='-44675' />
+ <nd ref='-44677' />
+ <nd ref='-44679' />
+ <nd ref='-40355' />
+ <nd ref='-38689' />
+ <nd ref='-44683' />
+ <nd ref='-44681' />
+ <nd ref='-40357' />
+ <nd ref='-44689' />
+ <nd ref='-44687' />
+ <nd ref='-44685' />
+ <nd ref='-37217' />
+ <nd ref='-44699' />
+ <nd ref='-44695' />
+ <nd ref='-44697' />
+ <nd ref='-44693' />
+ <nd ref='-44691' />
+ <nd ref='-37219' />
+ <nd ref='-37221' />
+ <nd ref='-37223' />
+ <nd ref='-37225' />
+ <nd ref='-37227' />
+ <nd ref='-44721' />
+ <nd ref='-44719' />
+ <nd ref='-44717' />
+ <nd ref='-44723' />
+ <nd ref='-44725' />
+ <nd ref='-44727' />
+ <nd ref='-44729' />
+ <nd ref='-44731' />
+ <nd ref='-44733' />
+ <nd ref='-44737' />
+ <nd ref='-44735' />
+ <nd ref='-37229' />
+ <nd ref='-37231' />
+ <nd ref='-44739' />
+ <nd ref='-37233' />
+ <nd ref='-44741' />
+ <nd ref='-44743' />
+ <nd ref='-44745' />
+ <nd ref='-44769' />
+ <nd ref='-44771' />
+ <nd ref='-44767' />
+ <nd ref='-44765' />
+ <nd ref='-44763' />
+ <nd ref='-44761' />
+ <nd ref='-44759' />
+ <nd ref='-44757' />
+ <nd ref='-44755' />
+ <nd ref='-44753' />
+ <nd ref='-44751' />
+ <nd ref='-44749' />
+ <nd ref='-44747' />
+ <nd ref='-37235' />
+ <nd ref='-39007' />
+ <nd ref='-39009' />
+ <nd ref='-39011' />
+ <nd ref='-44951' />
+ <nd ref='-38687' />
+ <nd ref='-44949' />
+ <nd ref='-39013' />
+ <nd ref='-44947' />
+ <nd ref='-38685' />
+ <nd ref='-39015' />
+ <nd ref='-44945' />
+ <nd ref='-39017' />
+ <nd ref='-39019' />
+ <nd ref='-39021' />
+ <nd ref='-38683' />
+ <nd ref='-38681' />
+ <nd ref='-38679' />
+ <nd ref='-44943' />
+ <nd ref='-38677' />
+ <nd ref='-44941' />
+ <nd ref='-39023' />
+ </way>
+ <way id='-57993'>
+ <nd ref='-53891' />
+ <nd ref='-53893' />
+ <nd ref='-53895' />
+ <nd ref='-53897' />
+ <nd ref='-53891' />
+ <tag k='name:en' v='Campione d'Italia' />
+ </way>
+ <way id='-57995'>
+ <nd ref='-53907' />
+ <nd ref='-53909' />
+ <nd ref='-53911' />
+ <nd ref='-53913' />
+ <nd ref='-53915' />
+ <nd ref='-53917' />
+ <nd ref='-53919' />
+ <nd ref='-53921' />
+ <nd ref='-53923' />
+ <nd ref='-53925' />
+ <nd ref='-53927' />
+ <nd ref='-53929' />
+ <nd ref='-53931' />
+ <nd ref='-53933' />
+ <nd ref='-53935' />
+ <nd ref='-53937' />
+ <nd ref='-53939' />
+ <nd ref='-53907' />
+ <tag k='name:en' v='Baarle-Hertog' />
+ </way>
+ <way id='-57997'>
+ <nd ref='-53941' />
+ <nd ref='-53943' />
+ <nd ref='-53945' />
+ <nd ref='-53947' />
+ <nd ref='-53941' />
+ <tag k='name:en' v='Baarle-Hertog' />
+ </way>
+ <way id='-57999'>
+ <nd ref='-42483' />
+ <nd ref='-43109' />
+ <nd ref='-42787' />
+ <nd ref='-53887' />
+ <nd ref='-53951' />
+ <nd ref='-53955' />
+ <nd ref='-53953' />
+ <nd ref='-53949' />
+ <nd ref='-42483' />
+ <tag k='ISO3166-2' v='AU-WA' />
+ <tag k='name:en' v='Western Australia' />
+ </way>
+ <way id='-58001'>
+ <nd ref='-53957' />
+ <nd ref='-53955' />
+ <nd ref='-53953' />
+ <nd ref='-53949' />
+ <nd ref='-42483' />
+ <nd ref='-42789' />
+ <nd ref='-53961' />
+ <nd ref='-53957' />
+ <tag k='ISO3166-2' v='AU-NT' />
+ <tag k='name:en' v='Northern Territory' />
+ </way>
+ <way id='-58003'>
+ <nd ref='-53959' />
+ <nd ref='-53957' />
+ <nd ref='-53955' />
+ <nd ref='-53951' />
+ <nd ref='-53969' />
+ <nd ref='-53971' />
+ <nd ref='-53963' />
+ <nd ref='-53973' />
+ <nd ref='-53975' />
+ <nd ref='-54051' />
+ <nd ref='-53959' />
+ <tag k='ISO3166-2' v='AU-SA' />
+ <tag k='name:en' v='South Australia' />
+ </way>
+ <way id='-58005'>
+ <nd ref='-53965' />
+ <nd ref='-42495' />
+ <nd ref='-53967' />
+ <nd ref='-53969' />
+ <nd ref='-53971' />
+ <nd ref='-53965' />
+ <tag k='ISO3166-2' v='AU-TAS' />
+ <tag k='name:en' v='Tasmania' />
+ </way>
+ <way id='-58007'>
+ <nd ref='-53973' />
+ <nd ref='-53975' />
+ <nd ref='-53977' />
+ <nd ref='-53979' />
+ <nd ref='-53981' />
+ <nd ref='-53983' />
+ <nd ref='-53985' />
+ <nd ref='-53987' />
+ <nd ref='-53989' />
+ <nd ref='-53991' />
+ <nd ref='-53993' />
+ <nd ref='-53995' />
+ <nd ref='-53997' />
+ <nd ref='-53999' />
+ <nd ref='-54001' />
+ <nd ref='-54003' />
+ <nd ref='-54005' />
+ <nd ref='-54007' />
+ <nd ref='-54009' />
+ <nd ref='-54011' />
+ <nd ref='-54013' />
+ <nd ref='-54015' />
+ <nd ref='-54017' />
+ <nd ref='-54019' />
+ <nd ref='-54021' />
+ <nd ref='-54023' />
+ <nd ref='-54025' />
+ <nd ref='-54027' />
+ <nd ref='-54029' />
+ <nd ref='-54031' />
+ <nd ref='-54033' />
+ <nd ref='-54035' />
+ <nd ref='-54037' />
+ <nd ref='-54039' />
+ <nd ref='-54041' />
+ <nd ref='-54043' />
+ <nd ref='-54045' />
+ <nd ref='-54047' />
+ <nd ref='-54049' />
+ <nd ref='-53965' />
+ <nd ref='-53971' />
+ <nd ref='-53963' />
+ <nd ref='-53973' />
+ <tag k='ISO3166-2' v='AU-VIC' />
+ <tag k='name:en' v='Victoria' />
+ </way>
+ <way id='-58009'>
+ <nd ref='-41603' />
+ <nd ref='-42489' />
+ <nd ref='-42487' />
+ <nd ref='-42485' />
+ <nd ref='-41605' />
+ <nd ref='-41607' />
+ <nd ref='-41609' />
+ <nd ref='-41611' />
+ <nd ref='-41613' />
+ <nd ref='-42789' />
+ <nd ref='-53961' />
+ <nd ref='-53957' />
+ <nd ref='-53959' />
+ <nd ref='-54051' />
+ <nd ref='-54053' />
+ <nd ref='-54055' />
+ <nd ref='-54057' />
+ <nd ref='-54059' />
+ <nd ref='-54061' />
+ <nd ref='-54063' />
+ <nd ref='-54065' />
+ <nd ref='-54067' />
+ <nd ref='-54069' />
+ <nd ref='-54071' />
+ <nd ref='-54073' />
+ <nd ref='-54075' />
+ <nd ref='-54077' />
+ <nd ref='-54079' />
+ <nd ref='-54081' />
+ <nd ref='-54083' />
+ <nd ref='-54085' />
+ <nd ref='-54087' />
+ <nd ref='-54089' />
+ <nd ref='-54091' />
+ <nd ref='-54093' />
+ <nd ref='-54095' />
+ <nd ref='-54097' />
+ <nd ref='-54099' />
+ <nd ref='-54101' />
+ <nd ref='-54103' />
+ <nd ref='-54105' />
+ <nd ref='-54107' />
+ <nd ref='-54109' />
+ <nd ref='-54117' />
+ <nd ref='-54113' />
+ <nd ref='-54111' />
+ <nd ref='-41603' />
+ <tag k='ISO3166-2' v='AU-QLD' />
+ <tag k='name:en' v='Queensland' />
+ </way>
+ <way id='-58011'>
+ <nd ref='-42493' />
+ <nd ref='-42479' />
+ <nd ref='-42477' />
+ <nd ref='-42491' />
+ <nd ref='-41603' />
+ <nd ref='-54111' />
+ <nd ref='-54113' />
+ <nd ref='-54117' />
+ <nd ref='-54115' />
+ <nd ref='-53889' />
+ <nd ref='-53711' />
+ <nd ref='-42493' />
+ <tag k='name:en' v='Coral Sea Islands' />
+ </way>
+ <way id='-58013'>
+ <nd ref='-53965' />
+ <nd ref='-54117' />
+ <nd ref='-54109' />
+ <nd ref='-54107' />
+ <nd ref='-54105' />
+ <nd ref='-54103' />
+ <nd ref='-54101' />
+ <nd ref='-54099' />
+ <nd ref='-54097' />
+ <nd ref='-54095' />
+ <nd ref='-54093' />
+ <nd ref='-54091' />
+ <nd ref='-54089' />
+ <nd ref='-54087' />
+ <nd ref='-54085' />
+ <nd ref='-54083' />
+ <nd ref='-54081' />
+ <nd ref='-54079' />
+ <nd ref='-54077' />
+ <nd ref='-54075' />
+ <nd ref='-54073' />
+ <nd ref='-54071' />
+ <nd ref='-54069' />
+ <nd ref='-54067' />
+ <nd ref='-54065' />
+ <nd ref='-54063' />
+ <nd ref='-54061' />
+ <nd ref='-54059' />
+ <nd ref='-54057' />
+ <nd ref='-54055' />
+ <nd ref='-54053' />
+ <nd ref='-54051' />
+ <nd ref='-53975' />
+ <nd ref='-53977' />
+ <nd ref='-53979' />
+ <nd ref='-53981' />
+ <nd ref='-53983' />
+ <nd ref='-53985' />
+ <nd ref='-53987' />
+ <nd ref='-53989' />
+ <nd ref='-53991' />
+ <nd ref='-53993' />
+ <nd ref='-53995' />
+ <nd ref='-53997' />
+ <nd ref='-53999' />
+ <nd ref='-54001' />
+ <nd ref='-54003' />
+ <nd ref='-54005' />
+ <nd ref='-54007' />
+ <nd ref='-54009' />
+ <nd ref='-54011' />
+ <nd ref='-54013' />
+ <nd ref='-54015' />
+ <nd ref='-54017' />
+ <nd ref='-54019' />
+ <nd ref='-54021' />
+ <nd ref='-54023' />
+ <nd ref='-54025' />
+ <nd ref='-54027' />
+ <nd ref='-54029' />
+ <nd ref='-54031' />
+ <nd ref='-54033' />
+ <nd ref='-54035' />
+ <nd ref='-54037' />
+ <nd ref='-54039' />
+ <nd ref='-54041' />
+ <nd ref='-54043' />
+ <nd ref='-54045' />
+ <nd ref='-54047' />
+ <nd ref='-54049' />
+ <nd ref='-53965' />
+ </way>
+ <way id='-58015'>
+ <nd ref='-54119' />
+ <nd ref='-54121' />
+ <nd ref='-54123' />
+ <nd ref='-54125' />
+ <nd ref='-54127' />
+ <nd ref='-54129' />
+ <nd ref='-54131' />
+ <nd ref='-54133' />
+ <nd ref='-54135' />
+ <nd ref='-54137' />
+ <nd ref='-54139' />
+ <nd ref='-54141' />
+ <nd ref='-54143' />
+ <nd ref='-54145' />
+ <nd ref='-54147' />
+ <nd ref='-54149' />
+ <nd ref='-54151' />
+ <nd ref='-54153' />
+ <nd ref='-54155' />
+ <nd ref='-54157' />
+ <nd ref='-54159' />
+ <nd ref='-54161' />
+ <nd ref='-54163' />
+ <nd ref='-54165' />
+ <nd ref='-54167' />
+ <nd ref='-54171' />
+ <nd ref='-54169' />
+ <nd ref='-54119' />
+ <tag k='ISO3166-2' v='AU-ACT' />
+ <tag k='name:en' v='Australian Capital Territory' />
+ </way>
+ <way id='-58017'>
+ <nd ref='-54173' />
+ <nd ref='-54175' />
+ <nd ref='-54177' />
+ <nd ref='-54179' />
+ <nd ref='-54181' />
+ <nd ref='-54185' />
+ <nd ref='-54191' />
+ <nd ref='-54189' />
+ <nd ref='-54187' />
+ <nd ref='-54183' />
+ <nd ref='-54173' />
+ <tag k='name:en' v='Jervis Bay Territory' />
+ </way>
+ <way id='-58019'>
+ <nd ref='-39625' />
+ <nd ref='-39623' />
+ <nd ref='-40689' />
+ <nd ref='-57399' />
+ <nd ref='-39625' />
+ <tag k='ISO3166-2' v='NL-BQ3' />
+ <tag k='name:en' v='Sint Eustatius' />
+ </way>
+ <way id='-58021'>
+ <nd ref='-54195' />
+ <nd ref='-54201' />
+ <nd ref='-54199' />
+ <nd ref='-54197' />
+ <nd ref='-55153' />
+ <nd ref='-55155' />
+ <nd ref='-42431' />
+ <nd ref='-42429' />
+ <nd ref='-42427' />
+ <nd ref='-42425' />
+ <nd ref='-42423' />
+ <nd ref='-42421' />
+ <nd ref='-42419' />
+ <nd ref='-42437' />
+ <nd ref='-42439' />
+ <nd ref='-42441' />
+ <nd ref='-42443' />
+ <nd ref='-42445' />
+ <nd ref='-42447' />
+ <nd ref='-42449' />
+ <nd ref='-42451' />
+ <nd ref='-42453' />
+ <nd ref='-43291' />
+ <nd ref='-43293' />
+ <nd ref='-43289' />
+ <nd ref='-43287' />
+ <nd ref='-43297' />
+ <nd ref='-43295' />
+ <nd ref='-43285' />
+ <nd ref='-43253' />
+ <nd ref='-43273' />
+ <nd ref='-43279' />
+ <nd ref='-43283' />
+ <nd ref='-43281' />
+ <nd ref='-43277' />
+ <nd ref='-43275' />
+ <nd ref='-43271' />
+ <nd ref='-43257' />
+ <nd ref='-43265' />
+ <nd ref='-43269' />
+ <nd ref='-43267' />
+ <nd ref='-43261' />
+ <nd ref='-43263' />
+ <nd ref='-43259' />
+ <nd ref='-43255' />
+ <nd ref='-43245' />
+ <nd ref='-43247' />
+ <nd ref='-43251' />
+ <nd ref='-43249' />
+ <nd ref='-54515' />
+ <nd ref='-54193' />
+ <nd ref='-54195' />
+ <tag k='ISO3166-2' v='CA-BC' />
+ <tag k='name:en' v='British Columbia' />
+ </way>
+ <way id='-58023'>
+ <nd ref='-54193' />
+ <nd ref='-54203' />
+ <nd ref='-54205' />
+ <nd ref='-54197' />
+ <nd ref='-54199' />
+ <nd ref='-54201' />
+ <nd ref='-54195' />
+ <nd ref='-54193' />
+ <tag k='ISO3166-2' v='CA-AB' />
+ <tag k='name:en' v='Alberta' />
+ </way>
+ <way id='-58025'>
+ <nd ref='-54203' />
+ <nd ref='-54207' />
+ <nd ref='-54211' />
+ <nd ref='-54209' />
+ <nd ref='-56307' />
+ <nd ref='-54205' />
+ <nd ref='-54203' />
+ <tag k='ISO3166-2' v='CA-SK' />
+ <tag k='name:en' v='Saskatchewan' />
+ </way>
+ <way id='-58027'>
+ <nd ref='-54207' />
+ <nd ref='-54213' />
+ <nd ref='-54215' />
+ <nd ref='-54217' />
+ <nd ref='-38391' />
+ <nd ref='-38393' />
+ <nd ref='-56233' />
+ <nd ref='-54209' />
+ <nd ref='-54211' />
+ <nd ref='-54207' />
+ <tag k='ISO3166-2' v='CA-MB' />
+ <tag k='name:en' v='Manitoba' />
+ </way>
+ <way id='-58029'>
+ <nd ref='-54215' />
+ <nd ref='-54219' />
+ <nd ref='-54221' />
+ <nd ref='-54223' />
+ <nd ref='-54225' />
+ <nd ref='-54227' />
+ <nd ref='-54229' />
+ <nd ref='-54231' />
+ <nd ref='-54233' />
+ <nd ref='-54235' />
+ <nd ref='-54237' />
+ <nd ref='-54239' />
+ <nd ref='-54241' />
+ <nd ref='-54243' />
+ <nd ref='-54245' />
+ <nd ref='-54247' />
+ <nd ref='-54249' />
+ <nd ref='-54251' />
+ <nd ref='-54253' />
+ <nd ref='-54255' />
+ <nd ref='-54257' />
+ <nd ref='-54259' />
+ <nd ref='-54261' />
+ <nd ref='-54263' />
+ <nd ref='-54265' />
+ <nd ref='-54267' />
+ <nd ref='-54269' />
+ <nd ref='-54271' />
+ <nd ref='-54273' />
+ <nd ref='-54275' />
+ <nd ref='-54277' />
+ <nd ref='-54279' />
+ <nd ref='-54281' />
+ <nd ref='-54283' />
+ <nd ref='-54285' />
+ <nd ref='-54287' />
+ <nd ref='-54289' />
+ <nd ref='-54291' />
+ <nd ref='-54293' />
+ <nd ref='-54295' />
+ <nd ref='-54297' />
+ <nd ref='-54299' />
+ <nd ref='-54301' />
+ <nd ref='-54303' />
+ <nd ref='-54305' />
+ <nd ref='-54307' />
+ <nd ref='-54309' />
+ <nd ref='-54311' />
+ <nd ref='-54313' />
+ <nd ref='-54315' />
+ <nd ref='-54317' />
+ <nd ref='-54319' />
+ <nd ref='-54321' />
+ <nd ref='-54323' />
+ <nd ref='-54325' />
+ <nd ref='-54327' />
+ <nd ref='-54329' />
+ <nd ref='-54331' />
+ <nd ref='-54333' />
+ <nd ref='-54335' />
+ <nd ref='-54337' />
+ <nd ref='-54339' />
+ <nd ref='-54341' />
+ <nd ref='-54343' />
+ <nd ref='-54345' />
+ <nd ref='-54347' />
+ <nd ref='-54349' />
+ <nd ref='-54351' />
+ <nd ref='-54353' />
+ <nd ref='-54355' />
+ <nd ref='-54357' />
+ <nd ref='-54359' />
+ <nd ref='-54361' />
+ <nd ref='-54363' />
+ <nd ref='-54365' />
+ <nd ref='-54367' />
+ <nd ref='-54369' />
+ <nd ref='-54371' />
+ <nd ref='-54373' />
+ <nd ref='-54375' />
+ <nd ref='-54377' />
+ <nd ref='-54379' />
+ <nd ref='-54381' />
+ <nd ref='-54383' />
+ <nd ref='-54385' />
+ <nd ref='-54387' />
+ <nd ref='-54389' />
+ <nd ref='-38123' />
+ <nd ref='-38125' />
+ <nd ref='-38127' />
+ <nd ref='-38129' />
+ <nd ref='-38131' />
+ <nd ref='-38133' />
+ <nd ref='-38135' />
+ <nd ref='-38137' />
+ <nd ref='-38139' />
+ <nd ref='-38141' />
+ <nd ref='-38143' />
+ <nd ref='-38145' />
+ <nd ref='-38147' />
+ <nd ref='-38149' />
+ <nd ref='-38151' />
+ <nd ref='-38153' />
+ <nd ref='-38155' />
+ <nd ref='-38157' />
+ <nd ref='-43367' />
+ <nd ref='-43369' />
+ <nd ref='-43363' />
+ <nd ref='-43365' />
+ <nd ref='-43361' />
+ <nd ref='-43359' />
+ <nd ref='-43355' />
+ <nd ref='-43357' />
+ <nd ref='-43339' />
+ <nd ref='-43341' />
+ <nd ref='-43345' />
+ <nd ref='-43343' />
+ <nd ref='-43347' />
+ <nd ref='-43349' />
+ <nd ref='-43351' />
+ <nd ref='-43353' />
+ <nd ref='-38159' />
+ <nd ref='-38161' />
+ <nd ref='-38163' />
+ <nd ref='-56631' />
+ <nd ref='-56709' />
+ <nd ref='-38165' />
+ <nd ref='-38167' />
+ <nd ref='-38169' />
+ <nd ref='-56119' />
+ <nd ref='-38171' />
+ <nd ref='-38173' />
+ <nd ref='-38175' />
+ <nd ref='-38177' />
+ <nd ref='-38179' />
+ <nd ref='-38181' />
+ <nd ref='-38183' />
+ <nd ref='-38185' />
+ <nd ref='-38187' />
+ <nd ref='-38189' />
+ <nd ref='-38191' />
+ <nd ref='-38193' />
+ <nd ref='-38195' />
+ <nd ref='-38197' />
+ <nd ref='-43337' />
+ <nd ref='-43335' />
+ <nd ref='-43333' />
+ <nd ref='-38199' />
+ <nd ref='-38201' />
+ <nd ref='-38203' />
+ <nd ref='-38205' />
+ <nd ref='-38207' />
+ <nd ref='-38209' />
+ <nd ref='-38211' />
+ <nd ref='-38213' />
+ <nd ref='-38215' />
+ <nd ref='-38217' />
+ <nd ref='-38219' />
+ <nd ref='-38221' />
+ <nd ref='-38223' />
+ <nd ref='-38225' />
+ <nd ref='-38227' />
+ <nd ref='-38229' />
+ <nd ref='-38231' />
+ <nd ref='-38233' />
+ <nd ref='-38235' />
+ <nd ref='-38237' />
+ <nd ref='-38239' />
+ <nd ref='-38241' />
+ <nd ref='-38243' />
+ <nd ref='-38245' />
+ <nd ref='-38247' />
+ <nd ref='-38249' />
+ <nd ref='-38251' />
+ <nd ref='-38253' />
+ <nd ref='-38255' />
+ <nd ref='-38257' />
+ <nd ref='-38259' />
+ <nd ref='-38261' />
+ <nd ref='-38263' />
+ <nd ref='-38265' />
+ <nd ref='-38267' />
+ <nd ref='-38269' />
+ <nd ref='-38271' />
+ <nd ref='-38273' />
+ <nd ref='-38275' />
+ <nd ref='-38277' />
+ <nd ref='-38279' />
+ <nd ref='-38281' />
+ <nd ref='-38283' />
+ <nd ref='-43331' />
+ <nd ref='-38285' />
+ <nd ref='-38287' />
+ <nd ref='-38289' />
+ <nd ref='-38291' />
+ <nd ref='-38293' />
+ <nd ref='-38295' />
+ <nd ref='-38297' />
+ <nd ref='-38299' />
+ <nd ref='-38301' />
+ <nd ref='-38303' />
+ <nd ref='-38305' />
+ <nd ref='-38307' />
+ <nd ref='-38309' />
+ <nd ref='-38311' />
+ <nd ref='-38313' />
+ <nd ref='-43329' />
+ <nd ref='-38315' />
+ <nd ref='-43327' />
+ <nd ref='-38317' />
+ <nd ref='-43325' />
+ <nd ref='-43323' />
+ <nd ref='-38319' />
+ <nd ref='-38321' />
+ <nd ref='-38323' />
+ <nd ref='-38325' />
+ <nd ref='-38327' />
+ <nd ref='-38329' />
+ <nd ref='-43321' />
+ <nd ref='-43319' />
+ <nd ref='-38331' />
+ <nd ref='-38333' />
+ <nd ref='-38335' />
+ <nd ref='-38337' />
+ <nd ref='-38339' />
+ <nd ref='-43317' />
+ <nd ref='-43315' />
+ <nd ref='-38341' />
+ <nd ref='-38343' />
+ <nd ref='-38345' />
+ <nd ref='-38347' />
+ <nd ref='-38349' />
+ <nd ref='-38351' />
+ <nd ref='-43313' />
+ <nd ref='-38353' />
+ <nd ref='-38355' />
+ <nd ref='-38357' />
+ <nd ref='-38359' />
+ <nd ref='-43311' />
+ <nd ref='-43309' />
+ <nd ref='-43307' />
+ <nd ref='-38361' />
+ <nd ref='-38363' />
+ <nd ref='-43305' />
+ <nd ref='-38365' />
+ <nd ref='-38367' />
+ <nd ref='-38369' />
+ <nd ref='-38371' />
+ <nd ref='-38373' />
+ <nd ref='-38375' />
+ <nd ref='-38377' />
+ <nd ref='-43303' />
+ <nd ref='-38379' />
+ <nd ref='-38381' />
+ <nd ref='-38383' />
+ <nd ref='-38385' />
+ <nd ref='-43299' />
+ <nd ref='-38387' />
+ <nd ref='-38389' />
+ <nd ref='-43301' />
+ <nd ref='-38391' />
+ <nd ref='-54217' />
+ <nd ref='-54215' />
+ <tag k='ISO3166-2' v='CA-ON' />
+ <tag k='name:en' v='Ontario' />
+ </way>
+ <way id='-58031'>
+ <nd ref='-42455' />
+ <nd ref='-38015' />
+ <nd ref='-38017' />
+ <nd ref='-54391' />
+ <nd ref='-54393' />
+ <nd ref='-54395' />
+ <nd ref='-54397' />
+ <nd ref='-54399' />
+ <nd ref='-54401' />
+ <nd ref='-54403' />
+ <nd ref='-54405' />
+ <nd ref='-54413' />
+ <nd ref='-54407' />
+ <nd ref='-38403' />
+ <nd ref='-42455' />
+ <tag k='ISO3166-2' v='CA-NS' />
+ <tag k='name:en' v='Nova Scotia' />
+ </way>
+ <way id='-58033'>
+ <nd ref='-54403' />
+ <nd ref='-54409' />
+ <nd ref='-54411' />
+ <nd ref='-54453' />
+ <nd ref='-54413' />
+ <nd ref='-54405' />
+ <nd ref='-54403' />
+ <tag k='ISO3166-2' v='CA-PE' />
+ <tag k='name:en' v='Prince Edward Island' />
+ </way>
+ <way id='-58035'>
+ <nd ref='-54415' />
+ <nd ref='-54417' />
+ <nd ref='-54419' />
+ <nd ref='-54421' />
+ <nd ref='-54423' />
+ <nd ref='-54425' />
+ <nd ref='-54427' />
+ <nd ref='-54429' />
+ <nd ref='-54431' />
+ <nd ref='-54433' />
+ <nd ref='-54435' />
+ <nd ref='-54437' />
+ <nd ref='-54439' />
+ <nd ref='-54441' />
+ <nd ref='-54443' />
+ <nd ref='-54445' />
+ <nd ref='-54447' />
+ <nd ref='-54449' />
+ <nd ref='-54451' />
+ <nd ref='-54453' />
+ <nd ref='-54411' />
+ <nd ref='-54409' />
+ <nd ref='-54403' />
+ <nd ref='-54401' />
+ <nd ref='-54399' />
+ <nd ref='-54397' />
+ <nd ref='-54395' />
+ <nd ref='-54393' />
+ <nd ref='-54391' />
+ <nd ref='-38017' />
+ <nd ref='-42461' />
+ <nd ref='-42459' />
+ <nd ref='-42463' />
+ <nd ref='-42457' />
+ <nd ref='-38019' />
+ <nd ref='-38021' />
+ <nd ref='-38023' />
+ <nd ref='-38025' />
+ <nd ref='-38027' />
+ <nd ref='-38029' />
+ <nd ref='-36301' />
+ <nd ref='-38031' />
+ <nd ref='-38033' />
+ <nd ref='-38035' />
+ <nd ref='-38037' />
+ <nd ref='-38039' />
+ <nd ref='-38041' />
+ <nd ref='-38043' />
+ <nd ref='-38045' />
+ <nd ref='-36303' />
+ <nd ref='-38047' />
+ <nd ref='-38049' />
+ <nd ref='-38051' />
+ <nd ref='-38053' />
+ <nd ref='-36305' />
+ <nd ref='-38055' />
+ <nd ref='-38057' />
+ <nd ref='-43399' />
+ <nd ref='-38059' />
+ <nd ref='-38061' />
+ <nd ref='-38063' />
+ <nd ref='-38065' />
+ <nd ref='-38067' />
+ <nd ref='-43397' />
+ <nd ref='-43395' />
+ <nd ref='-38069' />
+ <nd ref='-38071' />
+ <nd ref='-54415' />
+ <tag k='ISO3166-2' v='CA-NB' />
+ <tag k='name:en' v='New Brunswick' />
+ </way>
+ <way id='-58037'>
+ <nd ref='-42471' />
+ <nd ref='-54473' />
+ <nd ref='-54471' />
+ <nd ref='-54469' />
+ <nd ref='-54467' />
+ <nd ref='-54465' />
+ <nd ref='-54463' />
+ <nd ref='-54461' />
+ <nd ref='-54459' />
+ <nd ref='-54455' />
+ <nd ref='-54457' />
+ <nd ref='-54407' />
+ <nd ref='-38403' />
+ <nd ref='-42691' />
+ <nd ref='-38401' />
+ <nd ref='-38399' />
+ <nd ref='-38397' />
+ <nd ref='-42471' />
+ <tag k='ISO3166-2' v='CA-NL' />
+ <tag k='name:en' v='Newfoundland and Labrador' />
+ </way>
+ <way id='-58039'>
+ <nd ref='-54471' />
+ <nd ref='-54475' />
+ <nd ref='-54477' />
+ <nd ref='-54479' />
+ <nd ref='-54481' />
+ <nd ref='-54483' />
+ <nd ref='-54485' />
+ <nd ref='-54487' />
+ <nd ref='-54489' />
+ <nd ref='-54491' />
+ <nd ref='-54493' />
+ <nd ref='-54495' />
+ <nd ref='-54223' />
+ <nd ref='-54225' />
+ <nd ref='-54227' />
+ <nd ref='-54229' />
+ <nd ref='-54231' />
+ <nd ref='-54233' />
+ <nd ref='-54235' />
+ <nd ref='-54237' />
+ <nd ref='-54239' />
+ <nd ref='-54241' />
+ <nd ref='-54243' />
+ <nd ref='-54245' />
+ <nd ref='-54247' />
+ <nd ref='-54249' />
+ <nd ref='-54251' />
+ <nd ref='-54253' />
+ <nd ref='-54255' />
+ <nd ref='-54257' />
+ <nd ref='-54259' />
+ <nd ref='-54261' />
+ <nd ref='-54263' />
+ <nd ref='-54265' />
+ <nd ref='-54267' />
+ <nd ref='-54269' />
+ <nd ref='-54271' />
+ <nd ref='-54273' />
+ <nd ref='-54275' />
+ <nd ref='-54277' />
+ <nd ref='-54279' />
+ <nd ref='-54281' />
+ <nd ref='-54283' />
+ <nd ref='-54285' />
+ <nd ref='-54287' />
+ <nd ref='-54289' />
+ <nd ref='-54291' />
+ <nd ref='-54293' />
+ <nd ref='-54295' />
+ <nd ref='-54297' />
+ <nd ref='-54299' />
+ <nd ref='-54301' />
+ <nd ref='-54303' />
+ <nd ref='-54305' />
+ <nd ref='-54307' />
+ <nd ref='-54309' />
+ <nd ref='-54311' />
+ <nd ref='-54313' />
+ <nd ref='-54315' />
+ <nd ref='-54317' />
+ <nd ref='-54319' />
+ <nd ref='-54321' />
+ <nd ref='-54323' />
+ <nd ref='-54325' />
+ <nd ref='-54327' />
+ <nd ref='-54329' />
+ <nd ref='-54331' />
+ <nd ref='-54333' />
+ <nd ref='-54335' />
+ <nd ref='-54337' />
+ <nd ref='-54339' />
+ <nd ref='-54341' />
+ <nd ref='-54343' />
+ <nd ref='-54345' />
+ <nd ref='-54347' />
+ <nd ref='-54349' />
+ <nd ref='-54351' />
+ <nd ref='-54353' />
+ <nd ref='-54355' />
+ <nd ref='-54357' />
+ <nd ref='-54359' />
+ <nd ref='-54361' />
+ <nd ref='-54363' />
+ <nd ref='-54365' />
+ <nd ref='-54367' />
+ <nd ref='-54369' />
+ <nd ref='-54371' />
+ <nd ref='-54373' />
+ <nd ref='-54375' />
+ <nd ref='-54377' />
+ <nd ref='-54379' />
+ <nd ref='-54381' />
+ <nd ref='-54383' />
+ <nd ref='-54385' />
+ <nd ref='-54387' />
+ <nd ref='-54389' />
+ <nd ref='-56657' />
+ <nd ref='-38121' />
+ <nd ref='-38119' />
+ <nd ref='-38117' />
+ <nd ref='-38115' />
+ <nd ref='-38113' />
+ <nd ref='-38111' />
+ <nd ref='-38109' />
+ <nd ref='-38107' />
+ <nd ref='-38105' />
+ <nd ref='-38103' />
+ <nd ref='-38101' />
+ <nd ref='-43371' />
+ <nd ref='-43373' />
+ <nd ref='-38099' />
+ <nd ref='-43375' />
+ <nd ref='-43377' />
+ <nd ref='-38097' />
+ <nd ref='-38095' />
+ <nd ref='-43379' />
+ <nd ref='-43381' />
+ <nd ref='-43383' />
+ <nd ref='-43385' />
+ <nd ref='-38093' />
+ <nd ref='-43387' />
+ <nd ref='-43389' />
+ <nd ref='-38091' />
+ <nd ref='-38089' />
+ <nd ref='-38087' />
+ <nd ref='-38085' />
+ <nd ref='-38083' />
+ <nd ref='-43391' />
+ <nd ref='-43393' />
+ <nd ref='-38081' />
+ <nd ref='-38079' />
+ <nd ref='-38077' />
+ <nd ref='-38075' />
+ <nd ref='-38073' />
+ <nd ref='-54415' />
+ <nd ref='-54417' />
+ <nd ref='-54419' />
+ <nd ref='-54421' />
+ <nd ref='-54423' />
+ <nd ref='-54425' />
+ <nd ref='-54427' />
+ <nd ref='-54429' />
+ <nd ref='-54431' />
+ <nd ref='-54433' />
+ <nd ref='-54435' />
+ <nd ref='-54437' />
+ <nd ref='-54439' />
+ <nd ref='-54441' />
+ <nd ref='-54443' />
+ <nd ref='-54445' />
+ <nd ref='-54447' />
+ <nd ref='-54449' />
+ <nd ref='-54451' />
+ <nd ref='-54453' />
+ <nd ref='-54413' />
+ <nd ref='-54407' />
+ <nd ref='-54457' />
+ <nd ref='-54455' />
+ <nd ref='-54459' />
+ <nd ref='-54461' />
+ <nd ref='-54463' />
+ <nd ref='-54465' />
+ <nd ref='-54467' />
+ <nd ref='-54469' />
+ <nd ref='-54471' />
+ <tag k='ISO3166-2' v='CA-QC' />
+ <tag k='name:en' v='Quebec' />
+ </way>
+ <way id='-58041'>
+ <nd ref='-38395' />
+ <nd ref='-54497' />
+ <nd ref='-54499' />
+ <nd ref='-54501' />
+ <nd ref='-54503' />
+ <nd ref='-54505' />
+ <nd ref='-54507' />
+ <nd ref='-54509' />
+ <nd ref='-54511' />
+ <nd ref='-54513' />
+ <nd ref='-54515' />
+ <nd ref='-43249' />
+ <nd ref='-43241' />
+ <nd ref='-43243' />
+ <nd ref='-43239' />
+ <nd ref='-43235' />
+ <nd ref='-43237' />
+ <nd ref='-43233' />
+ <nd ref='-43231' />
+ <nd ref='-38395' />
+ <tag k='ISO3166-2' v='CA-YT' />
+ <tag k='name:en' v='Yukon' />
+ </way>
+ <way id='-58043'>
+ <nd ref='-54517' />
+ <nd ref='-54519' />
+ <nd ref='-54521' />
+ <nd ref='-54523' />
+ <nd ref='-54525' />
+ <nd ref='-54527' />
+ <nd ref='-54207' />
+ <nd ref='-54203' />
+ <nd ref='-54193' />
+ <nd ref='-54515' />
+ <nd ref='-54513' />
+ <nd ref='-54511' />
+ <nd ref='-54509' />
+ <nd ref='-54507' />
+ <nd ref='-54505' />
+ <nd ref='-54503' />
+ <nd ref='-54501' />
+ <nd ref='-54499' />
+ <nd ref='-54497' />
+ <nd ref='-38395' />
+ <nd ref='-54517' />
+ <tag k='ISO3166-2' v='CA-NT' />
+ <tag k='name:en' v='Northwest Territories' />
+ </way>
+ <way id='-58045'>
+ <nd ref='-54517' />
+ <nd ref='-42405' />
+ <nd ref='-42407' />
+ <nd ref='-42409' />
+ <nd ref='-42411' />
+ <nd ref='-42415' />
+ <nd ref='-42413' />
+ <nd ref='-42417' />
+ <nd ref='-54473' />
+ <nd ref='-54471' />
+ <nd ref='-54475' />
+ <nd ref='-54477' />
+ <nd ref='-54479' />
+ <nd ref='-54481' />
+ <nd ref='-54483' />
+ <nd ref='-54485' />
+ <nd ref='-54487' />
+ <nd ref='-54489' />
+ <nd ref='-54491' />
+ <nd ref='-54493' />
+ <nd ref='-54495' />
+ <nd ref='-54223' />
+ <nd ref='-54221' />
+ <nd ref='-54219' />
+ <nd ref='-54215' />
+ <nd ref='-54213' />
+ <nd ref='-54207' />
+ <nd ref='-54527' />
+ <nd ref='-54525' />
+ <nd ref='-54523' />
+ <nd ref='-54521' />
+ <nd ref='-54519' />
+ <nd ref='-54517' />
+ <tag k='ISO3166-2' v='CA-NU' />
+ <tag k='name:en' v='Nunavut' />
+ </way>
+ <way id='-58047'>
+ <nd ref='-54535' />
+ <nd ref='-54557' />
+ <nd ref='-54555' />
+ <nd ref='-54553' />
+ <nd ref='-54551' />
+ <nd ref='-54549' />
+ <nd ref='-54547' />
+ <nd ref='-54545' />
+ <nd ref='-54543' />
+ <nd ref='-54541' />
+ <nd ref='-54539' />
+ <nd ref='-54537' />
+ <nd ref='-54529' />
+ <nd ref='-54531' />
+ <nd ref='-54533' />
+ <nd ref='-54535' />
+ <tag k='ISO3166-2' v='US-DC' />
+ <tag k='name:en' v='Washington, D.C.' />
+ </way>
+ <way id='-58049'>
+ <nd ref='-57007' />
+ <nd ref='-54559' />
+ <nd ref='-54561' />
+ <nd ref='-54563' />
+ <nd ref='-56281' />
+ <nd ref='-54565' />
+ <nd ref='-54567' />
+ <nd ref='-54569' />
+ <nd ref='-54571' />
+ <nd ref='-54573' />
+ <nd ref='-54575' />
+ <nd ref='-54577' />
+ <nd ref='-54579' />
+ <nd ref='-54581' />
+ <nd ref='-54583' />
+ <nd ref='-54585' />
+ <nd ref='-54587' />
+ <nd ref='-54589' />
+ <nd ref='-54591' />
+ <nd ref='-54593' />
+ <nd ref='-54595' />
+ <nd ref='-54597' />
+ <nd ref='-54599' />
+ <nd ref='-54601' />
+ <nd ref='-54603' />
+ <nd ref='-54605' />
+ <nd ref='-54607' />
+ <nd ref='-54609' />
+ <nd ref='-54611' />
+ <nd ref='-54613' />
+ <nd ref='-54615' />
+ <nd ref='-54617' />
+ <nd ref='-54619' />
+ <nd ref='-54621' />
+ <nd ref='-54623' />
+ <nd ref='-57007' />
+ <tag k='ISO3166-2' v='US-AL' />
+ <tag k='name:en' v='Alabama' />
+ </way>
+ <way id='-58051'>
+ <nd ref='-54625' />
+ <nd ref='-54627' />
+ <nd ref='-54629' />
+ <nd ref='-54631' />
+ <nd ref='-54633' />
+ <nd ref='-54635' />
+ <nd ref='-54637' />
+ <nd ref='-54639' />
+ <nd ref='-54641' />
+ <nd ref='-54643' />
+ <nd ref='-54645' />
+ <nd ref='-54647' />
+ <nd ref='-54649' />
+ <nd ref='-54651' />
+ <nd ref='-54653' />
+ <nd ref='-54655' />
+ <nd ref='-54657' />
+ <nd ref='-54659' />
+ <nd ref='-54661' />
+ <nd ref='-54663' />
+ <nd ref='-54665' />
+ <nd ref='-54667' />
+ <nd ref='-54669' />
+ <nd ref='-54671' />
+ <nd ref='-54673' />
+ <nd ref='-54675' />
+ <nd ref='-54677' />
+ <nd ref='-54679' />
+ <nd ref='-54681' />
+ <nd ref='-54683' />
+ <nd ref='-54685' />
+ <nd ref='-54687' />
+ <nd ref='-54689' />
+ <nd ref='-54691' />
+ <nd ref='-54693' />
+ <nd ref='-54695' />
+ <nd ref='-54697' />
+ <nd ref='-54699' />
+ <nd ref='-54701' />
+ <nd ref='-54703' />
+ <nd ref='-54705' />
+ <nd ref='-54707' />
+ <nd ref='-54709' />
+ <nd ref='-54711' />
+ <nd ref='-54713' />
+ <nd ref='-54715' />
+ <nd ref='-54717' />
+ <nd ref='-54719' />
+ <nd ref='-54721' />
+ <nd ref='-54723' />
+ <nd ref='-54725' />
+ <nd ref='-54727' />
+ <nd ref='-54729' />
+ <nd ref='-54731' />
+ <nd ref='-54733' />
+ <nd ref='-54735' />
+ <nd ref='-54737' />
+ <nd ref='-54739' />
+ <nd ref='-54741' />
+ <nd ref='-41081' />
+ <nd ref='-36817' />
+ <nd ref='-36823' />
+ <nd ref='-36819' />
+ <nd ref='-36821' />
+ <nd ref='-41083' />
+ <nd ref='-41003' />
+ <nd ref='-54625' />
+ <tag k='ISO3166-2' v='US-AZ' />
+ <tag k='name:en' v='Arizona' />
+ </way>
+ <way id='-58053'>
+ <nd ref='-54743' />
+ <nd ref='-54745' />
+ <nd ref='-54747' />
+ <nd ref='-54749' />
+ <nd ref='-54751' />
+ <nd ref='-54753' />
+ <nd ref='-54755' />
+ <nd ref='-54757' />
+ <nd ref='-54759' />
+ <nd ref='-54761' />
+ <nd ref='-54763' />
+ <nd ref='-54765' />
+ <nd ref='-54767' />
+ <nd ref='-54769' />
+ <nd ref='-54771' />
+ <nd ref='-54773' />
+ <nd ref='-54775' />
+ <nd ref='-54777' />
+ <nd ref='-54779' />
+ <nd ref='-54781' />
+ <nd ref='-54783' />
+ <nd ref='-54785' />
+ <nd ref='-54787' />
+ <nd ref='-54789' />
+ <nd ref='-54791' />
+ <nd ref='-54793' />
+ <nd ref='-54795' />
+ <nd ref='-54797' />
+ <nd ref='-54799' />
+ <nd ref='-54801' />
+ <nd ref='-54803' />
+ <nd ref='-54805' />
+ <nd ref='-54807' />
+ <nd ref='-54743' />
+ <tag k='ISO3166-2' v='US-AR' />
+ <tag k='name:en' v='Arkansas' />
+ </way>
+ <way id='-58055'>
+ <nd ref='-42433' />
+ <nd ref='-42435' />
+ <nd ref='-41079' />
+ <nd ref='-41081' />
+ <nd ref='-54741' />
+ <nd ref='-54739' />
+ <nd ref='-54737' />
+ <nd ref='-54735' />
+ <nd ref='-54733' />
+ <nd ref='-54731' />
+ <nd ref='-54729' />
+ <nd ref='-54727' />
+ <nd ref='-54725' />
+ <nd ref='-54723' />
+ <nd ref='-54721' />
+ <nd ref='-54719' />
+ <nd ref='-54717' />
+ <nd ref='-54715' />
+ <nd ref='-54713' />
+ <nd ref='-54711' />
+ <nd ref='-54709' />
+ <nd ref='-54707' />
+ <nd ref='-54705' />
+ <nd ref='-54703' />
+ <nd ref='-54701' />
+ <nd ref='-54699' />
+ <nd ref='-54697' />
+ <nd ref='-54695' />
+ <nd ref='-54693' />
+ <nd ref='-54691' />
+ <nd ref='-54689' />
+ <nd ref='-54687' />
+ <nd ref='-54685' />
+ <nd ref='-54683' />
+ <nd ref='-54681' />
+ <nd ref='-54679' />
+ <nd ref='-54809' />
+ <nd ref='-54811' />
+ <nd ref='-54813' />
+ <nd ref='-42433' />
+ <tag k='ISO3166-2' v='US-CA' />
+ <tag k='name:en' v='California' />
+ </way>
+ <way id='-58057'>
+ <nd ref='-54627' />
+ <nd ref='-54815' />
+ <nd ref='-56275' />
+ <nd ref='-54817' />
+ <nd ref='-55703' />
+ <nd ref='-54819' />
+ <nd ref='-56619' />
+ <nd ref='-54627' />
+ <tag k='ISO3166-2' v='US-CO' />
+ <tag k='name:en' v='Colorado' />
+ </way>
+ <way id='-58059'>
+ <nd ref='-54821' />
+ <nd ref='-54823' />
+ <nd ref='-54825' />
+ <nd ref='-54827' />
+ <nd ref='-54829' />
+ <nd ref='-54831' />
+ <nd ref='-54833' />
+ <nd ref='-54835' />
+ <nd ref='-54837' />
+ <nd ref='-54839' />
+ <nd ref='-54841' />
+ <nd ref='-54843' />
+ <nd ref='-54845' />
+ <nd ref='-54847' />
+ <nd ref='-54849' />
+ <nd ref='-54851' />
+ <nd ref='-54853' />
+ <nd ref='-54855' />
+ <nd ref='-54857' />
+ <nd ref='-54859' />
+ <nd ref='-56089' />
+ <nd ref='-54861' />
+ <nd ref='-54863' />
+ <nd ref='-54865' />
+ <nd ref='-54867' />
+ <nd ref='-54869' />
+ <nd ref='-54821' />
+ <tag k='ISO3166-2' v='US-CT' />
+ <tag k='name:en' v='Connecticut' />
+ </way>
+ <way id='-58061'>
+ <nd ref='-54871' />
+ <nd ref='-54873' />
+ <nd ref='-54875' />
+ <nd ref='-54877' />
+ <nd ref='-54879' />
+ <nd ref='-54881' />
+ <nd ref='-54883' />
+ <nd ref='-54885' />
+ <nd ref='-56435' />
+ <nd ref='-54887' />
+ <nd ref='-54889' />
+ <nd ref='-54891' />
+ <nd ref='-54893' />
+ <nd ref='-54895' />
+ <nd ref='-54897' />
+ <nd ref='-54899' />
+ <nd ref='-54901' />
+ <nd ref='-54903' />
+ <nd ref='-54905' />
+ <nd ref='-54907' />
+ <nd ref='-54909' />
+ <nd ref='-54911' />
+ <nd ref='-54913' />
+ <nd ref='-54915' />
+ <nd ref='-54917' />
+ <nd ref='-54871' />
+ <tag k='ISO3166-2' v='US-DE' />
+ <tag k='name:en' v='Delaware' />
+ </way>
+ <way id='-58063'>
+ <nd ref='-54623' />
+ <nd ref='-54919' />
+ <nd ref='-42467' />
+ <nd ref='-42565' />
+ <nd ref='-42465' />
+ <nd ref='-57175' />
+ <nd ref='-54921' />
+ <nd ref='-54923' />
+ <nd ref='-54925' />
+ <nd ref='-54927' />
+ <nd ref='-54929' />
+ <nd ref='-54931' />
+ <nd ref='-54933' />
+ <nd ref='-54935' />
+ <nd ref='-54937' />
+ <nd ref='-54939' />
+ <nd ref='-54941' />
+ <nd ref='-54943' />
+ <nd ref='-54945' />
+ <nd ref='-54947' />
+ <nd ref='-54597' />
+ <nd ref='-54599' />
+ <nd ref='-54601' />
+ <nd ref='-54603' />
+ <nd ref='-54605' />
+ <nd ref='-54607' />
+ <nd ref='-54609' />
+ <nd ref='-54611' />
+ <nd ref='-54613' />
+ <nd ref='-54615' />
+ <nd ref='-54617' />
+ <nd ref='-54619' />
+ <nd ref='-54621' />
+ <nd ref='-54623' />
+ <tag k='ISO3166-2' v='US-FL' />
+ <tag k='name:en' v='Florida' />
+ </way>
+ <way id='-58065'>
+ <nd ref='-54567' />
+ <nd ref='-56659' />
+ <nd ref='-54949' />
+ <nd ref='-54951' />
+ <nd ref='-54953' />
+ <nd ref='-54955' />
+ <nd ref='-54957' />
+ <nd ref='-54959' />
+ <nd ref='-54961' />
+ <nd ref='-54963' />
+ <nd ref='-54965' />
+ <nd ref='-54967' />
+ <nd ref='-54969' />
+ <nd ref='-54971' />
+ <nd ref='-54973' />
+ <nd ref='-54975' />
+ <nd ref='-54977' />
+ <nd ref='-54979' />
+ <nd ref='-54981' />
+ <nd ref='-54983' />
+ <nd ref='-54985' />
+ <nd ref='-54987' />
+ <nd ref='-54989' />
+ <nd ref='-54991' />
+ <nd ref='-54993' />
+ <nd ref='-54995' />
+ <nd ref='-54997' />
+ <nd ref='-54999' />
+ <nd ref='-55001' />
+ <nd ref='-55003' />
+ <nd ref='-55005' />
+ <nd ref='-55007' />
+ <nd ref='-55009' />
+ <nd ref='-55011' />
+ <nd ref='-55013' />
+ <nd ref='-55015' />
+ <nd ref='-55017' />
+ <nd ref='-55019' />
+ <nd ref='-55021' />
+ <nd ref='-55023' />
+ <nd ref='-55025' />
+ <nd ref='-55027' />
+ <nd ref='-55029' />
+ <nd ref='-55031' />
+ <nd ref='-55033' />
+ <nd ref='-55035' />
+ <nd ref='-55037' />
+ <nd ref='-55039' />
+ <nd ref='-55041' />
+ <nd ref='-55043' />
+ <nd ref='-55045' />
+ <nd ref='-55047' />
+ <nd ref='-55049' />
+ <nd ref='-55051' />
+ <nd ref='-55053' />
+ <nd ref='-55055' />
+ <nd ref='-55057' />
+ <nd ref='-55059' />
+ <nd ref='-55061' />
+ <nd ref='-55063' />
+ <nd ref='-55065' />
+ <nd ref='-55067' />
+ <nd ref='-55069' />
+ <nd ref='-55071' />
+ <nd ref='-55073' />
+ <nd ref='-55075' />
+ <nd ref='-55077' />
+ <nd ref='-55079' />
+ <nd ref='-55081' />
+ <nd ref='-55083' />
+ <nd ref='-57175' />
+ <nd ref='-54921' />
+ <nd ref='-54923' />
+ <nd ref='-54925' />
+ <nd ref='-54927' />
+ <nd ref='-54929' />
+ <nd ref='-54931' />
+ <nd ref='-54933' />
+ <nd ref='-54935' />
+ <nd ref='-54937' />
+ <nd ref='-54939' />
+ <nd ref='-54941' />
+ <nd ref='-54943' />
+ <nd ref='-54945' />
+ <nd ref='-54947' />
+ <nd ref='-54597' />
+ <nd ref='-54593' />
+ <nd ref='-54591' />
+ <nd ref='-54589' />
+ <nd ref='-54587' />
+ <nd ref='-54585' />
+ <nd ref='-54583' />
+ <nd ref='-54581' />
+ <nd ref='-54579' />
+ <nd ref='-54577' />
+ <nd ref='-54575' />
+ <nd ref='-54573' />
+ <nd ref='-54571' />
+ <nd ref='-54569' />
+ <nd ref='-54567' />
+ <tag k='ISO3166-2' v='US-GA' />
+ <tag k='name:en' v='Georgia' />
+ </way>
+ <way id='-58067'>
+ <nd ref='-55085' />
+ <nd ref='-56345' />
+ <nd ref='-55087' />
+ <nd ref='-55089' />
+ <nd ref='-55091' />
+ <nd ref='-55093' />
+ <nd ref='-55095' />
+ <nd ref='-55097' />
+ <nd ref='-55099' />
+ <nd ref='-55101' />
+ <nd ref='-55103' />
+ <nd ref='-55105' />
+ <nd ref='-55107' />
+ <nd ref='-55109' />
+ <nd ref='-55111' />
+ <nd ref='-55113' />
+ <nd ref='-55115' />
+ <nd ref='-55117' />
+ <nd ref='-55119' />
+ <nd ref='-55121' />
+ <nd ref='-55123' />
+ <nd ref='-55125' />
+ <nd ref='-55127' />
+ <nd ref='-55129' />
+ <nd ref='-55131' />
+ <nd ref='-55133' />
+ <nd ref='-55135' />
+ <nd ref='-55137' />
+ <nd ref='-55139' />
+ <nd ref='-55141' />
+ <nd ref='-55143' />
+ <nd ref='-55145' />
+ <nd ref='-55147' />
+ <nd ref='-55149' />
+ <nd ref='-55151' />
+ <nd ref='-55153' />
+ <nd ref='-55155' />
+ <nd ref='-55157' />
+ <nd ref='-55159' />
+ <nd ref='-55161' />
+ <nd ref='-55163' />
+ <nd ref='-55165' />
+ <nd ref='-55167' />
+ <nd ref='-55169' />
+ <nd ref='-55171' />
+ <nd ref='-55173' />
+ <nd ref='-55175' />
+ <nd ref='-55177' />
+ <nd ref='-55179' />
+ <nd ref='-55181' />
+ <nd ref='-55183' />
+ <nd ref='-55185' />
+ <nd ref='-55187' />
+ <nd ref='-55189' />
+ <nd ref='-55191' />
+ <nd ref='-55193' />
+ <nd ref='-55195' />
+ <nd ref='-55197' />
+ <nd ref='-55199' />
+ <nd ref='-55201' />
+ <nd ref='-55203' />
+ <nd ref='-55205' />
+ <nd ref='-55207' />
+ <nd ref='-55209' />
+ <nd ref='-55211' />
+ <nd ref='-55213' />
+ <nd ref='-55215' />
+ <nd ref='-55217' />
+ <nd ref='-55219' />
+ <nd ref='-55221' />
+ <nd ref='-55223' />
+ <nd ref='-55225' />
+ <nd ref='-55227' />
+ <nd ref='-55229' />
+ <nd ref='-55231' />
+ <nd ref='-55233' />
+ <nd ref='-55235' />
+ <nd ref='-55237' />
+ <nd ref='-55085' />
+ <tag k='ISO3166-2' v='US-ID' />
+ <tag k='name:en' v='Idaho' />
+ </way>
+ <way id='-58069'>
+ <nd ref='-55239' />
+ <nd ref='-55241' />
+ <nd ref='-55243' />
+ <nd ref='-55245' />
+ <nd ref='-55247' />
+ <nd ref='-55249' />
+ <nd ref='-55251' />
+ <nd ref='-55253' />
+ <nd ref='-55255' />
+ <nd ref='-55257' />
+ <nd ref='-55259' />
+ <nd ref='-55261' />
+ <nd ref='-55263' />
+ <nd ref='-55265' />
+ <nd ref='-55267' />
+ <nd ref='-55269' />
+ <nd ref='-55271' />
+ <nd ref='-55273' />
+ <nd ref='-55275' />
+ <nd ref='-55277' />
+ <nd ref='-55279' />
+ <nd ref='-55281' />
+ <nd ref='-55283' />
+ <nd ref='-55285' />
+ <nd ref='-55287' />
+ <nd ref='-55289' />
+ <nd ref='-55291' />
+ <nd ref='-55293' />
+ <nd ref='-55295' />
+ <nd ref='-55297' />
+ <nd ref='-55299' />
+ <nd ref='-55301' />
+ <nd ref='-55303' />
+ <nd ref='-55305' />
+ <nd ref='-55307' />
+ <nd ref='-55309' />
+ <nd ref='-55311' />
+ <nd ref='-55313' />
+ <nd ref='-55315' />
+ <nd ref='-55317' />
+ <nd ref='-55319' />
+ <nd ref='-55321' />
+ <nd ref='-55323' />
+ <nd ref='-55325' />
+ <nd ref='-55327' />
+ <nd ref='-55329' />
+ <nd ref='-55331' />
+ <nd ref='-55333' />
+ <nd ref='-55335' />
+ <nd ref='-55337' />
+ <nd ref='-55339' />
+ <nd ref='-55341' />
+ <nd ref='-55343' />
+ <nd ref='-55345' />
+ <nd ref='-55347' />
+ <nd ref='-55349' />
+ <nd ref='-55351' />
+ <nd ref='-55353' />
+ <nd ref='-55355' />
+ <nd ref='-55357' />
+ <nd ref='-55359' />
+ <nd ref='-55361' />
+ <nd ref='-55363' />
+ <nd ref='-55365' />
+ <nd ref='-55367' />
+ <nd ref='-55369' />
+ <nd ref='-55371' />
+ <nd ref='-55373' />
+ <nd ref='-55375' />
+ <nd ref='-55377' />
+ <nd ref='-55379' />
+ <nd ref='-55381' />
+ <nd ref='-55383' />
+ <nd ref='-55385' />
+ <nd ref='-55387' />
+ <nd ref='-55389' />
+ <nd ref='-55641' />
+ <nd ref='-55391' />
+ <nd ref='-55393' />
+ <nd ref='-55395' />
+ <nd ref='-55397' />
+ <nd ref='-55399' />
+ <nd ref='-55401' />
+ <nd ref='-55403' />
+ <nd ref='-55405' />
+ <nd ref='-55407' />
+ <nd ref='-55409' />
+ <nd ref='-55411' />
+ <nd ref='-55413' />
+ <nd ref='-55415' />
+ <nd ref='-55417' />
+ <nd ref='-55419' />
+ <nd ref='-55421' />
+ <nd ref='-55423' />
+ <nd ref='-55425' />
+ <nd ref='-55427' />
+ <nd ref='-55429' />
+ <nd ref='-55431' />
+ <nd ref='-55433' />
+ <nd ref='-55239' />
+ <tag k='ISO3166-2' v='US-IL' />
+ <tag k='name:en' v='Illinois' />
+ </way>
+ <way id='-58071'>
+ <nd ref='-55245' />
+ <nd ref='-55243' />
+ <nd ref='-55241' />
+ <nd ref='-55435' />
+ <nd ref='-56115' />
+ <nd ref='-55437' />
+ <nd ref='-55439' />
+ <nd ref='-55441' />
+ <nd ref='-55443' />
+ <nd ref='-55445' />
+ <nd ref='-55447' />
+ <nd ref='-55449' />
+ <nd ref='-55451' />
+ <nd ref='-55453' />
+ <nd ref='-55455' />
+ <nd ref='-55457' />
+ <nd ref='-55459' />
+ <nd ref='-55461' />
+ <nd ref='-55463' />
+ <nd ref='-55465' />
+ <nd ref='-55467' />
+ <nd ref='-55469' />
+ <nd ref='-55471' />
+ <nd ref='-55473' />
+ <nd ref='-55475' />
+ <nd ref='-55477' />
+ <nd ref='-55479' />
+ <nd ref='-55481' />
+ <nd ref='-55483' />
+ <nd ref='-55485' />
+ <nd ref='-55487' />
+ <nd ref='-55489' />
+ <nd ref='-55491' />
+ <nd ref='-55493' />
+ <nd ref='-55495' />
+ <nd ref='-55513' />
+ <nd ref='-55515' />
+ <nd ref='-55511' />
+ <nd ref='-55497' />
+ <nd ref='-55499' />
+ <nd ref='-55501' />
+ <nd ref='-55503' />
+ <nd ref='-55505' />
+ <nd ref='-55507' />
+ <nd ref='-55509' />
+ <nd ref='-55517' />
+ <nd ref='-55519' />
+ <nd ref='-55521' />
+ <nd ref='-55523' />
+ <nd ref='-55525' />
+ <nd ref='-55527' />
+ <nd ref='-55529' />
+ <nd ref='-55531' />
+ <nd ref='-55533' />
+ <nd ref='-55535' />
+ <nd ref='-55537' />
+ <nd ref='-55539' />
+ <nd ref='-55541' />
+ <nd ref='-55543' />
+ <nd ref='-55545' />
+ <nd ref='-55283' />
+ <nd ref='-55281' />
+ <nd ref='-55279' />
+ <nd ref='-55277' />
+ <nd ref='-55275' />
+ <nd ref='-55273' />
+ <nd ref='-55271' />
+ <nd ref='-55269' />
+ <nd ref='-55267' />
+ <nd ref='-55265' />
+ <nd ref='-55263' />
+ <nd ref='-55261' />
+ <nd ref='-55259' />
+ <nd ref='-55257' />
+ <nd ref='-55255' />
+ <nd ref='-55253' />
+ <nd ref='-55251' />
+ <nd ref='-55249' />
+ <nd ref='-55247' />
+ <nd ref='-55245' />
+ <tag k='ISO3166-2' v='US-IN' />
+ <tag k='name:en' v='Indiana' />
+ </way>
+ <way id='-58073'>
+ <nd ref='-55433' />
+ <nd ref='-55547' />
+ <nd ref='-55549' />
+ <nd ref='-55551' />
+ <nd ref='-55553' />
+ <nd ref='-55555' />
+ <nd ref='-55557' />
+ <nd ref='-55559' />
+ <nd ref='-55561' />
+ <nd ref='-55563' />
+ <nd ref='-55565' />
+ <nd ref='-55567' />
+ <nd ref='-56191' />
+ <nd ref='-55569' />
+ <nd ref='-55571' />
+ <nd ref='-55573' />
+ <nd ref='-55575' />
+ <nd ref='-55577' />
+ <nd ref='-55579' />
+ <nd ref='-55581' />
+ <nd ref='-55583' />
+ <nd ref='-55585' />
+ <nd ref='-55587' />
+ <nd ref='-55589' />
+ <nd ref='-55591' />
+ <nd ref='-55593' />
+ <nd ref='-55595' />
+ <nd ref='-55597' />
+ <nd ref='-55599' />
+ <nd ref='-55601' />
+ <nd ref='-55603' />
+ <nd ref='-55605' />
+ <nd ref='-55607' />
+ <nd ref='-55609' />
+ <nd ref='-55611' />
+ <nd ref='-55613' />
+ <nd ref='-55615' />
+ <nd ref='-55617' />
+ <nd ref='-55619' />
+ <nd ref='-55621' />
+ <nd ref='-55623' />
+ <nd ref='-55625' />
+ <nd ref='-55627' />
+ <nd ref='-55629' />
+ <nd ref='-55631' />
+ <nd ref='-55633' />
+ <nd ref='-55635' />
+ <nd ref='-55637' />
+ <nd ref='-55639' />
+ <nd ref='-55641' />
+ <nd ref='-55391' />
+ <nd ref='-55393' />
+ <nd ref='-55395' />
+ <nd ref='-55397' />
+ <nd ref='-55399' />
+ <nd ref='-55401' />
+ <nd ref='-55403' />
+ <nd ref='-55405' />
+ <nd ref='-55407' />
+ <nd ref='-55409' />
+ <nd ref='-55411' />
+ <nd ref='-55413' />
+ <nd ref='-55415' />
+ <nd ref='-55417' />
+ <nd ref='-55419' />
+ <nd ref='-55421' />
+ <nd ref='-55423' />
+ <nd ref='-55425' />
+ <nd ref='-55427' />
+ <nd ref='-55429' />
+ <nd ref='-55431' />
+ <nd ref='-55433' />
+ <tag k='ISO3166-2' v='US-IA' />
+ <tag k='name:en' v='Iowa' />
+ </way>
+ <way id='-58075'>
+ <nd ref='-54819' />
+ <nd ref='-55643' />
+ <nd ref='-55645' />
+ <nd ref='-55647' />
+ <nd ref='-55649' />
+ <nd ref='-55651' />
+ <nd ref='-55653' />
+ <nd ref='-55655' />
+ <nd ref='-55657' />
+ <nd ref='-55659' />
+ <nd ref='-55661' />
+ <nd ref='-55663' />
+ <nd ref='-55665' />
+ <nd ref='-55667' />
+ <nd ref='-55669' />
+ <nd ref='-55671' />
+ <nd ref='-55673' />
+ <nd ref='-55675' />
+ <nd ref='-55677' />
+ <nd ref='-55679' />
+ <nd ref='-55681' />
+ <nd ref='-55683' />
+ <nd ref='-55685' />
+ <nd ref='-55687' />
+ <nd ref='-55689' />
+ <nd ref='-55691' />
+ <nd ref='-55693' />
+ <nd ref='-55695' />
+ <nd ref='-55697' />
+ <nd ref='-55699' />
+ <nd ref='-55701' />
+ <nd ref='-55703' />
+ <nd ref='-54819' />
+ <tag k='ISO3166-2' v='US-KS' />
+ <tag k='name:en' v='Kansas' />
+ </way>
+ <way id='-58077'>
+ <nd ref='-55805' />
+ <nd ref='-55803' />
+ <nd ref='-55801' />
+ <nd ref='-55799' />
+ <nd ref='-55797' />
+ <nd ref='-55795' />
+ <nd ref='-55793' />
+ <nd ref='-55791' />
+ <nd ref='-55789' />
+ <nd ref='-55787' />
+ <nd ref='-55785' />
+ <nd ref='-55783' />
+ <nd ref='-55781' />
+ <nd ref='-55779' />
+ <nd ref='-55777' />
+ <nd ref='-55775' />
+ <nd ref='-55773' />
+ <nd ref='-55771' />
+ <nd ref='-55769' />
+ <nd ref='-55767' />
+ <nd ref='-55765' />
+ <nd ref='-55763' />
+ <nd ref='-55761' />
+ <nd ref='-55759' />
+ <nd ref='-55757' />
+ <nd ref='-55755' />
+ <nd ref='-55753' />
+ <nd ref='-55751' />
+ <nd ref='-55749' />
+ <nd ref='-55747' />
+ <nd ref='-55745' />
+ <nd ref='-55437' />
+ <nd ref='-55439' />
+ <nd ref='-55441' />
+ <nd ref='-55443' />
+ <nd ref='-55445' />
+ <nd ref='-55447' />
+ <nd ref='-55449' />
+ <nd ref='-55451' />
+ <nd ref='-55453' />
+ <nd ref='-55455' />
+ <nd ref='-55457' />
+ <nd ref='-55459' />
+ <nd ref='-55461' />
+ <nd ref='-55463' />
+ <nd ref='-55465' />
+ <nd ref='-55467' />
+ <nd ref='-55469' />
+ <nd ref='-55471' />
+ <nd ref='-55473' />
+ <nd ref='-55475' />
+ <nd ref='-55477' />
+ <nd ref='-55479' />
+ <nd ref='-55481' />
+ <nd ref='-55483' />
+ <nd ref='-55485' />
+ <nd ref='-55487' />
+ <nd ref='-55489' />
+ <nd ref='-55491' />
+ <nd ref='-55493' />
+ <nd ref='-55495' />
+ <nd ref='-55513' />
+ <nd ref='-55515' />
+ <nd ref='-55511' />
+ <nd ref='-55497' />
+ <nd ref='-55499' />
+ <nd ref='-55501' />
+ <nd ref='-55503' />
+ <nd ref='-55505' />
+ <nd ref='-55507' />
+ <nd ref='-55509' />
+ <nd ref='-55517' />
+ <nd ref='-55519' />
+ <nd ref='-55521' />
+ <nd ref='-55523' />
+ <nd ref='-55525' />
+ <nd ref='-55527' />
+ <nd ref='-55529' />
+ <nd ref='-55531' />
+ <nd ref='-55533' />
+ <nd ref='-55535' />
+ <nd ref='-55537' />
+ <nd ref='-55539' />
+ <nd ref='-55541' />
+ <nd ref='-55543' />
+ <nd ref='-55545' />
+ <nd ref='-55283' />
+ <nd ref='-55285' />
+ <nd ref='-55287' />
+ <nd ref='-55289' />
+ <nd ref='-55291' />
+ <nd ref='-55293' />
+ <nd ref='-55295' />
+ <nd ref='-55297' />
+ <nd ref='-55299' />
+ <nd ref='-55301' />
+ <nd ref='-55303' />
+ <nd ref='-55305' />
+ <nd ref='-55307' />
+ <nd ref='-55309' />
+ <nd ref='-55311' />
+ <nd ref='-55705' />
+ <nd ref='-55707' />
+ <nd ref='-55709' />
+ <nd ref='-55711' />
+ <nd ref='-55713' />
+ <nd ref='-55715' />
+ <nd ref='-55717' />
+ <nd ref='-55719' />
+ <nd ref='-55721' />
+ <nd ref='-55723' />
+ <nd ref='-55725' />
+ <nd ref='-55727' />
+ <nd ref='-57177' />
+ <nd ref='-57181' />
+ <nd ref='-57179' />
+ <nd ref='-55729' />
+ <nd ref='-55731' />
+ <nd ref='-55733' />
+ <nd ref='-55735' />
+ <nd ref='-55737' />
+ <nd ref='-55739' />
+ <nd ref='-55741' />
+ <nd ref='-55743' />
+ <nd ref='-55807' />
+ <nd ref='-55809' />
+ <nd ref='-55811' />
+ <nd ref='-55813' />
+ <nd ref='-55815' />
+ <nd ref='-55817' />
+ <nd ref='-55819' />
+ <nd ref='-55821' />
+ <nd ref='-55823' />
+ <nd ref='-55825' />
+ <nd ref='-55827' />
+ <nd ref='-55829' />
+ <nd ref='-55831' />
+ <nd ref='-55833' />
+ <nd ref='-55835' />
+ <nd ref='-55837' />
+ <nd ref='-55839' />
+ <nd ref='-55841' />
+ <nd ref='-55843' />
+ <nd ref='-55845' />
+ <nd ref='-55847' />
+ <nd ref='-55849' />
+ <nd ref='-55851' />
+ <nd ref='-55853' />
+ <nd ref='-55855' />
+ <nd ref='-55857' />
+ <nd ref='-55805' />
+ <tag k='ISO3166-2' v='US-KY' />
+ <tag k='name:en' v='Kentucky' />
+ </way>
+ <way id='-58079'>
+ <nd ref='-57007' />
+ <nd ref='-57005' />
+ <nd ref='-57009' />
+ <nd ref='-55859' />
+ <nd ref='-55861' />
+ <nd ref='-55863' />
+ <nd ref='-55865' />
+ <nd ref='-55867' />
+ <nd ref='-55869' />
+ <nd ref='-55871' />
+ <nd ref='-54743' />
+ <nd ref='-54807' />
+ <nd ref='-55873' />
+ <nd ref='-55875' />
+ <nd ref='-55877' />
+ <nd ref='-55879' />
+ <nd ref='-55881' />
+ <nd ref='-55883' />
+ <nd ref='-55885' />
+ <nd ref='-55887' />
+ <nd ref='-57007' />
+ <tag k='ISO3166-2' v='US-LA' />
+ <tag k='name:en' v='Louisiana' />
+ </way>
+ <way id='-58081'>
+ <nd ref='-38101' />
+ <nd ref='-55889' />
+ <nd ref='-55891' />
+ <nd ref='-55893' />
+ <nd ref='-55895' />
+ <nd ref='-55897' />
+ <nd ref='-55899' />
+ <nd ref='-55901' />
+ <nd ref='-55903' />
+ <nd ref='-55905' />
+ <nd ref='-55907' />
+ <nd ref='-55909' />
+ <nd ref='-57169' />
+ <nd ref='-38017' />
+ <nd ref='-42461' />
+ <nd ref='-42459' />
+ <nd ref='-42463' />
+ <nd ref='-42457' />
+ <nd ref='-38019' />
+ <nd ref='-38021' />
+ <nd ref='-38023' />
+ <nd ref='-38025' />
+ <nd ref='-38027' />
+ <nd ref='-38029' />
+ <nd ref='-36301' />
+ <nd ref='-38031' />
+ <nd ref='-38033' />
+ <nd ref='-38035' />
+ <nd ref='-38037' />
+ <nd ref='-38039' />
+ <nd ref='-38041' />
+ <nd ref='-38043' />
+ <nd ref='-38045' />
+ <nd ref='-36303' />
+ <nd ref='-38047' />
+ <nd ref='-38049' />
+ <nd ref='-38051' />
+ <nd ref='-38053' />
+ <nd ref='-36305' />
+ <nd ref='-38055' />
+ <nd ref='-38057' />
+ <nd ref='-43399' />
+ <nd ref='-38059' />
+ <nd ref='-38061' />
+ <nd ref='-38063' />
+ <nd ref='-38065' />
+ <nd ref='-38067' />
+ <nd ref='-43397' />
+ <nd ref='-43395' />
+ <nd ref='-38069' />
+ <nd ref='-38071' />
+ <nd ref='-54415' />
+ <nd ref='-38073' />
+ <nd ref='-38075' />
+ <nd ref='-38077' />
+ <nd ref='-38079' />
+ <nd ref='-38081' />
+ <nd ref='-43393' />
+ <nd ref='-43391' />
+ <nd ref='-38083' />
+ <nd ref='-38085' />
+ <nd ref='-38087' />
+ <nd ref='-38089' />
+ <nd ref='-38091' />
+ <nd ref='-43389' />
+ <nd ref='-43387' />
+ <nd ref='-38093' />
+ <nd ref='-43385' />
+ <nd ref='-43383' />
+ <nd ref='-43381' />
+ <nd ref='-43379' />
+ <nd ref='-38095' />
+ <nd ref='-38097' />
+ <nd ref='-43377' />
+ <nd ref='-43375' />
+ <nd ref='-38099' />
+ <nd ref='-43373' />
+ <nd ref='-43371' />
+ <nd ref='-38101' />
+ <tag k='ISO3166-2' v='US-ME' />
+ <tag k='name:en' v='Maine' />
+ </way>
+ <way id='-58083'>
+ <nd ref='-56041' />
+ <nd ref='-56039' />
+ <nd ref='-56037' />
+ <nd ref='-56035' />
+ <nd ref='-56033' />
+ <nd ref='-56031' />
+ <nd ref='-56029' />
+ <nd ref='-56027' />
+ <nd ref='-56025' />
+ <nd ref='-56023' />
+ <nd ref='-56021' />
+ <nd ref='-56019' />
+ <nd ref='-56017' />
+ <nd ref='-56015' />
+ <nd ref='-56013' />
+ <nd ref='-56011' />
+ <nd ref='-56009' />
+ <nd ref='-56007' />
+ <nd ref='-56005' />
+ <nd ref='-56003' />
+ <nd ref='-56001' />
+ <nd ref='-55999' />
+ <nd ref='-55997' />
+ <nd ref='-55995' />
+ <nd ref='-55993' />
+ <nd ref='-55991' />
+ <nd ref='-55989' />
+ <nd ref='-55987' />
+ <nd ref='-55985' />
+ <nd ref='-55983' />
+ <nd ref='-55981' />
+ <nd ref='-55979' />
+ <nd ref='-54915' />
+ <nd ref='-54917' />
+ <nd ref='-54871' />
+ <nd ref='-54873' />
+ <nd ref='-55911' />
+ <nd ref='-55913' />
+ <nd ref='-55915' />
+ <nd ref='-55917' />
+ <nd ref='-55919' />
+ <nd ref='-55921' />
+ <nd ref='-55923' />
+ <nd ref='-55925' />
+ <nd ref='-55927' />
+ <nd ref='-55929' />
+ <nd ref='-55931' />
+ <nd ref='-55933' />
+ <nd ref='-55935' />
+ <nd ref='-55937' />
+ <nd ref='-55939' />
+ <nd ref='-55941' />
+ <nd ref='-54535' />
+ <nd ref='-54533' />
+ <nd ref='-54531' />
+ <nd ref='-54529' />
+ <nd ref='-55943' />
+ <nd ref='-55945' />
+ <nd ref='-55947' />
+ <nd ref='-55949' />
+ <nd ref='-55951' />
+ <nd ref='-55953' />
+ <nd ref='-55955' />
+ <nd ref='-55957' />
+ <nd ref='-55959' />
+ <nd ref='-55961' />
+ <nd ref='-55963' />
+ <nd ref='-55965' />
+ <nd ref='-55967' />
+ <nd ref='-55969' />
+ <nd ref='-55971' />
+ <nd ref='-55973' />
+ <nd ref='-55975' />
+ <nd ref='-55977' />
+ <nd ref='-56043' />
+ <nd ref='-56045' />
+ <nd ref='-56047' />
+ <nd ref='-56049' />
+ <nd ref='-56051' />
+ <nd ref='-56053' />
+ <nd ref='-56055' />
+ <nd ref='-56057' />
+ <nd ref='-56059' />
+ <nd ref='-56041' />
+ <tag k='ISO3166-2' v='US-MD' />
+ <tag k='name:en' v='Maryland' />
+ </way>
+ <way id='-58085'>
+ <nd ref='-57169' />
+ <nd ref='-57167' />
+ <nd ref='-56113' />
+ <nd ref='-56111' />
+ <nd ref='-56109' />
+ <nd ref='-56107' />
+ <nd ref='-56105' />
+ <nd ref='-56103' />
+ <nd ref='-56101' />
+ <nd ref='-56099' />
+ <nd ref='-56097' />
+ <nd ref='-56095' />
+ <nd ref='-56093' />
+ <nd ref='-56091' />
+ <nd ref='-56089' />
+ <nd ref='-54861' />
+ <nd ref='-54863' />
+ <nd ref='-54865' />
+ <nd ref='-54867' />
+ <nd ref='-54869' />
+ <nd ref='-54821' />
+ <nd ref='-56061' />
+ <nd ref='-56063' />
+ <nd ref='-56347' />
+ <nd ref='-56065' />
+ <nd ref='-56067' />
+ <nd ref='-56069' />
+ <nd ref='-56071' />
+ <nd ref='-56073' />
+ <nd ref='-56075' />
+ <nd ref='-56077' />
+ <nd ref='-56079' />
+ <nd ref='-56081' />
+ <nd ref='-56083' />
+ <nd ref='-56085' />
+ <nd ref='-56087' />
+ <nd ref='-57169' />
+ <tag k='ISO3166-2' v='US-MA' />
+ <tag k='name:en' v='Massachusetts' />
+ </way>
+ <way id='-58087'>
+ <nd ref='-56115' />
+ <nd ref='-56117' />
+ <nd ref='-56119' />
+ <nd ref='-38171' />
+ <nd ref='-38173' />
+ <nd ref='-38175' />
+ <nd ref='-38177' />
+ <nd ref='-38179' />
+ <nd ref='-38181' />
+ <nd ref='-38183' />
+ <nd ref='-38185' />
+ <nd ref='-38187' />
+ <nd ref='-38189' />
+ <nd ref='-38191' />
+ <nd ref='-38193' />
+ <nd ref='-38195' />
+ <nd ref='-38197' />
+ <nd ref='-43337' />
+ <nd ref='-43335' />
+ <nd ref='-43333' />
+ <nd ref='-38199' />
+ <nd ref='-38201' />
+ <nd ref='-38203' />
+ <nd ref='-38205' />
+ <nd ref='-38207' />
+ <nd ref='-38209' />
+ <nd ref='-38211' />
+ <nd ref='-38213' />
+ <nd ref='-38215' />
+ <nd ref='-38217' />
+ <nd ref='-38219' />
+ <nd ref='-38221' />
+ <nd ref='-38223' />
+ <nd ref='-38225' />
+ <nd ref='-38227' />
+ <nd ref='-38229' />
+ <nd ref='-38231' />
+ <nd ref='-38233' />
+ <nd ref='-38235' />
+ <nd ref='-38237' />
+ <nd ref='-38239' />
+ <nd ref='-38241' />
+ <nd ref='-38243' />
+ <nd ref='-38245' />
+ <nd ref='-38247' />
+ <nd ref='-38249' />
+ <nd ref='-38251' />
+ <nd ref='-38253' />
+ <nd ref='-38255' />
+ <nd ref='-38257' />
+ <nd ref='-38259' />
+ <nd ref='-38261' />
+ <nd ref='-38263' />
+ <nd ref='-38265' />
+ <nd ref='-38267' />
+ <nd ref='-38269' />
+ <nd ref='-38271' />
+ <nd ref='-38273' />
+ <nd ref='-38275' />
+ <nd ref='-38277' />
+ <nd ref='-38279' />
+ <nd ref='-38281' />
+ <nd ref='-56121' />
+ <nd ref='-56123' />
+ <nd ref='-56125' />
+ <nd ref='-56127' />
+ <nd ref='-56129' />
+ <nd ref='-56131' />
+ <nd ref='-56133' />
+ <nd ref='-56135' />
+ <nd ref='-56137' />
+ <nd ref='-56139' />
+ <nd ref='-56141' />
+ <nd ref='-56143' />
+ <nd ref='-56145' />
+ <nd ref='-56147' />
+ <nd ref='-56149' />
+ <nd ref='-56151' />
+ <nd ref='-56153' />
+ <nd ref='-56155' />
+ <nd ref='-56157' />
+ <nd ref='-56159' />
+ <nd ref='-56161' />
+ <nd ref='-56163' />
+ <nd ref='-56165' />
+ <nd ref='-56167' />
+ <nd ref='-56169' />
+ <nd ref='-56171' />
+ <nd ref='-56173' />
+ <nd ref='-56175' />
+ <nd ref='-56177' />
+ <nd ref='-56179' />
+ <nd ref='-56181' />
+ <nd ref='-56183' />
+ <nd ref='-56185' />
+ <nd ref='-56187' />
+ <nd ref='-56189' />
+ <nd ref='-55239' />
+ <nd ref='-55241' />
+ <nd ref='-55435' />
+ <nd ref='-56115' />
+ <tag k='ISO3166-2' v='US-MI' />
+ <tag k='name:en' v='Michigan' />
+ </way>
+ <way id='-58089'>
+ <nd ref='-55567' />
+ <nd ref='-56191' />
+ <nd ref='-56193' />
+ <nd ref='-56195' />
+ <nd ref='-56197' />
+ <nd ref='-56199' />
+ <nd ref='-56201' />
+ <nd ref='-56203' />
+ <nd ref='-56205' />
+ <nd ref='-56207' />
+ <nd ref='-56209' />
+ <nd ref='-56211' />
+ <nd ref='-56213' />
+ <nd ref='-56215' />
+ <nd ref='-56217' />
+ <nd ref='-56219' />
+ <nd ref='-56221' />
+ <nd ref='-56223' />
+ <nd ref='-56225' />
+ <nd ref='-56227' />
+ <nd ref='-56229' />
+ <nd ref='-56231' />
+ <nd ref='-56233' />
+ <nd ref='-38393' />
+ <nd ref='-38391' />
+ <nd ref='-43301' />
+ <nd ref='-38389' />
+ <nd ref='-38387' />
+ <nd ref='-43299' />
+ <nd ref='-38385' />
+ <nd ref='-38383' />
+ <nd ref='-38381' />
+ <nd ref='-38379' />
+ <nd ref='-43303' />
+ <nd ref='-38377' />
+ <nd ref='-38375' />
+ <nd ref='-38373' />
+ <nd ref='-38371' />
+ <nd ref='-38369' />
+ <nd ref='-38367' />
+ <nd ref='-38365' />
+ <nd ref='-43305' />
+ <nd ref='-38363' />
+ <nd ref='-38361' />
+ <nd ref='-43307' />
+ <nd ref='-43309' />
+ <nd ref='-43311' />
+ <nd ref='-38359' />
+ <nd ref='-38357' />
+ <nd ref='-38355' />
+ <nd ref='-38353' />
+ <nd ref='-43313' />
+ <nd ref='-38351' />
+ <nd ref='-38349' />
+ <nd ref='-38347' />
+ <nd ref='-38345' />
+ <nd ref='-38343' />
+ <nd ref='-38341' />
+ <nd ref='-43315' />
+ <nd ref='-43317' />
+ <nd ref='-38339' />
+ <nd ref='-38337' />
+ <nd ref='-38335' />
+ <nd ref='-38333' />
+ <nd ref='-38331' />
+ <nd ref='-43319' />
+ <nd ref='-43321' />
+ <nd ref='-38329' />
+ <nd ref='-38327' />
+ <nd ref='-38325' />
+ <nd ref='-38323' />
+ <nd ref='-38321' />
+ <nd ref='-38319' />
+ <nd ref='-43323' />
+ <nd ref='-43325' />
+ <nd ref='-38317' />
+ <nd ref='-43327' />
+ <nd ref='-38315' />
+ <nd ref='-43329' />
+ <nd ref='-38313' />
+ <nd ref='-38311' />
+ <nd ref='-38309' />
+ <nd ref='-38307' />
+ <nd ref='-38305' />
+ <nd ref='-38303' />
+ <nd ref='-38301' />
+ <nd ref='-38299' />
+ <nd ref='-38297' />
+ <nd ref='-38295' />
+ <nd ref='-38293' />
+ <nd ref='-38291' />
+ <nd ref='-38289' />
+ <nd ref='-38287' />
+ <nd ref='-38285' />
+ <nd ref='-43331' />
+ <nd ref='-38283' />
+ <nd ref='-38281' />
+ <nd ref='-56271' />
+ <nd ref='-56269' />
+ <nd ref='-56267' />
+ <nd ref='-56265' />
+ <nd ref='-56263' />
+ <nd ref='-56261' />
+ <nd ref='-56259' />
+ <nd ref='-56257' />
+ <nd ref='-56255' />
+ <nd ref='-56253' />
+ <nd ref='-56251' />
+ <nd ref='-56249' />
+ <nd ref='-56247' />
+ <nd ref='-56245' />
+ <nd ref='-56243' />
+ <nd ref='-56241' />
+ <nd ref='-56239' />
+ <nd ref='-56237' />
+ <nd ref='-56235' />
+ <nd ref='-55567' />
+ <tag k='ISO3166-2' v='US-MN' />
+ <tag k='name:en' v='Minnesota' />
+ </way>
+ <way id='-58091'>
+ <nd ref='-55567' />
+ <nd ref='-56235' />
+ <nd ref='-56237' />
+ <nd ref='-56239' />
+ <nd ref='-56241' />
+ <nd ref='-56243' />
+ <nd ref='-56245' />
+ <nd ref='-56247' />
+ <nd ref='-56249' />
+ <nd ref='-56251' />
+ <nd ref='-56253' />
+ <nd ref='-56255' />
+ <nd ref='-56257' />
+ <nd ref='-56259' />
+ <nd ref='-56261' />
+ <nd ref='-56263' />
+ <nd ref='-56265' />
+ <nd ref='-56267' />
+ <nd ref='-56269' />
+ <nd ref='-56271' />
+ <nd ref='-38281' />
+ <nd ref='-56121' />
+ <nd ref='-56123' />
+ <nd ref='-56125' />
+ <nd ref='-56127' />
+ <nd ref='-56129' />
+ <nd ref='-56131' />
+ <nd ref='-56133' />
+ <nd ref='-56135' />
+ <nd ref='-56137' />
+ <nd ref='-56139' />
+ <nd ref='-56141' />
+ <nd ref='-56143' />
+ <nd ref='-56145' />
+ <nd ref='-56147' />
+ <nd ref='-56149' />
+ <nd ref='-56151' />
+ <nd ref='-56153' />
+ <nd ref='-56155' />
+ <nd ref='-56157' />
+ <nd ref='-56159' />
+ <nd ref='-56161' />
+ <nd ref='-56163' />
+ <nd ref='-56165' />
+ <nd ref='-56167' />
+ <nd ref='-56169' />
+ <nd ref='-56171' />
+ <nd ref='-56173' />
+ <nd ref='-56175' />
+ <nd ref='-56177' />
+ <nd ref='-56179' />
+ <nd ref='-56181' />
+ <nd ref='-56183' />
+ <nd ref='-56185' />
+ <nd ref='-56187' />
+ <nd ref='-56189' />
+ <nd ref='-55239' />
+ <nd ref='-55433' />
+ <nd ref='-55547' />
+ <nd ref='-55549' />
+ <nd ref='-55551' />
+ <nd ref='-55553' />
+ <nd ref='-55555' />
+ <nd ref='-55557' />
+ <nd ref='-55559' />
+ <nd ref='-55561' />
+ <nd ref='-55563' />
+ <nd ref='-55565' />
+ <nd ref='-55567' />
+ <tag k='ISO3166-2' v='US-WI' />
+ <tag k='name:en' v='Wisconsin' />
+ </way>
+ <way id='-58093'>
+ <nd ref='-55087' />
+ <nd ref='-56273' />
+ <nd ref='-54815' />
+ <nd ref='-56275' />
+ <nd ref='-56309' />
+ <nd ref='-56277' />
+ <nd ref='-56279' />
+ <nd ref='-55089' />
+ <nd ref='-55087' />
+ <tag k='ISO3166-2' v='US-WY' />
+ <tag k='name:en' v='Wyoming' />
+ </way>
+ <way id='-58095'>
+ <nd ref='-56281' />
+ <nd ref='-54795' />
+ <nd ref='-54797' />
+ <nd ref='-54799' />
+ <nd ref='-54801' />
+ <nd ref='-54803' />
+ <nd ref='-54805' />
+ <nd ref='-54807' />
+ <nd ref='-55873' />
+ <nd ref='-55875' />
+ <nd ref='-55877' />
+ <nd ref='-55879' />
+ <nd ref='-55881' />
+ <nd ref='-55883' />
+ <nd ref='-55885' />
+ <nd ref='-55887' />
+ <nd ref='-57007' />
+ <nd ref='-54559' />
+ <nd ref='-54561' />
+ <nd ref='-54563' />
+ <nd ref='-56281' />
+ <tag k='ISO3166-2' v='US-MS' />
+ <tag k='name:en' v='Mississippi' />
+ </way>
+ <way id='-58097'>
+ <nd ref='-55701' />
+ <nd ref='-56283' />
+ <nd ref='-55637' />
+ <nd ref='-55639' />
+ <nd ref='-55641' />
+ <nd ref='-55389' />
+ <nd ref='-55387' />
+ <nd ref='-55385' />
+ <nd ref='-55383' />
+ <nd ref='-55381' />
+ <nd ref='-55379' />
+ <nd ref='-55377' />
+ <nd ref='-55375' />
+ <nd ref='-55373' />
+ <nd ref='-55371' />
+ <nd ref='-55369' />
+ <nd ref='-55367' />
+ <nd ref='-55365' />
+ <nd ref='-55363' />
+ <nd ref='-55361' />
+ <nd ref='-55359' />
+ <nd ref='-55357' />
+ <nd ref='-55355' />
+ <nd ref='-55353' />
+ <nd ref='-55351' />
+ <nd ref='-55349' />
+ <nd ref='-55347' />
+ <nd ref='-55345' />
+ <nd ref='-55343' />
+ <nd ref='-55341' />
+ <nd ref='-55339' />
+ <nd ref='-55337' />
+ <nd ref='-55335' />
+ <nd ref='-55333' />
+ <nd ref='-55331' />
+ <nd ref='-55329' />
+ <nd ref='-55327' />
+ <nd ref='-55325' />
+ <nd ref='-55323' />
+ <nd ref='-55321' />
+ <nd ref='-55319' />
+ <nd ref='-55317' />
+ <nd ref='-55315' />
+ <nd ref='-55313' />
+ <nd ref='-55311' />
+ <nd ref='-55705' />
+ <nd ref='-55707' />
+ <nd ref='-55709' />
+ <nd ref='-55711' />
+ <nd ref='-55713' />
+ <nd ref='-56285' />
+ <nd ref='-56287' />
+ <nd ref='-56289' />
+ <nd ref='-56291' />
+ <nd ref='-56293' />
+ <nd ref='-56295' />
+ <nd ref='-56297' />
+ <nd ref='-56299' />
+ <nd ref='-56301' />
+ <nd ref='-56303' />
+ <nd ref='-56305' />
+ <nd ref='-54769' />
+ <nd ref='-54767' />
+ <nd ref='-54765' />
+ <nd ref='-54763' />
+ <nd ref='-54761' />
+ <nd ref='-54759' />
+ <nd ref='-54757' />
+ <nd ref='-54755' />
+ <nd ref='-55643' />
+ <nd ref='-55645' />
+ <nd ref='-55647' />
+ <nd ref='-55649' />
+ <nd ref='-55651' />
+ <nd ref='-55653' />
+ <nd ref='-55655' />
+ <nd ref='-55657' />
+ <nd ref='-55659' />
+ <nd ref='-55661' />
+ <nd ref='-55663' />
+ <nd ref='-55665' />
+ <nd ref='-55667' />
+ <nd ref='-55669' />
+ <nd ref='-55671' />
+ <nd ref='-55673' />
+ <nd ref='-55675' />
+ <nd ref='-55677' />
+ <nd ref='-55679' />
+ <nd ref='-55681' />
+ <nd ref='-55683' />
+ <nd ref='-55685' />
+ <nd ref='-55687' />
+ <nd ref='-55689' />
+ <nd ref='-55691' />
+ <nd ref='-55693' />
+ <nd ref='-55695' />
+ <nd ref='-55697' />
+ <nd ref='-55699' />
+ <nd ref='-55701' />
+ <tag k='ISO3166-2' v='US-MO' />
+ <tag k='name:en' v='Missouri' />
+ </way>
+ <way id='-58099'>
+ <nd ref='-56277' />
+ <nd ref='-56343' />
+ <nd ref='-56307' />
+ <nd ref='-54205' />
+ <nd ref='-54197' />
+ <nd ref='-55153' />
+ <nd ref='-55151' />
+ <nd ref='-55149' />
+ <nd ref='-55147' />
+ <nd ref='-55145' />
+ <nd ref='-55143' />
+ <nd ref='-55141' />
+ <nd ref='-55139' />
+ <nd ref='-55137' />
+ <nd ref='-55135' />
+ <nd ref='-55133' />
+ <nd ref='-55131' />
+ <nd ref='-55129' />
+ <nd ref='-55127' />
+ <nd ref='-55125' />
+ <nd ref='-55123' />
+ <nd ref='-55121' />
+ <nd ref='-55119' />
+ <nd ref='-55117' />
+ <nd ref='-55115' />
+ <nd ref='-55113' />
+ <nd ref='-55111' />
+ <nd ref='-55109' />
+ <nd ref='-55107' />
+ <nd ref='-55105' />
+ <nd ref='-55103' />
+ <nd ref='-55101' />
+ <nd ref='-55099' />
+ <nd ref='-55097' />
+ <nd ref='-55095' />
+ <nd ref='-55093' />
+ <nd ref='-55091' />
+ <nd ref='-55089' />
+ <nd ref='-56279' />
+ <nd ref='-56277' />
+ <tag k='ISO3166-2' v='US-MT' />
+ <tag k='name:en' v='Montana' />
+ </way>
+ <way id='-58101'>
+ <nd ref='-56309' />
+ <nd ref='-56311' />
+ <nd ref='-56313' />
+ <nd ref='-56315' />
+ <nd ref='-56317' />
+ <nd ref='-56319' />
+ <nd ref='-56321' />
+ <nd ref='-56323' />
+ <nd ref='-56325' />
+ <nd ref='-56327' />
+ <nd ref='-56329' />
+ <nd ref='-56331' />
+ <nd ref='-56333' />
+ <nd ref='-56335' />
+ <nd ref='-56337' />
+ <nd ref='-56339' />
+ <nd ref='-56341' />
+ <nd ref='-55585' />
+ <nd ref='-55583' />
+ <nd ref='-55581' />
+ <nd ref='-55579' />
+ <nd ref='-55577' />
+ <nd ref='-55575' />
+ <nd ref='-55573' />
+ <nd ref='-55571' />
+ <nd ref='-55569' />
+ <nd ref='-56191' />
+ <nd ref='-56193' />
+ <nd ref='-56195' />
+ <nd ref='-56197' />
+ <nd ref='-56199' />
+ <nd ref='-56201' />
+ <nd ref='-56203' />
+ <nd ref='-56205' />
+ <nd ref='-56343' />
+ <nd ref='-56277' />
+ <nd ref='-56309' />
+ <tag k='ISO3166-2' v='US-SD' />
+ <tag k='name:en' v='South Dakota' />
+ </way>
+ <way id='-58103'>
+ <nd ref='-56309' />
+ <nd ref='-56275' />
+ <nd ref='-54817' />
+ <nd ref='-55703' />
+ <nd ref='-55701' />
+ <nd ref='-56283' />
+ <nd ref='-55637' />
+ <nd ref='-55635' />
+ <nd ref='-55633' />
+ <nd ref='-55631' />
+ <nd ref='-55629' />
+ <nd ref='-55627' />
+ <nd ref='-55625' />
+ <nd ref='-55623' />
+ <nd ref='-55621' />
+ <nd ref='-55619' />
+ <nd ref='-55617' />
+ <nd ref='-55615' />
+ <nd ref='-55613' />
+ <nd ref='-55611' />
+ <nd ref='-55609' />
+ <nd ref='-55607' />
+ <nd ref='-55605' />
+ <nd ref='-55603' />
+ <nd ref='-55601' />
+ <nd ref='-55599' />
+ <nd ref='-55597' />
+ <nd ref='-55595' />
+ <nd ref='-55593' />
+ <nd ref='-55591' />
+ <nd ref='-55589' />
+ <nd ref='-55587' />
+ <nd ref='-55585' />
+ <nd ref='-56341' />
+ <nd ref='-56339' />
+ <nd ref='-56337' />
+ <nd ref='-56335' />
+ <nd ref='-56333' />
+ <nd ref='-56331' />
+ <nd ref='-56329' />
+ <nd ref='-56327' />
+ <nd ref='-56325' />
+ <nd ref='-56323' />
+ <nd ref='-56321' />
+ <nd ref='-56319' />
+ <nd ref='-56317' />
+ <nd ref='-56315' />
+ <nd ref='-56313' />
+ <nd ref='-56311' />
+ <nd ref='-56309' />
+ <tag k='ISO3166-2' v='US-NE' />
+ <tag k='name:en' v='Nebraska' />
+ </way>
+ <way id='-58105'>
+ <nd ref='-54629' />
+ <nd ref='-56345' />
+ <nd ref='-55085' />
+ <nd ref='-54811' />
+ <nd ref='-54809' />
+ <nd ref='-54679' />
+ <nd ref='-54677' />
+ <nd ref='-54675' />
+ <nd ref='-54673' />
+ <nd ref='-54671' />
+ <nd ref='-54669' />
+ <nd ref='-54667' />
+ <nd ref='-54665' />
+ <nd ref='-54663' />
+ <nd ref='-54661' />
+ <nd ref='-54659' />
+ <nd ref='-54657' />
+ <nd ref='-54655' />
+ <nd ref='-54653' />
+ <nd ref='-54651' />
+ <nd ref='-54649' />
+ <nd ref='-54647' />
+ <nd ref='-54645' />
+ <nd ref='-54643' />
+ <nd ref='-54641' />
+ <nd ref='-54639' />
+ <nd ref='-54637' />
+ <nd ref='-54635' />
+ <nd ref='-54633' />
+ <nd ref='-54631' />
+ <nd ref='-54629' />
+ <tag k='ISO3166-2' v='US-NV' />
+ <tag k='name:en' v='Nevada' />
+ </way>
+ <way id='-58107'>
+ <nd ref='-56345' />
+ <nd ref='-55087' />
+ <nd ref='-56273' />
+ <nd ref='-54815' />
+ <nd ref='-54627' />
+ <nd ref='-54629' />
+ <nd ref='-56345' />
+ <tag k='ISO3166-2' v='US-UT' />
+ <tag k='name:en' v='Utah' />
+ </way>
+ <way id='-58109'>
+ <nd ref='-56307' />
+ <nd ref='-56343' />
+ <nd ref='-56205' />
+ <nd ref='-56207' />
+ <nd ref='-56209' />
+ <nd ref='-56211' />
+ <nd ref='-56213' />
+ <nd ref='-56215' />
+ <nd ref='-56217' />
+ <nd ref='-56219' />
+ <nd ref='-56221' />
+ <nd ref='-56223' />
+ <nd ref='-56225' />
+ <nd ref='-56227' />
+ <nd ref='-56229' />
+ <nd ref='-56231' />
+ <nd ref='-56233' />
+ <nd ref='-54209' />
+ <nd ref='-56307' />
+ <tag k='ISO3166-2' v='US-ND' />
+ <tag k='name:en' v='North Dakota' />
+ </way>
+ <way id='-58111'>
+ <nd ref='-56347' />
+ <nd ref='-56349' />
+ <nd ref='-56351' />
+ <nd ref='-56353' />
+ <nd ref='-56355' />
+ <nd ref='-56357' />
+ <nd ref='-56359' />
+ <nd ref='-56361' />
+ <nd ref='-56363' />
+ <nd ref='-56365' />
+ <nd ref='-56367' />
+ <nd ref='-56369' />
+ <nd ref='-56371' />
+ <nd ref='-56373' />
+ <nd ref='-56375' />
+ <nd ref='-56377' />
+ <nd ref='-56379' />
+ <nd ref='-56381' />
+ <nd ref='-56383' />
+ <nd ref='-56385' />
+ <nd ref='-56387' />
+ <nd ref='-56389' />
+ <nd ref='-56391' />
+ <nd ref='-56393' />
+ <nd ref='-56395' />
+ <nd ref='-56397' />
+ <nd ref='-56399' />
+ <nd ref='-56401' />
+ <nd ref='-56403' />
+ <nd ref='-56405' />
+ <nd ref='-56407' />
+ <nd ref='-56409' />
+ <nd ref='-56411' />
+ <nd ref='-56413' />
+ <nd ref='-56415' />
+ <nd ref='-56417' />
+ <nd ref='-56419' />
+ <nd ref='-56421' />
+ <nd ref='-56423' />
+ <nd ref='-56425' />
+ <nd ref='-56427' />
+ <nd ref='-56429' />
+ <nd ref='-56431' />
+ <nd ref='-56433' />
+ <nd ref='-38121' />
+ <nd ref='-38119' />
+ <nd ref='-38117' />
+ <nd ref='-38115' />
+ <nd ref='-38113' />
+ <nd ref='-38111' />
+ <nd ref='-38109' />
+ <nd ref='-38107' />
+ <nd ref='-38105' />
+ <nd ref='-38103' />
+ <nd ref='-38101' />
+ <nd ref='-55889' />
+ <nd ref='-55891' />
+ <nd ref='-55893' />
+ <nd ref='-55895' />
+ <nd ref='-55897' />
+ <nd ref='-55899' />
+ <nd ref='-55901' />
+ <nd ref='-55903' />
+ <nd ref='-55905' />
+ <nd ref='-55907' />
+ <nd ref='-55909' />
+ <nd ref='-57169' />
+ <nd ref='-56087' />
+ <nd ref='-56085' />
+ <nd ref='-56083' />
+ <nd ref='-56081' />
+ <nd ref='-56079' />
+ <nd ref='-56077' />
+ <nd ref='-56075' />
+ <nd ref='-56073' />
+ <nd ref='-56071' />
+ <nd ref='-56069' />
+ <nd ref='-56067' />
+ <nd ref='-56065' />
+ <nd ref='-56347' />
+ <tag k='ISO3166-2' v='US-NH' />
+ <tag k='name:en' v='New Hampshire' />
+ </way>
+ <way id='-58113'>
+ <nd ref='-56589' />
+ <nd ref='-56587' />
+ <nd ref='-56585' />
+ <nd ref='-56583' />
+ <nd ref='-56581' />
+ <nd ref='-56579' />
+ <nd ref='-56577' />
+ <nd ref='-56575' />
+ <nd ref='-56573' />
+ <nd ref='-56571' />
+ <nd ref='-56569' />
+ <nd ref='-56567' />
+ <nd ref='-56565' />
+ <nd ref='-56563' />
+ <nd ref='-56561' />
+ <nd ref='-56559' />
+ <nd ref='-56557' />
+ <nd ref='-56555' />
+ <nd ref='-56553' />
+ <nd ref='-56551' />
+ <nd ref='-56549' />
+ <nd ref='-56547' />
+ <nd ref='-56545' />
+ <nd ref='-56543' />
+ <nd ref='-54873' />
+ <nd ref='-54875' />
+ <nd ref='-54877' />
+ <nd ref='-54879' />
+ <nd ref='-54881' />
+ <nd ref='-54883' />
+ <nd ref='-54885' />
+ <nd ref='-56435' />
+ <nd ref='-56437' />
+ <nd ref='-56439' />
+ <nd ref='-56441' />
+ <nd ref='-56443' />
+ <nd ref='-56445' />
+ <nd ref='-56447' />
+ <nd ref='-56449' />
+ <nd ref='-56451' />
+ <nd ref='-56453' />
+ <nd ref='-56455' />
+ <nd ref='-56457' />
+ <nd ref='-56459' />
+ <nd ref='-56461' />
+ <nd ref='-56463' />
+ <nd ref='-56465' />
+ <nd ref='-56467' />
+ <nd ref='-56469' />
+ <nd ref='-56471' />
+ <nd ref='-56473' />
+ <nd ref='-56475' />
+ <nd ref='-56477' />
+ <nd ref='-56479' />
+ <nd ref='-56481' />
+ <nd ref='-56483' />
+ <nd ref='-56485' />
+ <nd ref='-56487' />
+ <nd ref='-56489' />
+ <nd ref='-56491' />
+ <nd ref='-56493' />
+ <nd ref='-56495' />
+ <nd ref='-56497' />
+ <nd ref='-56499' />
+ <nd ref='-56501' />
+ <nd ref='-56503' />
+ <nd ref='-56505' />
+ <nd ref='-56507' />
+ <nd ref='-56509' />
+ <nd ref='-56511' />
+ <nd ref='-56513' />
+ <nd ref='-56515' />
+ <nd ref='-56517' />
+ <nd ref='-56519' />
+ <nd ref='-56521' />
+ <nd ref='-56523' />
+ <nd ref='-56525' />
+ <nd ref='-56527' />
+ <nd ref='-56529' />
+ <nd ref='-56531' />
+ <nd ref='-56533' />
+ <nd ref='-56535' />
+ <nd ref='-56537' />
+ <nd ref='-56539' />
+ <nd ref='-56541' />
+ <nd ref='-56591' />
+ <nd ref='-56593' />
+ <nd ref='-56595' />
+ <nd ref='-56597' />
+ <nd ref='-56599' />
+ <nd ref='-56601' />
+ <nd ref='-56603' />
+ <nd ref='-56605' />
+ <nd ref='-56607' />
+ <nd ref='-56609' />
+ <nd ref='-56611' />
+ <nd ref='-56589' />
+ <tag k='ISO3166-2' v='US-NJ' />
+ <tag k='name:en' v='New Jersey' />
+ </way>
+ <way id='-58115'>
+ <nd ref='-56613' />
+ <nd ref='-56615' />
+ <nd ref='-56617' />
+ <nd ref='-56619' />
+ <nd ref='-54627' />
+ <nd ref='-54625' />
+ <nd ref='-41005' />
+ <nd ref='-41007' />
+ <nd ref='-41009' />
+ <nd ref='-56621' />
+ <nd ref='-56623' />
+ <nd ref='-56625' />
+ <nd ref='-56627' />
+ <nd ref='-56629' />
+ <nd ref='-56613' />
+ <tag k='ISO3166-2' v='US-NM' />
+ <tag k='name:en' v='New Mexico' />
+ </way>
+ <way id='-58117'>
+ <nd ref='-56631' />
+ <nd ref='-56633' />
+ <nd ref='-56635' />
+ <nd ref='-56637' />
+ <nd ref='-56639' />
+ <nd ref='-56641' />
+ <nd ref='-56643' />
+ <nd ref='-56583' />
+ <nd ref='-56579' />
+ <nd ref='-56577' />
+ <nd ref='-56575' />
+ <nd ref='-56573' />
+ <nd ref='-56571' />
+ <nd ref='-56569' />
+ <nd ref='-56567' />
+ <nd ref='-56565' />
+ <nd ref='-56563' />
+ <nd ref='-56561' />
+ <nd ref='-56559' />
+ <nd ref='-56557' />
+ <nd ref='-56555' />
+ <nd ref='-56553' />
+ <nd ref='-56551' />
+ <nd ref='-56549' />
+ <nd ref='-56547' />
+ <nd ref='-56545' />
+ <nd ref='-56543' />
+ <nd ref='-57165' />
+ <nd ref='-54841' />
+ <nd ref='-54839' />
+ <nd ref='-54837' />
+ <nd ref='-54835' />
+ <nd ref='-54833' />
+ <nd ref='-54831' />
+ <nd ref='-54829' />
+ <nd ref='-54827' />
+ <nd ref='-54825' />
+ <nd ref='-54823' />
+ <nd ref='-54821' />
+ <nd ref='-56061' />
+ <nd ref='-56063' />
+ <nd ref='-56645' />
+ <nd ref='-56647' />
+ <nd ref='-56649' />
+ <nd ref='-56651' />
+ <nd ref='-56653' />
+ <nd ref='-56655' />
+ <nd ref='-56657' />
+ <nd ref='-54389' />
+ <nd ref='-38123' />
+ <nd ref='-38125' />
+ <nd ref='-38127' />
+ <nd ref='-38129' />
+ <nd ref='-38131' />
+ <nd ref='-38133' />
+ <nd ref='-38135' />
+ <nd ref='-38137' />
+ <nd ref='-38139' />
+ <nd ref='-38141' />
+ <nd ref='-38143' />
+ <nd ref='-38145' />
+ <nd ref='-38147' />
+ <nd ref='-38149' />
+ <nd ref='-38151' />
+ <nd ref='-38153' />
+ <nd ref='-38155' />
+ <nd ref='-38157' />
+ <nd ref='-43367' />
+ <nd ref='-43369' />
+ <nd ref='-43363' />
+ <nd ref='-43365' />
+ <nd ref='-43361' />
+ <nd ref='-43359' />
+ <nd ref='-43355' />
+ <nd ref='-43357' />
+ <nd ref='-43339' />
+ <nd ref='-43341' />
+ <nd ref='-43345' />
+ <nd ref='-43343' />
+ <nd ref='-43347' />
+ <nd ref='-43349' />
+ <nd ref='-43351' />
+ <nd ref='-43353' />
+ <nd ref='-38159' />
+ <nd ref='-38161' />
+ <nd ref='-38163' />
+ <nd ref='-56631' />
+ <tag k='ISO3166-2' v='US-NY' />
+ </way>
+ <way id='-58119'>
+ <nd ref='-56659' />
+ <nd ref='-56661' />
+ <nd ref='-56663' />
+ <nd ref='-56665' />
+ <nd ref='-56667' />
+ <nd ref='-56669' />
+ <nd ref='-56671' />
+ <nd ref='-56673' />
+ <nd ref='-56675' />
+ <nd ref='-56677' />
+ <nd ref='-56679' />
+ <nd ref='-56681' />
+ <nd ref='-56683' />
+ <nd ref='-56685' />
+ <nd ref='-56687' />
+ <nd ref='-56689' />
+ <nd ref='-56691' />
+ <nd ref='-57189' />
+ <nd ref='-57171' />
+ <nd ref='-57173' />
+ <nd ref='-56693' />
+ <nd ref='-56695' />
+ <nd ref='-56697' />
+ <nd ref='-56699' />
+ <nd ref='-56701' />
+ <nd ref='-56703' />
+ <nd ref='-56705' />
+ <nd ref='-56707' />
+ <nd ref='-54949' />
+ <nd ref='-56659' />
+ <tag k='ISO3166-2' v='US-NC' />
+ <tag k='name:en' v='North Carolina' />
+ </way>
+ <way id='-58121'>
+ <nd ref='-56709' />
+ <nd ref='-57011' />
+ <nd ref='-56711' />
+ <nd ref='-55979' />
+ <nd ref='-54915' />
+ <nd ref='-54913' />
+ <nd ref='-54911' />
+ <nd ref='-54909' />
+ <nd ref='-54907' />
+ <nd ref='-54905' />
+ <nd ref='-54903' />
+ <nd ref='-54901' />
+ <nd ref='-54899' />
+ <nd ref='-54897' />
+ <nd ref='-54895' />
+ <nd ref='-54893' />
+ <nd ref='-54891' />
+ <nd ref='-54889' />
+ <nd ref='-54887' />
+ <nd ref='-56435' />
+ <nd ref='-56437' />
+ <nd ref='-56439' />
+ <nd ref='-56441' />
+ <nd ref='-56443' />
+ <nd ref='-56445' />
+ <nd ref='-56447' />
+ <nd ref='-56449' />
+ <nd ref='-56451' />
+ <nd ref='-56453' />
+ <nd ref='-56455' />
+ <nd ref='-56457' />
+ <nd ref='-56459' />
+ <nd ref='-56461' />
+ <nd ref='-56463' />
+ <nd ref='-56465' />
+ <nd ref='-56467' />
+ <nd ref='-56469' />
+ <nd ref='-56471' />
+ <nd ref='-56473' />
+ <nd ref='-56475' />
+ <nd ref='-56477' />
+ <nd ref='-56479' />
+ <nd ref='-56481' />
+ <nd ref='-56483' />
+ <nd ref='-56485' />
+ <nd ref='-56487' />
+ <nd ref='-56489' />
+ <nd ref='-56491' />
+ <nd ref='-56493' />
+ <nd ref='-56495' />
+ <nd ref='-56497' />
+ <nd ref='-56499' />
+ <nd ref='-56501' />
+ <nd ref='-56503' />
+ <nd ref='-56505' />
+ <nd ref='-56507' />
+ <nd ref='-56509' />
+ <nd ref='-56511' />
+ <nd ref='-56513' />
+ <nd ref='-56515' />
+ <nd ref='-56517' />
+ <nd ref='-56519' />
+ <nd ref='-56521' />
+ <nd ref='-56523' />
+ <nd ref='-56525' />
+ <nd ref='-56527' />
+ <nd ref='-56529' />
+ <nd ref='-56531' />
+ <nd ref='-56533' />
+ <nd ref='-56535' />
+ <nd ref='-56537' />
+ <nd ref='-56539' />
+ <nd ref='-56541' />
+ <nd ref='-56591' />
+ <nd ref='-56593' />
+ <nd ref='-56595' />
+ <nd ref='-56597' />
+ <nd ref='-56599' />
+ <nd ref='-56601' />
+ <nd ref='-56603' />
+ <nd ref='-56605' />
+ <nd ref='-56607' />
+ <nd ref='-56609' />
+ <nd ref='-56611' />
+ <nd ref='-56589' />
+ <nd ref='-56587' />
+ <nd ref='-56585' />
+ <nd ref='-56583' />
+ <nd ref='-56643' />
+ <nd ref='-56641' />
+ <nd ref='-56639' />
+ <nd ref='-56637' />
+ <nd ref='-56635' />
+ <nd ref='-56633' />
+ <nd ref='-56631' />
+ <nd ref='-56709' />
+ <tag k='ISO3166-2' v='US-PA' />
+ <tag k='name:en' v='Pennsylvania' />
+ </way>
+ <way id='-58123'>
+ <nd ref='-55179' />
+ <nd ref='-56713' />
+ <nd ref='-56715' />
+ <nd ref='-56717' />
+ <nd ref='-56719' />
+ <nd ref='-56721' />
+ <nd ref='-56723' />
+ <nd ref='-56725' />
+ <nd ref='-56727' />
+ <nd ref='-56729' />
+ <nd ref='-56731' />
+ <nd ref='-56733' />
+ <nd ref='-56735' />
+ <nd ref='-56737' />
+ <nd ref='-56739' />
+ <nd ref='-56741' />
+ <nd ref='-56743' />
+ <nd ref='-56745' />
+ <nd ref='-56747' />
+ <nd ref='-56749' />
+ <nd ref='-56751' />
+ <nd ref='-56753' />
+ <nd ref='-56755' />
+ <nd ref='-56819' />
+ <nd ref='-56823' />
+ <nd ref='-56821' />
+ <nd ref='-56757' />
+ <nd ref='-56759' />
+ <nd ref='-56761' />
+ <nd ref='-56763' />
+ <nd ref='-56765' />
+ <nd ref='-56767' />
+ <nd ref='-56769' />
+ <nd ref='-56771' />
+ <nd ref='-56773' />
+ <nd ref='-56775' />
+ <nd ref='-56777' />
+ <nd ref='-56779' />
+ <nd ref='-56781' />
+ <nd ref='-56783' />
+ <nd ref='-56785' />
+ <nd ref='-56787' />
+ <nd ref='-56789' />
+ <nd ref='-56791' />
+ <nd ref='-56793' />
+ <nd ref='-56795' />
+ <nd ref='-56797' />
+ <nd ref='-56799' />
+ <nd ref='-56801' />
+ <nd ref='-56803' />
+ <nd ref='-56805' />
+ <nd ref='-56807' />
+ <nd ref='-56809' />
+ <nd ref='-56811' />
+ <nd ref='-56813' />
+ <nd ref='-56815' />
+ <nd ref='-56817' />
+ <nd ref='-56825' />
+ <nd ref='-54813' />
+ <nd ref='-54811' />
+ <nd ref='-55085' />
+ <nd ref='-55237' />
+ <nd ref='-55235' />
+ <nd ref='-55233' />
+ <nd ref='-55231' />
+ <nd ref='-55229' />
+ <nd ref='-55227' />
+ <nd ref='-55225' />
+ <nd ref='-55223' />
+ <nd ref='-55221' />
+ <nd ref='-55219' />
+ <nd ref='-55217' />
+ <nd ref='-55215' />
+ <nd ref='-55213' />
+ <nd ref='-55211' />
+ <nd ref='-55209' />
+ <nd ref='-55207' />
+ <nd ref='-55205' />
+ <nd ref='-55203' />
+ <nd ref='-55201' />
+ <nd ref='-55199' />
+ <nd ref='-55197' />
+ <nd ref='-55195' />
+ <nd ref='-55193' />
+ <nd ref='-55191' />
+ <nd ref='-55189' />
+ <nd ref='-55187' />
+ <nd ref='-55185' />
+ <nd ref='-55183' />
+ <nd ref='-55181' />
+ <nd ref='-55179' />
+ <tag k='ISO3166-2' v='US-OR' />
+ <tag k='name:en' v='Oregon' />
+ </way>
+ <way id='-58125'>
+ <nd ref='-56825' />
+ <nd ref='-42419' />
+ <nd ref='-42421' />
+ <nd ref='-42423' />
+ <nd ref='-42425' />
+ <nd ref='-42427' />
+ <nd ref='-42429' />
+ <nd ref='-42431' />
+ <nd ref='-55155' />
+ <nd ref='-55157' />
+ <nd ref='-55159' />
+ <nd ref='-55161' />
+ <nd ref='-55163' />
+ <nd ref='-55165' />
+ <nd ref='-55167' />
+ <nd ref='-55169' />
+ <nd ref='-55171' />
+ <nd ref='-55173' />
+ <nd ref='-55175' />
+ <nd ref='-55177' />
+ <nd ref='-55179' />
+ <nd ref='-56713' />
+ <nd ref='-56715' />
+ <nd ref='-56717' />
+ <nd ref='-56719' />
+ <nd ref='-56721' />
+ <nd ref='-56723' />
+ <nd ref='-56725' />
+ <nd ref='-56727' />
+ <nd ref='-56729' />
+ <nd ref='-56731' />
+ <nd ref='-56733' />
+ <nd ref='-56735' />
+ <nd ref='-56737' />
+ <nd ref='-56739' />
+ <nd ref='-56741' />
+ <nd ref='-56743' />
+ <nd ref='-56745' />
+ <nd ref='-56747' />
+ <nd ref='-56749' />
+ <nd ref='-56751' />
+ <nd ref='-56753' />
+ <nd ref='-56755' />
+ <nd ref='-56819' />
+ <nd ref='-56823' />
+ <nd ref='-56821' />
+ <nd ref='-56757' />
+ <nd ref='-56759' />
+ <nd ref='-56761' />
+ <nd ref='-56763' />
+ <nd ref='-56765' />
+ <nd ref='-56767' />
+ <nd ref='-56769' />
+ <nd ref='-56771' />
+ <nd ref='-56773' />
+ <nd ref='-56775' />
+ <nd ref='-56777' />
+ <nd ref='-56779' />
+ <nd ref='-56781' />
+ <nd ref='-56783' />
+ <nd ref='-56785' />
+ <nd ref='-56787' />
+ <nd ref='-56789' />
+ <nd ref='-56791' />
+ <nd ref='-56793' />
+ <nd ref='-56795' />
+ <nd ref='-56797' />
+ <nd ref='-56799' />
+ <nd ref='-56801' />
+ <nd ref='-56803' />
+ <nd ref='-56805' />
+ <nd ref='-56807' />
+ <nd ref='-56809' />
+ <nd ref='-56811' />
+ <nd ref='-56813' />
+ <nd ref='-56815' />
+ <nd ref='-56817' />
+ <nd ref='-56825' />
+ <tag k='ISO3166-2' v='US-WA' />
+ <tag k='name:en' v='Washington' />
+ </way>
+ <way id='-58127'>
+ <nd ref='-56961' />
+ <nd ref='-57003' />
+ <nd ref='-57001' />
+ <nd ref='-56999' />
+ <nd ref='-56997' />
+ <nd ref='-56995' />
+ <nd ref='-56993' />
+ <nd ref='-56991' />
+ <nd ref='-56989' />
+ <nd ref='-56987' />
+ <nd ref='-56985' />
+ <nd ref='-56983' />
+ <nd ref='-56981' />
+ <nd ref='-56979' />
+ <nd ref='-56977' />
+ <nd ref='-56975' />
+ <nd ref='-56973' />
+ <nd ref='-56971' />
+ <nd ref='-56969' />
+ <nd ref='-54751' />
+ <nd ref='-54753' />
+ <nd ref='-54755' />
+ <nd ref='-55643' />
+ <nd ref='-54819' />
+ <nd ref='-56619' />
+ <nd ref='-56617' />
+ <nd ref='-56827' />
+ <nd ref='-56829' />
+ <nd ref='-56831' />
+ <nd ref='-56833' />
+ <nd ref='-56835' />
+ <nd ref='-56837' />
+ <nd ref='-56839' />
+ <nd ref='-56841' />
+ <nd ref='-56843' />
+ <nd ref='-56845' />
+ <nd ref='-56847' />
+ <nd ref='-56849' />
+ <nd ref='-56851' />
+ <nd ref='-56853' />
+ <nd ref='-56855' />
+ <nd ref='-56857' />
+ <nd ref='-56859' />
+ <nd ref='-56861' />
+ <nd ref='-56863' />
+ <nd ref='-56865' />
+ <nd ref='-56867' />
+ <nd ref='-56869' />
+ <nd ref='-56871' />
+ <nd ref='-56873' />
+ <nd ref='-56875' />
+ <nd ref='-56877' />
+ <nd ref='-56879' />
+ <nd ref='-56881' />
+ <nd ref='-56883' />
+ <nd ref='-56885' />
+ <nd ref='-56887' />
+ <nd ref='-56889' />
+ <nd ref='-56891' />
+ <nd ref='-56893' />
+ <nd ref='-56895' />
+ <nd ref='-56897' />
+ <nd ref='-56899' />
+ <nd ref='-56901' />
+ <nd ref='-56903' />
+ <nd ref='-56905' />
+ <nd ref='-56907' />
+ <nd ref='-56909' />
+ <nd ref='-56911' />
+ <nd ref='-56913' />
+ <nd ref='-56915' />
+ <nd ref='-56917' />
+ <nd ref='-56919' />
+ <nd ref='-56921' />
+ <nd ref='-56923' />
+ <nd ref='-56925' />
+ <nd ref='-56927' />
+ <nd ref='-56929' />
+ <nd ref='-56931' />
+ <nd ref='-56933' />
+ <nd ref='-56935' />
+ <nd ref='-56937' />
+ <nd ref='-56963' />
+ <nd ref='-56967' />
+ <nd ref='-56965' />
+ <nd ref='-56939' />
+ <nd ref='-56941' />
+ <nd ref='-56943' />
+ <nd ref='-56945' />
+ <nd ref='-56947' />
+ <nd ref='-56949' />
+ <nd ref='-56951' />
+ <nd ref='-56953' />
+ <nd ref='-56955' />
+ <nd ref='-56957' />
+ <nd ref='-56959' />
+ <nd ref='-56961' />
+ <tag k='ISO3166-2' v='US-OK' />
+ <tag k='name:en' v='Oklahoma' />
+ </way>
+ <way id='-58129'>
+ <nd ref='-57009' />
+ <nd ref='-36451' />
+ <nd ref='-41045' />
+ <nd ref='-43445' />
+ <nd ref='-43447' />
+ <nd ref='-43443' />
+ <nd ref='-43441' />
+ <nd ref='-43437' />
+ <nd ref='-43435' />
+ <nd ref='-43433' />
+ <nd ref='-43439' />
+ <nd ref='-43431' />
+ <nd ref='-43429' />
+ <nd ref='-41043' />
+ <nd ref='-43427' />
+ <nd ref='-41041' />
+ <nd ref='-43423' />
+ <nd ref='-43425' />
+ <nd ref='-43421' />
+ <nd ref='-43419' />
+ <nd ref='-43417' />
+ <nd ref='-41039' />
+ <nd ref='-41037' />
+ <nd ref='-41035' />
+ <nd ref='-41033' />
+ <nd ref='-41031' />
+ <nd ref='-41029' />
+ <nd ref='-43415' />
+ <nd ref='-41027' />
+ <nd ref='-41025' />
+ <nd ref='-41023' />
+ <nd ref='-41021' />
+ <nd ref='-43413' />
+ <nd ref='-41019' />
+ <nd ref='-43411' />
+ <nd ref='-43409' />
+ <nd ref='-41017' />
+ <nd ref='-43407' />
+ <nd ref='-41015' />
+ <nd ref='-41013' />
+ <nd ref='-41011' />
+ <nd ref='-43405' />
+ <nd ref='-41009' />
+ <nd ref='-56621' />
+ <nd ref='-56623' />
+ <nd ref='-56625' />
+ <nd ref='-56627' />
+ <nd ref='-56629' />
+ <nd ref='-56613' />
+ <nd ref='-56615' />
+ <nd ref='-56617' />
+ <nd ref='-56827' />
+ <nd ref='-56829' />
+ <nd ref='-56831' />
+ <nd ref='-56833' />
+ <nd ref='-56835' />
+ <nd ref='-56837' />
+ <nd ref='-56839' />
+ <nd ref='-56841' />
+ <nd ref='-56843' />
+ <nd ref='-56845' />
+ <nd ref='-56847' />
+ <nd ref='-56849' />
+ <nd ref='-56851' />
+ <nd ref='-56853' />
+ <nd ref='-56855' />
+ <nd ref='-56857' />
+ <nd ref='-56859' />
+ <nd ref='-56861' />
+ <nd ref='-56863' />
+ <nd ref='-56865' />
+ <nd ref='-56867' />
+ <nd ref='-56869' />
+ <nd ref='-56871' />
+ <nd ref='-56873' />
+ <nd ref='-56875' />
+ <nd ref='-56877' />
+ <nd ref='-56879' />
+ <nd ref='-56881' />
+ <nd ref='-56883' />
+ <nd ref='-56885' />
+ <nd ref='-56887' />
+ <nd ref='-56889' />
+ <nd ref='-56891' />
+ <nd ref='-56893' />
+ <nd ref='-56895' />
+ <nd ref='-56897' />
+ <nd ref='-56899' />
+ <nd ref='-56901' />
+ <nd ref='-56903' />
+ <nd ref='-56905' />
+ <nd ref='-56907' />
+ <nd ref='-56909' />
+ <nd ref='-56911' />
+ <nd ref='-56913' />
+ <nd ref='-56915' />
+ <nd ref='-56917' />
+ <nd ref='-56919' />
+ <nd ref='-56921' />
+ <nd ref='-56923' />
+ <nd ref='-56925' />
+ <nd ref='-56927' />
+ <nd ref='-56929' />
+ <nd ref='-56931' />
+ <nd ref='-56933' />
+ <nd ref='-56935' />
+ <nd ref='-56937' />
+ <nd ref='-56963' />
+ <nd ref='-56967' />
+ <nd ref='-56965' />
+ <nd ref='-56939' />
+ <nd ref='-56941' />
+ <nd ref='-56943' />
+ <nd ref='-56945' />
+ <nd ref='-56947' />
+ <nd ref='-56949' />
+ <nd ref='-56951' />
+ <nd ref='-56953' />
+ <nd ref='-56955' />
+ <nd ref='-56957' />
+ <nd ref='-56959' />
+ <nd ref='-56961' />
+ <nd ref='-57003' />
+ <nd ref='-57001' />
+ <nd ref='-56999' />
+ <nd ref='-56997' />
+ <nd ref='-56995' />
+ <nd ref='-56993' />
+ <nd ref='-56991' />
+ <nd ref='-56989' />
+ <nd ref='-56987' />
+ <nd ref='-56985' />
+ <nd ref='-56983' />
+ <nd ref='-56981' />
+ <nd ref='-56979' />
+ <nd ref='-56977' />
+ <nd ref='-56975' />
+ <nd ref='-56973' />
+ <nd ref='-56971' />
+ <nd ref='-56969' />
+ <nd ref='-54751' />
+ <nd ref='-54749' />
+ <nd ref='-54747' />
+ <nd ref='-54745' />
+ <nd ref='-54743' />
+ <nd ref='-55871' />
+ <nd ref='-55869' />
+ <nd ref='-55867' />
+ <nd ref='-55865' />
+ <nd ref='-55863' />
+ <nd ref='-55861' />
+ <nd ref='-55859' />
+ <nd ref='-57009' />
+ <tag k='ISO3166-2' v='US-TX' />
+ <tag k='name:en' v='Texas' />
+ </way>
+ <way id='-58131'>
+ <nd ref='-57109' />
+ <nd ref='-57163' />
+ <nd ref='-57161' />
+ <nd ref='-57159' />
+ <nd ref='-57157' />
+ <nd ref='-57155' />
+ <nd ref='-57153' />
+ <nd ref='-57151' />
+ <nd ref='-57149' />
+ <nd ref='-57147' />
+ <nd ref='-57145' />
+ <nd ref='-57143' />
+ <nd ref='-57141' />
+ <nd ref='-57139' />
+ <nd ref='-57137' />
+ <nd ref='-57135' />
+ <nd ref='-57133' />
+ <nd ref='-57131' />
+ <nd ref='-57129' />
+ <nd ref='-57127' />
+ <nd ref='-57125' />
+ <nd ref='-57123' />
+ <nd ref='-57121' />
+ <nd ref='-57119' />
+ <nd ref='-57117' />
+ <nd ref='-57115' />
+ <nd ref='-57113' />
+ <nd ref='-57111' />
+ <nd ref='-55837' />
+ <nd ref='-55839' />
+ <nd ref='-55841' />
+ <nd ref='-55843' />
+ <nd ref='-55845' />
+ <nd ref='-55847' />
+ <nd ref='-55849' />
+ <nd ref='-55851' />
+ <nd ref='-55853' />
+ <nd ref='-55855' />
+ <nd ref='-55857' />
+ <nd ref='-55805' />
+ <nd ref='-55803' />
+ <nd ref='-55801' />
+ <nd ref='-55799' />
+ <nd ref='-55797' />
+ <nd ref='-55795' />
+ <nd ref='-55793' />
+ <nd ref='-55791' />
+ <nd ref='-55789' />
+ <nd ref='-55787' />
+ <nd ref='-55785' />
+ <nd ref='-55783' />
+ <nd ref='-55781' />
+ <nd ref='-55779' />
+ <nd ref='-55777' />
+ <nd ref='-55775' />
+ <nd ref='-55773' />
+ <nd ref='-55771' />
+ <nd ref='-55769' />
+ <nd ref='-55767' />
+ <nd ref='-55765' />
+ <nd ref='-55763' />
+ <nd ref='-55761' />
+ <nd ref='-55759' />
+ <nd ref='-55757' />
+ <nd ref='-55755' />
+ <nd ref='-55753' />
+ <nd ref='-55751' />
+ <nd ref='-55749' />
+ <nd ref='-55747' />
+ <nd ref='-55745' />
+ <nd ref='-55437' />
+ <nd ref='-56115' />
+ <nd ref='-56117' />
+ <nd ref='-56119' />
+ <nd ref='-38169' />
+ <nd ref='-38167' />
+ <nd ref='-38165' />
+ <nd ref='-56709' />
+ <nd ref='-57011' />
+ <nd ref='-57013' />
+ <nd ref='-57015' />
+ <nd ref='-57017' />
+ <nd ref='-57019' />
+ <nd ref='-57021' />
+ <nd ref='-57023' />
+ <nd ref='-57025' />
+ <nd ref='-57027' />
+ <nd ref='-57029' />
+ <nd ref='-57031' />
+ <nd ref='-57033' />
+ <nd ref='-57035' />
+ <nd ref='-57037' />
+ <nd ref='-57039' />
+ <nd ref='-57041' />
+ <nd ref='-57043' />
+ <nd ref='-57045' />
+ <nd ref='-57047' />
+ <nd ref='-57049' />
+ <nd ref='-57051' />
+ <nd ref='-57053' />
+ <nd ref='-57055' />
+ <nd ref='-57057' />
+ <nd ref='-57059' />
+ <nd ref='-57061' />
+ <nd ref='-57063' />
+ <nd ref='-57065' />
+ <nd ref='-57067' />
+ <nd ref='-57069' />
+ <nd ref='-57071' />
+ <nd ref='-57073' />
+ <nd ref='-57075' />
+ <nd ref='-57077' />
+ <nd ref='-57079' />
+ <nd ref='-57081' />
+ <nd ref='-57083' />
+ <nd ref='-57085' />
+ <nd ref='-57087' />
+ <nd ref='-57089' />
+ <nd ref='-57091' />
+ <nd ref='-57093' />
+ <nd ref='-57095' />
+ <nd ref='-57097' />
+ <nd ref='-57099' />
+ <nd ref='-57101' />
+ <nd ref='-57103' />
+ <nd ref='-57105' />
+ <nd ref='-57107' />
+ <nd ref='-57109' />
+ <tag k='ISO3166-2' v='US-OH' />
+ <tag k='name:en' v='Ohio' />
+ </way>
+ <way id='-58133'>
+ <nd ref='-57165' />
+ <nd ref='-56111' />
+ <nd ref='-56109' />
+ <nd ref='-56107' />
+ <nd ref='-56105' />
+ <nd ref='-56103' />
+ <nd ref='-56101' />
+ <nd ref='-56099' />
+ <nd ref='-56097' />
+ <nd ref='-56095' />
+ <nd ref='-56093' />
+ <nd ref='-56091' />
+ <nd ref='-56089' />
+ <nd ref='-54857' />
+ <nd ref='-54855' />
+ <nd ref='-54853' />
+ <nd ref='-54851' />
+ <nd ref='-54849' />
+ <nd ref='-54847' />
+ <nd ref='-54845' />
+ <nd ref='-54843' />
+ <nd ref='-54841' />
+ <nd ref='-57165' />
+ <tag k='ISO3166-2' v='US-RI' />
+ <tag k='name:en' v='Rhode Island' />
+ </way>
+ <way id='-58135'>
+ <nd ref='-55083' />
+ <nd ref='-55081' />
+ <nd ref='-55079' />
+ <nd ref='-55077' />
+ <nd ref='-55075' />
+ <nd ref='-55073' />
+ <nd ref='-55071' />
+ <nd ref='-55069' />
+ <nd ref='-55067' />
+ <nd ref='-55065' />
+ <nd ref='-55063' />
+ <nd ref='-55061' />
+ <nd ref='-55059' />
+ <nd ref='-55057' />
+ <nd ref='-55055' />
+ <nd ref='-55053' />
+ <nd ref='-55051' />
+ <nd ref='-55049' />
+ <nd ref='-55047' />
+ <nd ref='-55045' />
+ <nd ref='-55043' />
+ <nd ref='-55041' />
+ <nd ref='-55039' />
+ <nd ref='-55037' />
+ <nd ref='-55035' />
+ <nd ref='-55033' />
+ <nd ref='-55031' />
+ <nd ref='-55029' />
+ <nd ref='-55027' />
+ <nd ref='-55025' />
+ <nd ref='-55023' />
+ <nd ref='-55021' />
+ <nd ref='-55019' />
+ <nd ref='-55017' />
+ <nd ref='-55015' />
+ <nd ref='-55013' />
+ <nd ref='-55011' />
+ <nd ref='-55009' />
+ <nd ref='-55007' />
+ <nd ref='-55005' />
+ <nd ref='-55003' />
+ <nd ref='-55001' />
+ <nd ref='-54999' />
+ <nd ref='-54997' />
+ <nd ref='-54995' />
+ <nd ref='-54993' />
+ <nd ref='-54991' />
+ <nd ref='-54989' />
+ <nd ref='-54987' />
+ <nd ref='-54985' />
+ <nd ref='-54983' />
+ <nd ref='-54981' />
+ <nd ref='-54979' />
+ <nd ref='-54977' />
+ <nd ref='-54975' />
+ <nd ref='-54973' />
+ <nd ref='-54971' />
+ <nd ref='-54969' />
+ <nd ref='-54967' />
+ <nd ref='-54965' />
+ <nd ref='-54963' />
+ <nd ref='-54961' />
+ <nd ref='-54959' />
+ <nd ref='-54957' />
+ <nd ref='-54955' />
+ <nd ref='-54953' />
+ <nd ref='-54951' />
+ <nd ref='-54949' />
+ <nd ref='-56707' />
+ <nd ref='-56705' />
+ <nd ref='-56703' />
+ <nd ref='-56701' />
+ <nd ref='-56699' />
+ <nd ref='-56697' />
+ <nd ref='-56695' />
+ <nd ref='-56693' />
+ <nd ref='-55083' />
+ <tag k='ISO3166-2' v='US-SC' />
+ <tag k='name:en' v='South Carolina' />
+ </way>
+ <way id='-58137'>
+ <nd ref='-56691' />
+ <nd ref='-57183' />
+ <nd ref='-57185' />
+ <nd ref='-57187' />
+ <nd ref='-57177' />
+ <nd ref='-55727' />
+ <nd ref='-55725' />
+ <nd ref='-55723' />
+ <nd ref='-55721' />
+ <nd ref='-55719' />
+ <nd ref='-55717' />
+ <nd ref='-55715' />
+ <nd ref='-55713' />
+ <nd ref='-56285' />
+ <nd ref='-56287' />
+ <nd ref='-56289' />
+ <nd ref='-56291' />
+ <nd ref='-56293' />
+ <nd ref='-56295' />
+ <nd ref='-56297' />
+ <nd ref='-56299' />
+ <nd ref='-56301' />
+ <nd ref='-56303' />
+ <nd ref='-56305' />
+ <nd ref='-54769' />
+ <nd ref='-54771' />
+ <nd ref='-54773' />
+ <nd ref='-54775' />
+ <nd ref='-54777' />
+ <nd ref='-54779' />
+ <nd ref='-54781' />
+ <nd ref='-54783' />
+ <nd ref='-54785' />
+ <nd ref='-54787' />
+ <nd ref='-54789' />
+ <nd ref='-54791' />
+ <nd ref='-54793' />
+ <nd ref='-54795' />
+ <nd ref='-56281' />
+ <nd ref='-54565' />
+ <nd ref='-54567' />
+ <nd ref='-56659' />
+ <nd ref='-56661' />
+ <nd ref='-56663' />
+ <nd ref='-56665' />
+ <nd ref='-56667' />
+ <nd ref='-56669' />
+ <nd ref='-56671' />
+ <nd ref='-56673' />
+ <nd ref='-56675' />
+ <nd ref='-56677' />
+ <nd ref='-56679' />
+ <nd ref='-56681' />
+ <nd ref='-56683' />
+ <nd ref='-56685' />
+ <nd ref='-56687' />
+ <nd ref='-56689' />
+ <nd ref='-56691' />
+ <tag k='ISO3166-2' v='US-TN' />
+ <tag k='name:en' v='Tennessee' />
+ </way>
+ <way id='-58139'>
+ <nd ref='-56657' />
+ <nd ref='-56655' />
+ <nd ref='-56653' />
+ <nd ref='-56651' />
+ <nd ref='-56649' />
+ <nd ref='-56647' />
+ <nd ref='-56645' />
+ <nd ref='-56063' />
+ <nd ref='-56347' />
+ <nd ref='-56349' />
+ <nd ref='-56351' />
+ <nd ref='-56353' />
+ <nd ref='-56355' />
+ <nd ref='-56357' />
+ <nd ref='-56359' />
+ <nd ref='-56361' />
+ <nd ref='-56363' />
+ <nd ref='-56365' />
+ <nd ref='-56367' />
+ <nd ref='-56369' />
+ <nd ref='-56371' />
+ <nd ref='-56373' />
+ <nd ref='-56375' />
+ <nd ref='-56377' />
+ <nd ref='-56379' />
+ <nd ref='-56381' />
+ <nd ref='-56383' />
+ <nd ref='-56385' />
+ <nd ref='-56387' />
+ <nd ref='-56389' />
+ <nd ref='-56391' />
+ <nd ref='-56393' />
+ <nd ref='-56395' />
+ <nd ref='-56397' />
+ <nd ref='-56399' />
+ <nd ref='-56401' />
+ <nd ref='-56403' />
+ <nd ref='-56405' />
+ <nd ref='-56407' />
+ <nd ref='-56409' />
+ <nd ref='-56411' />
+ <nd ref='-56413' />
+ <nd ref='-56415' />
+ <nd ref='-56417' />
+ <nd ref='-56419' />
+ <nd ref='-56421' />
+ <nd ref='-56423' />
+ <nd ref='-56425' />
+ <nd ref='-56427' />
+ <nd ref='-56429' />
+ <nd ref='-56431' />
+ <nd ref='-56433' />
+ <nd ref='-38121' />
+ <nd ref='-56657' />
+ <tag k='ISO3166-2' v='US-VT' />
+ <tag k='name:en' v='Vermont' />
+ </way>
+ <way id='-58141'>
+ <nd ref='-55977' />
+ <nd ref='-57191' />
+ <nd ref='-57193' />
+ <nd ref='-57195' />
+ <nd ref='-57197' />
+ <nd ref='-57199' />
+ <nd ref='-57201' />
+ <nd ref='-57203' />
+ <nd ref='-57205' />
+ <nd ref='-57207' />
+ <nd ref='-57209' />
+ <nd ref='-57211' />
+ <nd ref='-57213' />
+ <nd ref='-57215' />
+ <nd ref='-57217' />
+ <nd ref='-57219' />
+ <nd ref='-57221' />
+ <nd ref='-57223' />
+ <nd ref='-57225' />
+ <nd ref='-57227' />
+ <nd ref='-57229' />
+ <nd ref='-57231' />
+ <nd ref='-57233' />
+ <nd ref='-57235' />
+ <nd ref='-57237' />
+ <nd ref='-57239' />
+ <nd ref='-57241' />
+ <nd ref='-57243' />
+ <nd ref='-57245' />
+ <nd ref='-57247' />
+ <nd ref='-57249' />
+ <nd ref='-57251' />
+ <nd ref='-57253' />
+ <nd ref='-57255' />
+ <nd ref='-57257' />
+ <nd ref='-57259' />
+ <nd ref='-57261' />
+ <nd ref='-57263' />
+ <nd ref='-57265' />
+ <nd ref='-57267' />
+ <nd ref='-57269' />
+ <nd ref='-57271' />
+ <nd ref='-57273' />
+ <nd ref='-57275' />
+ <nd ref='-57277' />
+ <nd ref='-57279' />
+ <nd ref='-57281' />
+ <nd ref='-57283' />
+ <nd ref='-57285' />
+ <nd ref='-57287' />
+ <nd ref='-57289' />
+ <nd ref='-57291' />
+ <nd ref='-57293' />
+ <nd ref='-57295' />
+ <nd ref='-57297' />
+ <nd ref='-57299' />
+ <nd ref='-57301' />
+ <nd ref='-57303' />
+ <nd ref='-57305' />
+ <nd ref='-57307' />
+ <nd ref='-57309' />
+ <nd ref='-57311' />
+ <nd ref='-57313' />
+ <nd ref='-57315' />
+ <nd ref='-57317' />
+ <nd ref='-57319' />
+ <nd ref='-57321' />
+ <nd ref='-57323' />
+ <nd ref='-57325' />
+ <nd ref='-57327' />
+ <nd ref='-57329' />
+ <nd ref='-57331' />
+ <nd ref='-57333' />
+ <nd ref='-57335' />
+ <nd ref='-57337' />
+ <nd ref='-57339' />
+ <nd ref='-57341' />
+ <nd ref='-57343' />
+ <nd ref='-55743' />
+ <nd ref='-55741' />
+ <nd ref='-55739' />
+ <nd ref='-55737' />
+ <nd ref='-55735' />
+ <nd ref='-55733' />
+ <nd ref='-55731' />
+ <nd ref='-55729' />
+ <nd ref='-57179' />
+ <nd ref='-57181' />
+ <nd ref='-57177' />
+ <nd ref='-57187' />
+ <nd ref='-57185' />
+ <nd ref='-57183' />
+ <nd ref='-56691' />
+ <nd ref='-57189' />
+ <nd ref='-57171' />
+ <nd ref='-55911' />
+ <nd ref='-55913' />
+ <nd ref='-55915' />
+ <nd ref='-55917' />
+ <nd ref='-55919' />
+ <nd ref='-55921' />
+ <nd ref='-55923' />
+ <nd ref='-55925' />
+ <nd ref='-55927' />
+ <nd ref='-55929' />
+ <nd ref='-55931' />
+ <nd ref='-55933' />
+ <nd ref='-55935' />
+ <nd ref='-55937' />
+ <nd ref='-55939' />
+ <nd ref='-55941' />
+ <nd ref='-54535' />
+ <nd ref='-54557' />
+ <nd ref='-54555' />
+ <nd ref='-54553' />
+ <nd ref='-54551' />
+ <nd ref='-54549' />
+ <nd ref='-54547' />
+ <nd ref='-54545' />
+ <nd ref='-54543' />
+ <nd ref='-54541' />
+ <nd ref='-54539' />
+ <nd ref='-54537' />
+ <nd ref='-54529' />
+ <nd ref='-55943' />
+ <nd ref='-55945' />
+ <nd ref='-55947' />
+ <nd ref='-55949' />
+ <nd ref='-55951' />
+ <nd ref='-55953' />
+ <nd ref='-55955' />
+ <nd ref='-55957' />
+ <nd ref='-55959' />
+ <nd ref='-55961' />
+ <nd ref='-55963' />
+ <nd ref='-55965' />
+ <nd ref='-55967' />
+ <nd ref='-55969' />
+ <nd ref='-55971' />
+ <nd ref='-55973' />
+ <nd ref='-55975' />
+ <nd ref='-55977' />
+ <tag k='ISO3166-2' v='US-VA' />
+ <tag k='name:en' v='Virginia' />
+ </way>
+ <way id='-58143'>
+ <nd ref='-55743' />
+ <nd ref='-55807' />
+ <nd ref='-55809' />
+ <nd ref='-55811' />
+ <nd ref='-55813' />
+ <nd ref='-55815' />
+ <nd ref='-55817' />
+ <nd ref='-55819' />
+ <nd ref='-55821' />
+ <nd ref='-55823' />
+ <nd ref='-55825' />
+ <nd ref='-55827' />
+ <nd ref='-55829' />
+ <nd ref='-55831' />
+ <nd ref='-55833' />
+ <nd ref='-55835' />
+ <nd ref='-55837' />
+ <nd ref='-57111' />
+ <nd ref='-57113' />
+ <nd ref='-57115' />
+ <nd ref='-57117' />
+ <nd ref='-57119' />
+ <nd ref='-57121' />
+ <nd ref='-57123' />
+ <nd ref='-57125' />
+ <nd ref='-57127' />
+ <nd ref='-57129' />
+ <nd ref='-57131' />
+ <nd ref='-57133' />
+ <nd ref='-57135' />
+ <nd ref='-57137' />
+ <nd ref='-57139' />
+ <nd ref='-57141' />
+ <nd ref='-57143' />
+ <nd ref='-57145' />
+ <nd ref='-57147' />
+ <nd ref='-57149' />
+ <nd ref='-57151' />
+ <nd ref='-57153' />
+ <nd ref='-57155' />
+ <nd ref='-57157' />
+ <nd ref='-57159' />
+ <nd ref='-57161' />
+ <nd ref='-57163' />
+ <nd ref='-57109' />
+ <nd ref='-57107' />
+ <nd ref='-57105' />
+ <nd ref='-57103' />
+ <nd ref='-57101' />
+ <nd ref='-57099' />
+ <nd ref='-57097' />
+ <nd ref='-57095' />
+ <nd ref='-57093' />
+ <nd ref='-57091' />
+ <nd ref='-57089' />
+ <nd ref='-57087' />
+ <nd ref='-57085' />
+ <nd ref='-57083' />
+ <nd ref='-57081' />
+ <nd ref='-57079' />
+ <nd ref='-57077' />
+ <nd ref='-57075' />
+ <nd ref='-57073' />
+ <nd ref='-57071' />
+ <nd ref='-57069' />
+ <nd ref='-57067' />
+ <nd ref='-57065' />
+ <nd ref='-57063' />
+ <nd ref='-57061' />
+ <nd ref='-57059' />
+ <nd ref='-57057' />
+ <nd ref='-57055' />
+ <nd ref='-57053' />
+ <nd ref='-57051' />
+ <nd ref='-57049' />
+ <nd ref='-57047' />
+ <nd ref='-57045' />
+ <nd ref='-57043' />
+ <nd ref='-57041' />
+ <nd ref='-57039' />
+ <nd ref='-57037' />
+ <nd ref='-57035' />
+ <nd ref='-57033' />
+ <nd ref='-57031' />
+ <nd ref='-57029' />
+ <nd ref='-57027' />
+ <nd ref='-57025' />
+ <nd ref='-57023' />
+ <nd ref='-57021' />
+ <nd ref='-57019' />
+ <nd ref='-57017' />
+ <nd ref='-57015' />
+ <nd ref='-57013' />
+ <nd ref='-57011' />
+ <nd ref='-56711' />
+ <nd ref='-55979' />
+ <nd ref='-55981' />
+ <nd ref='-55983' />
+ <nd ref='-55985' />
+ <nd ref='-55987' />
+ <nd ref='-55989' />
+ <nd ref='-55991' />
+ <nd ref='-55993' />
+ <nd ref='-55995' />
+ <nd ref='-55997' />
+ <nd ref='-55999' />
+ <nd ref='-56001' />
+ <nd ref='-56003' />
+ <nd ref='-56005' />
+ <nd ref='-56007' />
+ <nd ref='-56009' />
+ <nd ref='-56011' />
+ <nd ref='-56013' />
+ <nd ref='-56015' />
+ <nd ref='-56017' />
+ <nd ref='-56019' />
+ <nd ref='-56021' />
+ <nd ref='-56023' />
+ <nd ref='-56025' />
+ <nd ref='-56027' />
+ <nd ref='-56029' />
+ <nd ref='-56031' />
+ <nd ref='-56033' />
+ <nd ref='-56035' />
+ <nd ref='-56037' />
+ <nd ref='-56039' />
+ <nd ref='-56041' />
+ <nd ref='-56059' />
+ <nd ref='-56057' />
+ <nd ref='-56055' />
+ <nd ref='-56053' />
+ <nd ref='-56051' />
+ <nd ref='-56049' />
+ <nd ref='-56047' />
+ <nd ref='-56045' />
+ <nd ref='-56043' />
+ <nd ref='-55977' />
+ <nd ref='-57191' />
+ <nd ref='-57193' />
+ <nd ref='-57195' />
+ <nd ref='-57197' />
+ <nd ref='-57199' />
+ <nd ref='-57201' />
+ <nd ref='-57203' />
+ <nd ref='-57205' />
+ <nd ref='-57207' />
+ <nd ref='-57209' />
+ <nd ref='-57211' />
+ <nd ref='-57213' />
+ <nd ref='-57215' />
+ <nd ref='-57217' />
+ <nd ref='-57219' />
+ <nd ref='-57221' />
+ <nd ref='-57223' />
+ <nd ref='-57225' />
+ <nd ref='-57227' />
+ <nd ref='-57229' />
+ <nd ref='-57231' />
+ <nd ref='-57233' />
+ <nd ref='-57235' />
+ <nd ref='-57237' />
+ <nd ref='-57239' />
+ <nd ref='-57241' />
+ <nd ref='-57243' />
+ <nd ref='-57245' />
+ <nd ref='-57247' />
+ <nd ref='-57249' />
+ <nd ref='-57251' />
+ <nd ref='-57253' />
+ <nd ref='-57255' />
+ <nd ref='-57257' />
+ <nd ref='-57259' />
+ <nd ref='-57261' />
+ <nd ref='-57263' />
+ <nd ref='-57265' />
+ <nd ref='-57267' />
+ <nd ref='-57269' />
+ <nd ref='-57271' />
+ <nd ref='-57273' />
+ <nd ref='-57275' />
+ <nd ref='-57277' />
+ <nd ref='-57279' />
+ <nd ref='-57281' />
+ <nd ref='-57283' />
+ <nd ref='-57285' />
+ <nd ref='-57287' />
+ <nd ref='-57289' />
+ <nd ref='-57291' />
+ <nd ref='-57293' />
+ <nd ref='-57295' />
+ <nd ref='-57297' />
+ <nd ref='-57299' />
+ <nd ref='-57301' />
+ <nd ref='-57303' />
+ <nd ref='-57305' />
+ <nd ref='-57307' />
+ <nd ref='-57309' />
+ <nd ref='-57311' />
+ <nd ref='-57313' />
+ <nd ref='-57315' />
+ <nd ref='-57317' />
+ <nd ref='-57319' />
+ <nd ref='-57321' />
+ <nd ref='-57323' />
+ <nd ref='-57325' />
+ <nd ref='-57327' />
+ <nd ref='-57329' />
+ <nd ref='-57331' />
+ <nd ref='-57333' />
+ <nd ref='-57335' />
+ <nd ref='-57337' />
+ <nd ref='-57339' />
+ <nd ref='-57341' />
+ <nd ref='-57343' />
+ <nd ref='-55743' />
+ <tag k='ISO3166-2' v='US-WV' />
+ <tag k='name:en' v='West Virginia' />
+ </way>
+ <way id='-58145'>
+ <nd ref='-53711' />
+ <nd ref='-53889' />
+ <nd ref='-54115' />
+ <nd ref='-54117' />
+ <nd ref='-53965' />
+ <nd ref='-42495' />
+ <nd ref='-53967' />
+ <nd ref='-53969' />
+ <nd ref='-53951' />
+ <nd ref='-53887' />
+ <nd ref='-42787' />
+ <nd ref='-43109' />
+ <nd ref='-42483' />
+ <nd ref='-42789' />
+ <nd ref='-41613' />
+ <nd ref='-41611' />
+ <nd ref='-41609' />
+ <nd ref='-41607' />
+ <nd ref='-41605' />
+ <nd ref='-42485' />
+ <nd ref='-42487' />
+ <nd ref='-42489' />
+ <nd ref='-41603' />
+ <nd ref='-42491' />
+ <nd ref='-42477' />
+ <nd ref='-42479' />
+ <nd ref='-42493' />
+ <nd ref='-53711' />
+ </way>
+ <way id='-58147'>
+ <nd ref='-57355' />
+ <nd ref='-39761' />
+ <nd ref='-42659' />
+ <nd ref='-36827' />
+ <nd ref='-36829' />
+ <nd ref='-36831' />
+ <nd ref='-42665' />
+ <nd ref='-42667' />
+ <nd ref='-37555' />
+ <nd ref='-39181' />
+ <nd ref='-39183' />
+ <nd ref='-39207' />
+ <nd ref='-39209' />
+ <nd ref='-43035' />
+ <nd ref='-43033' />
+ <nd ref='-43031' />
+ <nd ref='-43029' />
+ <nd ref='-41541' />
+ <nd ref='-41539' />
+ <nd ref='-35101' />
+ <nd ref='-35099' />
+ <nd ref='-35097' />
+ <nd ref='-35095' />
+ <nd ref='-35093' />
+ <nd ref='-35091' />
+ <nd ref='-35103' />
+ <nd ref='-35105' />
+ <nd ref='-35107' />
+ <nd ref='-35109' />
+ <nd ref='-35111' />
+ <nd ref='-35117' />
+ <nd ref='-35113' />
+ <nd ref='-35115' />
+ <nd ref='-41537' />
+ <nd ref='-35119' />
+ <nd ref='-35121' />
+ <nd ref='-35123' />
+ <nd ref='-35131' />
+ <nd ref='-35129' />
+ <nd ref='-35127' />
+ <nd ref='-35125' />
+ <nd ref='-41535' />
+ <nd ref='-41533' />
+ <nd ref='-41531' />
+ <nd ref='-41529' />
+ <nd ref='-41527' />
+ <nd ref='-35133' />
+ <nd ref='-35141' />
+ <nd ref='-35135' />
+ <nd ref='-35137' />
+ <nd ref='-35139' />
+ <nd ref='-35149' />
+ <nd ref='-35145' />
+ <nd ref='-35143' />
+ <nd ref='-35147' />
+ <nd ref='-35155' />
+ <nd ref='-35153' />
+ <nd ref='-35151' />
+ <nd ref='-41525' />
+ <nd ref='-35157' />
+ <nd ref='-35159' />
+ <nd ref='-35161' />
+ <nd ref='-35163' />
+ <nd ref='-35165' />
+ <nd ref='-35177' />
+ <nd ref='-35175' />
+ <nd ref='-35173' />
+ <nd ref='-35171' />
+ <nd ref='-35169' />
+ <nd ref='-35167' />
+ <nd ref='-41523' />
+ <nd ref='-39593' />
+ <nd ref='-39595' />
+ <nd ref='-39597' />
+ <nd ref='-39599' />
+ <nd ref='-39601' />
+ <nd ref='-35233' />
+ <nd ref='-39603' />
+ <nd ref='-35299' />
+ <nd ref='-35237' />
+ <nd ref='-35235' />
+ <nd ref='-35301' />
+ <nd ref='-35303' />
+ <nd ref='-35305' />
+ <nd ref='-35307' />
+ <nd ref='-35309' />
+ <nd ref='-35311' />
+ <nd ref='-35313' />
+ <nd ref='-35315' />
+ <nd ref='-35317' />
+ <nd ref='-35319' />
+ <nd ref='-35321' />
+ <nd ref='-35323' />
+ <nd ref='-35331' />
+ <nd ref='-35333' />
+ <nd ref='-35335' />
+ <nd ref='-35337' />
+ <nd ref='-35339' />
+ <nd ref='-35341' />
+ <nd ref='-35345' />
+ <nd ref='-35343' />
+ <nd ref='-35347' />
+ <nd ref='-35349' />
+ <nd ref='-35351' />
+ <nd ref='-35353' />
+ <nd ref='-39581' />
+ <nd ref='-35355' />
+ <nd ref='-35357' />
+ <nd ref='-35359' />
+ <nd ref='-41521' />
+ <nd ref='-35329' />
+ <nd ref='-35327' />
+ <nd ref='-35325' />
+ <nd ref='-39583' />
+ <nd ref='-39585' />
+ <nd ref='-35297' />
+ <nd ref='-39587' />
+ <nd ref='-35295' />
+ <nd ref='-35293' />
+ <nd ref='-35289' />
+ <nd ref='-35291' />
+ <nd ref='-35287' />
+ <nd ref='-35285' />
+ <nd ref='-35283' />
+ <nd ref='-35281' />
+ <nd ref='-35279' />
+ <nd ref='-35277' />
+ <nd ref='-35275' />
+ <nd ref='-35273' />
+ <nd ref='-35271' />
+ <nd ref='-35269' />
+ <nd ref='-35267' />
+ <nd ref='-35265' />
+ <nd ref='-35263' />
+ <nd ref='-35261' />
+ <nd ref='-35259' />
+ <nd ref='-35255' />
+ <nd ref='-35257' />
+ <nd ref='-35253' />
+ <nd ref='-35251' />
+ <nd ref='-35249' />
+ <nd ref='-35247' />
+ <nd ref='-35245' />
+ <nd ref='-35239' />
+ <nd ref='-35241' />
+ <nd ref='-35243' />
+ <nd ref='-41775' />
+ <nd ref='-43021' />
+ <nd ref='-43023' />
+ <nd ref='-43025' />
+ <nd ref='-43027' />
+ <nd ref='-39541' />
+ <nd ref='-39543' />
+ <nd ref='-35011' />
+ <nd ref='-35013' />
+ <nd ref='-35009' />
+ <nd ref='-35015' />
+ <nd ref='-35005' />
+ <nd ref='-35007' />
+ <nd ref='-39545' />
+ <nd ref='-39547' />
+ <nd ref='-39549' />
+ <nd ref='-35001' />
+ <nd ref='-34999' />
+ <nd ref='-35003' />
+ <nd ref='-39551' />
+ <nd ref='-34987' />
+ <nd ref='-34985' />
+ <nd ref='-34989' />
+ <nd ref='-34991' />
+ <nd ref='-34993' />
+ <nd ref='-34995' />
+ <nd ref='-34997' />
+ <nd ref='-39553' />
+ <nd ref='-34925' />
+ <nd ref='-34927' />
+ <nd ref='-34929' />
+ <nd ref='-34941' />
+ <nd ref='-34939' />
+ <nd ref='-34935' />
+ <nd ref='-34937' />
+ <nd ref='-34931' />
+ <nd ref='-34933' />
+ <nd ref='-34945' />
+ <nd ref='-34943' />
+ <nd ref='-37809' />
+ <nd ref='-34905' />
+ <nd ref='-34907' />
+ <nd ref='-34911' />
+ <nd ref='-34909' />
+ <nd ref='-34913' />
+ <nd ref='-34915' />
+ <nd ref='-34917' />
+ <nd ref='-34919' />
+ <nd ref='-34921' />
+ <nd ref='-34923' />
+ <nd ref='-37847' />
+ <nd ref='-46595' />
+ <nd ref='-46597' />
+ <nd ref='-46599' />
+ <nd ref='-46601' />
+ <nd ref='-46603' />
+ <nd ref='-46605' />
+ <nd ref='-46607' />
+ <nd ref='-46609' />
+ <nd ref='-46611' />
+ <nd ref='-46613' />
+ <nd ref='-46615' />
+ <nd ref='-46619' />
+ <nd ref='-46621' />
+ <nd ref='-46617' />
+ <nd ref='-46593' />
+ <nd ref='-46591' />
+ <nd ref='-46589' />
+ <nd ref='-46587' />
+ <nd ref='-46585' />
+ <nd ref='-46583' />
+ <nd ref='-46581' />
+ <nd ref='-46579' />
+ <nd ref='-46577' />
+ <nd ref='-46531' />
+ <nd ref='-46575' />
+ <nd ref='-46571' />
+ <nd ref='-46573' />
+ <nd ref='-46569' />
+ <nd ref='-46567' />
+ <nd ref='-46565' />
+ <nd ref='-46563' />
+ <nd ref='-46561' />
+ <nd ref='-46559' />
+ <nd ref='-46557' />
+ <nd ref='-46555' />
+ <nd ref='-46553' />
+ <nd ref='-46551' />
+ <nd ref='-46549' />
+ <nd ref='-46547' />
+ <nd ref='-46543' />
+ <nd ref='-46545' />
+ <nd ref='-46541' />
+ <nd ref='-46539' />
+ <nd ref='-46537' />
+ <nd ref='-46535' />
+ <nd ref='-46533' />
+ <nd ref='-46503' />
+ <nd ref='-46529' />
+ <nd ref='-46527' />
+ <nd ref='-46525' />
+ <nd ref='-46523' />
+ <nd ref='-46507' />
+ <nd ref='-46511' />
+ <nd ref='-46509' />
+ <nd ref='-46513' />
+ <nd ref='-46515' />
+ <nd ref='-46521' />
+ <nd ref='-46517' />
+ <nd ref='-46519' />
+ <nd ref='-46505' />
+ <nd ref='-40783' />
+ <nd ref='-51243' />
+ <nd ref='-37845' />
+ <nd ref='-51249' />
+ <nd ref='-51247' />
+ <nd ref='-51251' />
+ <nd ref='-51245' />
+ <nd ref='-37843' />
+ <nd ref='-37841' />
+ <nd ref='-51257' />
+ <nd ref='-51255' />
+ <nd ref='-51253' />
+ <nd ref='-37839' />
+ <nd ref='-51259' />
+ <nd ref='-51261' />
+ <nd ref='-37837' />
+ <nd ref='-51263' />
+ <nd ref='-51271' />
+ <nd ref='-51269' />
+ <nd ref='-51265' />
+ <nd ref='-51267' />
+ <nd ref='-42279' />
+ <nd ref='-42277' />
+ <nd ref='-51285' />
+ <nd ref='-42275' />
+ <nd ref='-51291' />
+ <nd ref='-51295' />
+ <nd ref='-51293' />
+ <nd ref='-51299' />
+ <nd ref='-51297' />
+ <nd ref='-51287' />
+ <nd ref='-51289' />
+ <nd ref='-42273' />
+ <nd ref='-51305' />
+ <nd ref='-51301' />
+ <nd ref='-51303' />
+ <nd ref='-42271' />
+ <nd ref='-51309' />
+ <nd ref='-51307' />
+ <nd ref='-41621' />
+ <nd ref='-41623' />
+ <nd ref='-51311' />
+ <nd ref='-51313' />
+ <nd ref='-41625' />
+ <nd ref='-51167' />
+ <nd ref='-42269' />
+ <nd ref='-42267' />
+ <nd ref='-51163' />
+ <nd ref='-51165' />
+ <nd ref='-41971' />
+ <nd ref='-51159' />
+ <nd ref='-51161' />
+ <nd ref='-51157' />
+ <nd ref='-39935' />
+ <nd ref='-51015' />
+ <nd ref='-51017' />
+ <nd ref='-51021' />
+ <nd ref='-51023' />
+ <nd ref='-51019' />
+ <nd ref='-51031' />
+ <nd ref='-51033' />
+ <nd ref='-51025' />
+ <nd ref='-51029' />
+ <nd ref='-51027' />
+ <nd ref='-39937' />
+ <nd ref='-51001' />
+ <nd ref='-51005' />
+ <nd ref='-51003' />
+ <nd ref='-50999' />
+ <nd ref='-51013' />
+ <nd ref='-51007' />
+ <nd ref='-51011' />
+ <nd ref='-51009' />
+ <nd ref='-41707' />
+ <nd ref='-50981' />
+ <nd ref='-50985' />
+ <nd ref='-50987' />
+ <nd ref='-50989' />
+ <nd ref='-50983' />
+ <nd ref='-50991' />
+ <nd ref='-50993' />
+ <nd ref='-50997' />
+ <nd ref='-50995' />
+ <nd ref='-41709' />
+ <nd ref='-50979' />
+ <nd ref='-50977' />
+ <nd ref='-50973' />
+ <nd ref='-50975' />
+ <nd ref='-50971' />
+ <nd ref='-50969' />
+ <nd ref='-41711' />
+ <nd ref='-50963' />
+ <nd ref='-50961' />
+ <nd ref='-50965' />
+ <nd ref='-50967' />
+ <nd ref='-40991' />
+ <nd ref='-50543' />
+ <nd ref='-41681' />
+ <nd ref='-50547' />
+ <nd ref='-41683' />
+ <nd ref='-50545' />
+ <nd ref='-40989' />
+ <nd ref='-50553' />
+ <nd ref='-50551' />
+ <nd ref='-50555' />
+ <nd ref='-50549' />
+ <nd ref='-41685' />
+ <nd ref='-50559' />
+ <nd ref='-50557' />
+ <nd ref='-41687' />
+ <nd ref='-50569' />
+ <nd ref='-50567' />
+ <nd ref='-50565' />
+ <nd ref='-50563' />
+ <nd ref='-50561' />
+ <nd ref='-40987' />
+ <nd ref='-50571' />
+ <nd ref='-41689' />
+ <nd ref='-41691' />
+ <nd ref='-42265' />
+ <nd ref='-50937' />
+ <nd ref='-50939' />
+ <nd ref='-50941' />
+ <nd ref='-50943' />
+ <nd ref='-50947' />
+ <nd ref='-50945' />
+ <nd ref='-50949' />
+ <nd ref='-50951' />
+ <nd ref='-50953' />
+ <nd ref='-50955' />
+ <nd ref='-50959' />
+ <nd ref='-50957' />
+ <nd ref='-42797' />
+ <nd ref='-42263' />
+ <nd ref='-41693' />
+ <nd ref='-42217' />
+ <nd ref='-37749' />
+ <nd ref='-31689' />
+ <nd ref='-31683' />
+ <nd ref='-31685' />
+ <nd ref='-31687' />
+ <nd ref='-31691' />
+ <nd ref='-31681' />
+ <nd ref='-31675' />
+ <nd ref='-31679' />
+ <nd ref='-31677' />
+ <nd ref='-31693' />
+ <nd ref='-31697' />
+ <nd ref='-31695' />
+ <nd ref='-31703' />
+ <nd ref='-31701' />
+ <nd ref='-31699' />
+ <nd ref='-31705' />
+ <nd ref='-31707' />
+ <nd ref='-47239' />
+ <nd ref='-39857' />
+ <nd ref='-47121' />
+ <nd ref='-47123' />
+ <nd ref='-47119' />
+ <nd ref='-47117' />
+ <nd ref='-47115' />
+ <nd ref='-47111' />
+ <nd ref='-47113' />
+ <nd ref='-47105' />
+ <nd ref='-47109' />
+ <nd ref='-47125' />
+ <nd ref='-47127' />
+ <nd ref='-47107' />
+ <nd ref='-47103' />
+ <nd ref='-47133' />
+ <nd ref='-47131' />
+ <nd ref='-47129' />
+ <nd ref='-47101' />
+ <nd ref='-47099' />
+ <nd ref='-47097' />
+ <nd ref='-47095' />
+ <nd ref='-42219' />
+ <nd ref='-36539' />
+ <nd ref='-36541' />
+ <nd ref='-36543' />
+ <nd ref='-36545' />
+ <nd ref='-36547' />
+ <nd ref='-36549' />
+ <nd ref='-36551' />
+ <nd ref='-36553' />
+ <nd ref='-36555' />
+ <nd ref='-36557' />
+ <nd ref='-36559' />
+ <nd ref='-36561' />
+ <nd ref='-36563' />
+ <nd ref='-36565' />
+ <nd ref='-36567' />
+ <nd ref='-36569' />
+ <nd ref='-36571' />
+ <nd ref='-36573' />
+ <nd ref='-36575' />
+ <nd ref='-36577' />
+ <nd ref='-36579' />
+ <nd ref='-36581' />
+ <nd ref='-36583' />
+ <nd ref='-36585' />
+ <nd ref='-36587' />
+ <nd ref='-36589' />
+ <nd ref='-36591' />
+ <nd ref='-36593' />
+ <nd ref='-36595' />
+ <nd ref='-36597' />
+ <nd ref='-36599' />
+ <nd ref='-36601' />
+ <nd ref='-36603' />
+ <nd ref='-36605' />
+ <nd ref='-42231' />
+ <nd ref='-36607' />
+ <nd ref='-36609' />
+ <nd ref='-36611' />
+ <nd ref='-42229' />
+ <nd ref='-36613' />
+ <nd ref='-42227' />
+ <nd ref='-42225' />
+ <nd ref='-42223' />
+ <nd ref='-42221' />
+ <nd ref='-42795' />
+ <nd ref='-36615' />
+ <nd ref='-57347' />
+ <nd ref='-36619' />
+ <nd ref='-37007' />
+ <nd ref='-37005' />
+ <nd ref='-37003' />
+ <nd ref='-37001' />
+ <nd ref='-39859' />
+ <nd ref='-36999' />
+ <nd ref='-46955' />
+ <nd ref='-46957' />
+ <nd ref='-46953' />
+ <nd ref='-46959' />
+ <nd ref='-46951' />
+ <nd ref='-46949' />
+ <nd ref='-46947' />
+ <nd ref='-46945' />
+ <nd ref='-46943' />
+ <nd ref='-46939' />
+ <nd ref='-46941' />
+ <nd ref='-46961' />
+ <nd ref='-46973' />
+ <nd ref='-46971' />
+ <nd ref='-46969' />
+ <nd ref='-46963' />
+ <nd ref='-46967' />
+ <nd ref='-46975' />
+ <nd ref='-46977' />
+ <nd ref='-46965' />
+ <nd ref='-46979' />
+ <nd ref='-46981' />
+ <nd ref='-46983' />
+ <nd ref='-46985' />
+ <nd ref='-46987' />
+ <nd ref='-46989' />
+ <nd ref='-36997' />
+ <nd ref='-46819' />
+ <nd ref='-46821' />
+ <nd ref='-46825' />
+ <nd ref='-46827' />
+ <nd ref='-46823' />
+ <nd ref='-46837' />
+ <nd ref='-46839' />
+ <nd ref='-46841' />
+ <nd ref='-46843' />
+ <nd ref='-46835' />
+ <nd ref='-46833' />
+ <nd ref='-46831' />
+ <nd ref='-46829' />
+ <nd ref='-46845' />
+ <nd ref='-46849' />
+ <nd ref='-46851' />
+ <nd ref='-46847' />
+ <nd ref='-46855' />
+ <nd ref='-46857' />
+ <nd ref='-46853' />
+ <nd ref='-46859' />
+ <nd ref='-46861' />
+ <nd ref='-46863' />
+ <nd ref='-46865' />
+ <nd ref='-39861' />
+ <nd ref='-46817' />
+ <nd ref='-46815' />
+ <nd ref='-46813' />
+ <nd ref='-46811' />
+ <nd ref='-46809' />
+ <nd ref='-46807' />
+ <nd ref='-46795' />
+ <nd ref='-46805' />
+ <nd ref='-46803' />
+ <nd ref='-46801' />
+ <nd ref='-46797' />
+ <nd ref='-46799' />
+ <nd ref='-37751' />
+ <nd ref='-49907' />
+ <nd ref='-49913' />
+ <nd ref='-49911' />
+ <nd ref='-49909' />
+ <nd ref='-41953' />
+ <nd ref='-49915' />
+ <nd ref='-49917' />
+ <nd ref='-37753' />
+ <nd ref='-49921' />
+ <nd ref='-49919' />
+ <nd ref='-49923' />
+ <nd ref='-49925' />
+ <nd ref='-41951' />
+ <nd ref='-49929' />
+ <nd ref='-49927' />
+ <nd ref='-41949' />
+ <nd ref='-37755' />
+ <nd ref='-49931' />
+ <nd ref='-37757' />
+ <nd ref='-37759' />
+ <nd ref='-37761' />
+ <nd ref='-49933' />
+ <nd ref='-41947' />
+ <nd ref='-49979' />
+ <nd ref='-49977' />
+ <nd ref='-41945' />
+ <nd ref='-49991' />
+ <nd ref='-49993' />
+ <nd ref='-49989' />
+ <nd ref='-49987' />
+ <nd ref='-49985' />
+ <nd ref='-49995' />
+ <nd ref='-49983' />
+ <nd ref='-49981' />
+ <nd ref='-41695' />
+ <nd ref='-50001' />
+ <nd ref='-50003' />
+ <nd ref='-49999' />
+ <nd ref='-49997' />
+ <nd ref='-41943' />
+ <nd ref='-50011' />
+ <nd ref='-50017' />
+ <nd ref='-50015' />
+ <nd ref='-50013' />
+ <nd ref='-50009' />
+ <nd ref='-50007' />
+ <nd ref='-50005' />
+ <nd ref='-41697' />
+ <nd ref='-50019' />
+ <nd ref='-41941' />
+ <nd ref='-50023' />
+ <nd ref='-50025' />
+ <nd ref='-50021' />
+ <nd ref='-41939' />
+ <nd ref='-50027' />
+ <nd ref='-41699' />
+ <nd ref='-50031' />
+ <nd ref='-50029' />
+ <nd ref='-41701' />
+ <nd ref='-50033' />
+ <nd ref='-50037' />
+ <nd ref='-50035' />
+ <nd ref='-41703' />
+ <nd ref='-41705' />
+ <nd ref='-39945' />
+ <nd ref='-50047' />
+ <nd ref='-50045' />
+ <nd ref='-50043' />
+ <nd ref='-50041' />
+ <nd ref='-50039' />
+ <nd ref='-41937' />
+ <nd ref='-50049' />
+ <nd ref='-50051' />
+ <nd ref='-39947' />
+ <nd ref='-50053' />
+ <nd ref='-39915' />
+ <nd ref='-49833' />
+ <nd ref='-49831' />
+ <nd ref='-39917' />
+ <nd ref='-49825' />
+ <nd ref='-49827' />
+ <nd ref='-49829' />
+ <nd ref='-49823' />
+ <nd ref='-49821' />
+ <nd ref='-39919' />
+ <nd ref='-49817' />
+ <nd ref='-49815' />
+ <nd ref='-49819' />
+ <nd ref='-49813' />
+ <nd ref='-49811' />
+ <nd ref='-49809' />
+ <nd ref='-39921' />
+ <nd ref='-49807' />
+ <nd ref='-49805' />
+ <nd ref='-49803' />
+ <nd ref='-49801' />
+ <nd ref='-49799' />
+ <nd ref='-37781' />
+ <nd ref='-37779' />
+ <nd ref='-37777' />
+ <nd ref='-49795' />
+ <nd ref='-49793' />
+ <nd ref='-49785' />
+ <nd ref='-49787' />
+ <nd ref='-49789' />
+ <nd ref='-49791' />
+ <nd ref='-37775' />
+ <nd ref='-49783' />
+ <nd ref='-37773' />
+ <nd ref='-49775' />
+ <nd ref='-49781' />
+ <nd ref='-49779' />
+ <nd ref='-49777' />
+ <nd ref='-49773' />
+ <nd ref='-49771' />
+ <nd ref='-49763' />
+ <nd ref='-49765' />
+ <nd ref='-49769' />
+ <nd ref='-49767' />
+ <nd ref='-49761' />
+ <nd ref='-49759' />
+ <nd ref='-49757' />
+ <nd ref='-37807' />
+ <nd ref='-49755' />
+ <nd ref='-49753' />
+ <nd ref='-49751' />
+ <nd ref='-49749' />
+ <nd ref='-49743' />
+ <nd ref='-49747' />
+ <nd ref='-49745' />
+ <nd ref='-49741' />
+ <nd ref='-37805' />
+ <nd ref='-37803' />
+ <nd ref='-49733' />
+ <nd ref='-49735' />
+ <nd ref='-49739' />
+ <nd ref='-49737' />
+ <nd ref='-49723' />
+ <nd ref='-49725' />
+ <nd ref='-49731' />
+ <nd ref='-49729' />
+ <nd ref='-49727' />
+ <nd ref='-37801' />
+ <nd ref='-49721' />
+ <nd ref='-49719' />
+ <nd ref='-37799' />
+ <nd ref='-49711' />
+ <nd ref='-49715' />
+ <nd ref='-49717' />
+ <nd ref='-49713' />
+ <nd ref='-37797' />
+ <nd ref='-49709' />
+ <nd ref='-49701' />
+ <nd ref='-49705' />
+ <nd ref='-49707' />
+ <nd ref='-49703' />
+ <nd ref='-49699' />
+ <nd ref='-37795' />
+ <nd ref='-37793' />
+ <nd ref='-37791' />
+ <nd ref='-39923' />
+ <nd ref='-39925' />
+ <nd ref='-49691' />
+ <nd ref='-49695' />
+ <nd ref='-49693' />
+ <nd ref='-49697' />
+ <nd ref='-49689' />
+ <nd ref='-49687' />
+ <nd ref='-37789' />
+ <nd ref='-36483' />
+ <nd ref='-36481' />
+ <nd ref='-41181' />
+ <nd ref='-36531' />
+ <nd ref='-57345' />
+ <nd ref='-36617' />
+ <nd ref='-36533' />
+ <nd ref='-36479' />
+ <nd ref='-36477' />
+ <nd ref='-36537' />
+ <nd ref='-36475' />
+ <nd ref='-42189' />
+ <nd ref='-36473' />
+ <nd ref='-36525' />
+ <nd ref='-36835' />
+ <nd ref='-36837' />
+ <nd ref='-36471' />
+ <nd ref='-40903' />
+ <nd ref='-36463' />
+ <nd ref='-53855' />
+ <nd ref='-39519' />
+ <nd ref='-36833' />
+ <nd ref='-39521' />
+ <nd ref='-53853' />
+ <nd ref='-53851' />
+ <nd ref='-36459' />
+ <nd ref='-36851' />
+ <nd ref='-36853' />
+ <nd ref='-42685' />
+ <nd ref='-42683' />
+ <nd ref='-42687' />
+ <nd ref='-39537' />
+ <nd ref='-39539' />
+ <nd ref='-39363' />
+ <nd ref='-42649' />
+ <nd ref='-39759' />
+ <nd ref='-42651' />
+ <nd ref='-39689' />
+ <nd ref='-42653' />
+ <nd ref='-42655' />
+ <nd ref='-42657' />
+ <nd ref='-39691' />
+ <nd ref='-53531' />
+ <nd ref='-57355' />
+ </way>
+ <way id='-58149'>
+ <nd ref='-42857' />
+ <nd ref='-57357' />
+ <nd ref='-57359' />
+ <nd ref='-57361' />
+ <nd ref='-57363' />
+ <nd ref='-42255' />
+ <nd ref='-42851' />
+ <nd ref='-42849' />
+ <nd ref='-42847' />
+ <nd ref='-42845' />
+ <nd ref='-42843' />
+ <nd ref='-42841' />
+ <nd ref='-42839' />
+ <nd ref='-42837' />
+ <nd ref='-42835' />
+ <nd ref='-42833' />
+ <nd ref='-42831' />
+ <nd ref='-42829' />
+ <nd ref='-42827' />
+ <nd ref='-42825' />
+ <nd ref='-42823' />
+ <nd ref='-42821' />
+ <nd ref='-42819' />
+ <nd ref='-42817' />
+ <nd ref='-42815' />
+ <nd ref='-42813' />
+ <nd ref='-42811' />
+ <nd ref='-42809' />
+ <nd ref='-42807' />
+ <nd ref='-42805' />
+ <nd ref='-42803' />
+ <nd ref='-42257' />
+ <nd ref='-42259' />
+ <nd ref='-42261' />
+ <nd ref='-42855' />
+ <nd ref='-57397' />
+ <nd ref='-57395' />
+ <nd ref='-57393' />
+ <nd ref='-57391' />
+ <nd ref='-57389' />
+ <nd ref='-57387' />
+ <nd ref='-57385' />
+ <nd ref='-57383' />
+ <nd ref='-57381' />
+ <nd ref='-57379' />
+ <nd ref='-57377' />
+ <nd ref='-57375' />
+ <nd ref='-57373' />
+ <nd ref='-57371' />
+ <nd ref='-57369' />
+ <nd ref='-57367' />
+ <nd ref='-57365' />
+ <nd ref='-42857' />
+ <tag k='ISO3166-2' v='UA-43' />
+ <tag k='name:en' v='Crimea' />
+ <tag k='note' v='Claimed by Ukraine' />
+ </way>
+ <way id='-58151'>
+ <nd ref='-42857' />
+ <nd ref='-57365' />
+ <nd ref='-57367' />
+ <nd ref='-57369' />
+ <nd ref='-57371' />
+ <nd ref='-57373' />
+ <nd ref='-57375' />
+ <nd ref='-57377' />
+ <nd ref='-57379' />
+ <nd ref='-57381' />
+ <nd ref='-57383' />
+ <nd ref='-57385' />
+ <nd ref='-57387' />
+ <nd ref='-57389' />
+ <nd ref='-57391' />
+ <nd ref='-57393' />
+ <nd ref='-57395' />
+ <nd ref='-57397' />
+ <nd ref='-42857' />
+ <tag k='ISO3166-2' v='UA-40' />
+ <tag k='name:en' v='Sevastopol' />
+ <tag k='note' v='Claimed by Ukraine' />
+ </way>
+ <way id='-58153'>
+ <nd ref='-36421' />
+ <nd ref='-36425' />
+ <nd ref='-53563' />
+ <nd ref='-53565' />
+ <nd ref='-36421' />
+ <tag k='ISO3166-2' v='NL-BQ1' />
+ <tag k='name:en' v='Bonaire' />
+ </way>
+ <way id='-58155'>
+ <nd ref='-36395' />
+ <nd ref='-39625' />
+ <nd ref='-57399' />
+ <nd ref='-57401' />
+ <nd ref='-36395' />
+ <tag k='ISO3166-2' v='NL-BQ2' />
+ <tag k='name:en' v='Saba' />
+ </way>
+ <way id='-58157'>
+ <nd ref='-57403' />
+ <nd ref='-42473' />
+ <nd ref='-53833' />
+ <nd ref='-53831' />
+ <nd ref='-57403' />
+ <tag k='ISO3166-2' v='NO-21' />
+ <tag k='name:en' v='Svalbard' />
+ </way>
+ <way id='-58159'>
+ <nd ref='-57405' />
+ <nd ref='-57407' />
+ <nd ref='-42561' />
+ <nd ref='-57405' />
+ <tag k='ISO3166-2' v='NO-22' />
+ <tag k='name:en' v='Jan Mayen' />
+ </way>
+ <way id='-58161'>
+ <nd ref='-41933' />
+ <nd ref='-41935' />
+ <nd ref='-42351' />
+ <nd ref='-36313' />
+ <nd ref='-40611' />
+ <nd ref='-40609' />
+ <nd ref='-40607' />
+ <nd ref='-40605' />
+ <nd ref='-40603' />
+ <nd ref='-40601' />
+ <nd ref='-39571' />
+ <nd ref='-34177' />
+ <nd ref='-34175' />
+ <nd ref='-34171' />
+ <nd ref='-34167' />
+ <nd ref='-34169' />
+ <nd ref='-34173' />
+ <nd ref='-39569' />
+ <nd ref='-39567' />
+ <nd ref='-41931' />
+ <nd ref='-36311' />
+ <nd ref='-39565' />
+ <nd ref='-39563' />
+ <nd ref='-34157' />
+ <nd ref='-34159' />
+ <nd ref='-34161' />
+ <nd ref='-34163' />
+ <nd ref='-34165' />
+ <nd ref='-39561' />
+ <nd ref='-39189' />
+ <nd ref='-41933' />
+ <tag k='ISO3166-1:alpha2' v='SO' />
+ <tag k='name:en' v='Somalia' />
+ </way>
+ <relation id='-58163'>
+ <member type='way' ref='-57479' role='outer' />
+ <member type='way' ref='-57481' role='outer' />
+ <member type='way' ref='-57483' role='inner' />
+ <tag k='ISO3166-1:alpha2' v='AE' />
+ <tag k='name:en' v='United Arab Emirates' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58165'>
+ <member type='way' ref='-57487' role='outer' />
+ <member type='way' ref='-57489' role='outer' />
+ <member type='way' ref='-57491' role='inner' />
+ <member type='way' ref='-57493' role='inner' />
+ <tag k='ISO3166-1:alpha2' v='AM' />
+ <tag k='name:en' v='Armenia' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58167'>
+ <member type='way' ref='-57497' role='outer' />
+ <member type='way' ref='-57493' role='outer' />
+ <member type='way' ref='-57491' role='outer' />
+ <member type='way' ref='-57499' role='outer' />
+ <member type='way' ref='-57487' role='inner' />
+ <tag k='ISO3166-1:alpha2' v='AZ' />
+ <tag k='name:en' v='Azerbaijan' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58169'>
+ <member type='way' ref='-57553' role='outer' />
+ <member type='way' ref='-57555' role='outer' />
+ <member type='way' ref='-57557' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='CY' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Cyprus' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58171'>
+ <member type='way' ref='-57567' role='outer' />
+ <member type='way' ref='-57837' role='outer' />
+ <member type='way' ref='-57867' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='DK' />
+ <tag k='maxspeed:motorway' v='130' />
+ <tag k='maxspeed:rural' v='90' />
+ <tag k='maxspeed:source' v='http://ec.europa.eu/transport/road_safety/going_abroad/denmark/speed_limits_en.htm' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Denmark' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58173'>
+ <member type='way' ref='-57579' role='outer' />
+ <member type='way' ref='-57463' role='outer' />
+ <member type='way' ref='-57975' role='outer' />
+ <member type='way' ref='-57977' role='outer' />
+ <member type='way' ref='-57607' role='inner' />
+ <member type='way' ref='-57979' role='outer' />
+ <member type='way' ref='-57981' role='outer' />
+ <member type='way' ref='-57983' role='outer' />
+ <member type='way' ref='-57973' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='ES' />
+ <tag k='maxspeed:motorway' v='120' />
+ <tag k='maxspeed:rural' v='90' />
+ <tag k='maxspeed:rural_shoulder' v='100' />
+ <tag k='maxspeed:source' v='http://ec.europa.eu/transport/road_safety/going_abroad/spain/speed_limits_en.htm' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Spain' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58175'>
+ <member type='way' ref='-57437' role='outer' />
+ <member type='way' ref='-57877' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='FJ' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Fiji' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58177'>
+ <member type='way' ref='-57595' role='outer' />
+ <member type='way' ref='-57587' role='outer' />
+ <member type='way' ref='-57589' role='outer' />
+ <member type='way' ref='-57591' role='outer' />
+ <member type='way' ref='-57593' role='outer' />
+ <member type='way' ref='-57963' role='outer' />
+ <member type='way' ref='-57961' role='outer' />
+ <member type='way' ref='-57579' role='inner' />
+ <member type='way' ref='-57859' role='outer' />
+ <member type='way' ref='-57871' role='outer' />
+ <member type='way' ref='-57457' role='outer' />
+ <member type='way' ref='-57445' role='outer' />
+ <member type='way' ref='-57443' role='outer' />
+ <member type='way' ref='-57949' role='outer' />
+ <member type='way' ref='-57857' role='outer' />
+ <member type='way' ref='-57965' role='outer' />
+ <member type='way' ref='-57967' role='outer' />
+ <member type='way' ref='-57969' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='FR' />
+ <tag k='maxspeed:motorway' v='130' />
+ <tag k='maxspeed:rural' v='90' />
+ <tag k='maxspeed:source' v='http://ec.europa.eu/transport/road_safety/going_abroad/france/speed_limits_en.htm' />
+ <tag k='maxspeed:trunk' v='110' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='France' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58179'>
+ <member type='way' ref='-57903' role='outer' />
+ <member type='way' ref='-57599' role='outer' />
+ <member type='way' ref='-57601' role='outer' />
+ <member type='way' ref='-57603' role='outer' />
+ <member type='way' ref='-57605' role='outer' />
+ <member type='way' ref='-57555' role='inner' />
+ <member type='way' ref='-57607' role='outer' />
+ <member type='way' ref='-57901' role='outer' />
+ <member type='way' ref='-57907' role='outer' />
+ <member type='way' ref='-57855' role='outer' />
+ <member type='way' ref='-57925' role='outer' />
+ <member type='way' ref='-57927' role='outer' />
+ <member type='way' ref='-57455' role='outer' />
+ <member type='way' ref='-57435' role='outer' />
+ <member type='way' ref='-57427' role='outer' />
+ <member type='way' ref='-57423' role='outer' />
+ <member type='way' ref='-57413' role='outer' />
+ <member type='way' ref='-57911' role='outer' />
+ <member type='way' ref='-57553' role='inner' />
+ <member type='way' ref='-57905' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='GB' />
+ <tag k='driving_side' v='left' />
+ <tag k='maxspeed:motorway' v='70 mph' />
+ <tag k='maxspeed:nsl_dual' v='70 mph' />
+ <tag k='maxspeed:nsl_single' v='60 mph' />
+ <tag k='maxspeed:source' v='http://ec.europa.eu/transport/road_safety/going_abroad/united_kingdom/speed_limits_en.htm' />
+ <tag k='maxspeed:source2' v='https://www.gov.uk/speed-limits' />
+ <tag k='maxspeed:urban' v='30 mph' />
+ <tag k='name:en' v='United Kingdom' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58181'>
+ <member type='way' ref='-57431' role='outer' />
+ <member type='way' ref='-57763' role='inner' />
+ <member type='way' ref='-57819' role='inner' />
+ <member type='way' ref='-57993' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='IT' />
+ <tag k='maxspeed:motorway' v='130' />
+ <tag k='maxspeed:rural' v='90' />
+ <tag k='maxspeed:source' v='http://ec.europa.eu/transport/road_safety/going_abroad/italy/speed_limits_en.htm' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Italy' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58183'>
+ <member type='way' ref='-57647' role='outer' />
+ <member type='way' ref='-57815' role='inner' />
+ <member type='way' ref='-57813' role='inner' />
+ <member type='way' ref='-57785' role='inner' />
+ <tag k='ISO3166-1:alpha2' v='KG' />
+ <tag k='name:en' v='Kyrgyz Republic' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58185'>
+ <member type='way' ref='-57447' role='outer' />
+ <member type='way' ref='-57879' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='KI' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Kiribati' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58187'>
+ <member type='way' ref='-57711' role='outer' />
+ <member type='way' ref='-57915' role='outer' />
+ <member type='way' ref='-57419' role='outer' />
+ <member type='way' ref='-57415' role='outer' />
+ <member type='way' ref='-57995' role='inner' />
+ <member type='way' ref='-57997' role='inner' />
+ <member type='way' ref='-58153' role='outer' />
+ <member type='way' ref='-58155' role='outer' />
+ <member type='way' ref='-58019' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='NL' />
+ <tag k='maxspeed:motorway' v='130' />
+ <tag k='maxspeed:rural' v='80' />
+ <tag k='maxspeed:source' v='http://ec.europa.eu/transport/road_safety/going_abroad/netherlands/speed_limits_en.htm' />
+ <tag k='maxspeed:trunk' v='100' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Netherlands' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58189'>
+ <member type='way' ref='-57713' role='outer' />
+ <member type='way' ref='-57845' role='outer' />
+ <member type='way' ref='-58159' role='outer' />
+ <member type='way' ref='-58157' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='NO' />
+ <tag k='maxspeed:motorway' v='100' />
+ <tag k='maxspeed:rural' v='80' />
+ <tag k='maxspeed:source' v='https://www.visitnorway.com/plan-your-trip/safety-first/on-the-roads/' />
+ <tag k='maxspeed:trunk' v='90' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Norway' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58191'>
+ <member type='way' ref='-57839' role='outer' />
+ <member type='way' ref='-57921' role='outer' />
+ <member type='way' ref='-57923' role='outer' />
+ <member type='way' ref='-57951' role='outer' />
+ <member type='way' ref='-57953' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='NZ' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='New Zealand' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58193'>
+ <member type='way' ref='-57719' role='outer' />
+ <member type='way' ref='-57483' role='outer' />
+ <member type='way' ref='-57479' role='inner' />
+ <member type='way' ref='-57721' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='OM' />
+ <tag k='name:en' v='Oman' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58195'>
+ <member type='way' ref='-57743' role='outer' />
+ <member type='way' ref='-57875' role='outer' />
+ <member type='way' ref='-57869' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='RU' />
+ <tag k='maxspeed:motorway' v='110' />
+ <tag k='maxspeed:rural' v='90' />
+ <tag k='maxspeed:urban' v='60' />
+ <tag k='name:en' v='Russia' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58197'>
+ <member type='way' ref='-57785' role='outer' />
+ <member type='way' ref='-57787' role='outer' />
+ <member type='way' ref='-57789' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='TJ' />
+ <tag k='name:en' v='Tajikistan' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58199'>
+ <member type='way' ref='-57835' role='outer' />
+ <member type='way' ref='-57833' role='outer' />
+ <member type='way' ref='-57843' role='outer' />
+ <member type='way' ref='-57851' role='outer' />
+ <member type='way' ref='-57945' role='outer' />
+ <member type='way' ref='-57451' role='outer' />
+ <member type='way' ref='-57449' role='outer' />
+ <member type='way' ref='-57887' role='outer' />
+ <member type='way' ref='-57929' role='outer' />
+ <member type='way' ref='-57809' role='outer' />
+ <member type='way' ref='-57811' role='outer' />
+ <member type='way' ref='-57935' role='outer' />
+ <member type='way' ref='-57937' role='outer' />
+ <member type='way' ref='-57939' role='outer' />
+ <member type='way' ref='-57941' role='outer' />
+ <member type='way' ref='-57943' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='US' />
+ <tag k='name:en' v='United States of America' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58201'>
+ <member type='way' ref='-57813' role='outer' />
+ <member type='way' ref='-57815' role='outer' />
+ <member type='way' ref='-57817' role='outer' />
+ <member type='way' ref='-57787' role='inner' />
+ <tag k='ISO3166-1:alpha2' v='UZ' />
+ <tag k='name:en' v='Uzbekistan' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58203'>
+ <member type='way' ref='-57827' role='outer' />
+ <member type='way' ref='-57671' role='inner' />
+ <tag k='ISO3166-1:alpha2' v='ZA' />
+ <tag k='driving_side' v='left' />
+ <tag k='maxspeed:motorway' v='120' />
+ <tag k='maxspeed:rural' v='100' />
+ <tag k='maxspeed:source' v='http://www.southafrica.info/travel/advice/driving.htm' />
+ <tag k='maxspeed:urban' v='60' />
+ <tag k='name:en' v='South Africa' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58205'>
+ <member type='way' ref='-58147' role='outer' />
+ <member type='way' ref='-57989' role='outer' />
+ <member type='way' ref='-57589' role='outer' />
+ <member type='way' ref='-57591' role='outer' />
+ <member type='way' ref='-57593' role='outer' />
+ <member type='way' ref='-57961' role='outer' />
+ <member type='way' ref='-57949' role='outer' />
+ <member type='way' ref='-57859' role='outer' />
+ <member type='way' ref='-57993' role='outer' />
+ <member type='way' ref='-57557' role='outer' />
+ <member type='way' ref='-57555' role='outer' />
+ <member type='way' ref='-57553' role='outer' />
+ <member type='way' ref='-57975' role='outer' />
+ <member type='way' ref='-57977' role='outer' />
+ <member type='way' ref='-57763' role='inner' />
+ <member type='way' ref='-57819' role='inner' />
+ <member type='way' ref='-57991' role='inner' />
+ <member type='way' ref='-57477' role='inner' />
+ <member type='way' ref='-57743' role='inner' />
+ <member type='way' ref='-57681' role='inner' />
+ <member type='way' ref='-57669' role='inner' />
+ <member type='way' ref='-57907' role='inner' />
+ <tag k='ISO3166-1:alpha2' v='EU' />
+ <tag k='name:en' v='European Union' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58207'>
+ <member type='way' ref='-57811' role='outer' />
+ <member type='way' ref='-57809' role='outer' />
+ <member type='way' ref='-57935' role='outer' />
+ <member type='way' ref='-57937' role='outer' />
+ <member type='way' ref='-57939' role='outer' />
+ <member type='way' ref='-57941' role='outer' />
+ <member type='way' ref='-57943' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='UM' />
+ <tag k='ISO3166-2' v='US-UM' />
+ <tag k='name:en' v='United States Minor Outlying Islands' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58209'>
+ <member type='way' ref='-57959' role='outer' />
+ <member type='way' ref='-57957' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='PS' />
+ <tag k='name:en' v='Palestine' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58211'>
+ <member type='way' ref='-57857' role='outer' />
+ <member type='way' ref='-57965' role='outer' />
+ <member type='way' ref='-57967' role='outer' />
+ <member type='way' ref='-57969' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='TF' />
+ <tag k='ISO3166-2' v='FR-TF' />
+ <tag k='name:en' v='French Southern and Antarctic Lands' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58213'>
+ <member type='way' ref='-57977' role='outer' />
+ <member type='way' ref='-57975' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='EA' />
+ <tag k='name:en' v='Ceuta, Melilla' />
+ <tag k='note' v='officially in ES but EA also exists' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58215'>
+ <member type='way' ref='-57679' role='outer' />
+ <member type='way' ref='-57975' role='inner' />
+ <member type='way' ref='-57983' role='inner' />
+ <member type='way' ref='-57979' role='inner' />
+ <member type='way' ref='-57981' role='inner' />
+ <member type='way' ref='-57977' role='inner' />
+ <tag k='ISO3166-1:alpha2' v='MA' />
+ <tag k='name:en' v='Morocco' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58217'>
+ <member type='way' ref='-58145' role='outer' />
+ <member type='way' ref='-57955' role='outer' />
+ <member type='way' ref='-57931' role='outer' />
+ <member type='way' ref='-57919' role='outer' />
+ <member type='way' ref='-57917' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='AU' />
+ <tag k='driving_side' v='left' />
+ <tag k='name:en' v='Australia' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58219'>
+ <member type='way' ref='-57991' role='outer' />
+ <member type='way' ref='-57989' role='inner' />
+ <member type='way' ref='-57993' role='inner' />
+ <tag k='ISO3166-1:alpha2' v='CH' />
+ <tag k='maxspeed:living_street' v='20' />
+ <tag k='maxspeed:motorway' v='120' />
+ <tag k='maxspeed:rural' v='80' />
+ <tag k='maxspeed:source' v='https://www.ch.ch/en/driving-over-speed-limit' />
+ <tag k='maxspeed:trunk' v='100' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Switzerland' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58221'>
+ <member type='way' ref='-57561' role='outer' />
+ <member type='way' ref='-57989' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='DE' />
+ <tag k='maxspeed:rural' v='100' />
+ <tag k='maxspeed:source' v='http://ec.europa.eu/transport/road_safety/going_abroad/germany/speed_limits_en.htm' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Germany' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58223'>
+ <member type='way' ref='-57503' role='outer' />
+ <member type='way' ref='-57995' role='outer' />
+ <member type='way' ref='-57997' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='BE' />
+ <tag k='maxspeed:living_street' v='20' />
+ <tag k='maxspeed:motorway' v='120' />
+ <tag k='maxspeed:rural' v='90' />
+ <tag k='maxspeed:source' v='http://ec.europa.eu/transport/road_safety/going_abroad/belgium/speed_limits_en.htm' />
+ <tag k='maxspeed:source2' v='http://www.code-de-la-route.be/textes-legaux/sections/ar/code-de-la-route/170-art11-v15-170' />
+ <tag k='maxspeed:source3' v='http://www.code-de-la-route.be/textes-legaux/sections/ar/code-de-la-route/182-art22bis' />
+ <tag k='maxspeed:urban' v='50' />
+ <tag k='name:en' v='Belgium' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58225'>
+ <member type='way' ref='-58013' role='outer' />
+ <member type='way' ref='-58015' role='inner' />
+ <member type='way' ref='-58017' role='inner' />
+ <tag k='ISO3166-2' v='AU-NSW' />
+ <tag k='name:en' v='New South Wales' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58227'>
+ <member type='way' ref='-58153' role='outer' />
+ <member type='way' ref='-58155' role='outer' />
+ <member type='way' ref='-58019' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='BQ' />
+ <tag k='name:en' v='Caribbean Netherlands' />
+ <tag k='note' v='Bonaire, Sint Eustatius and Saba' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58229'>
+ <member type='way' ref='-58159' role='outer' />
+ <member type='way' ref='-58157' role='outer' />
+ <tag k='ISO3166-1:alpha2' v='SJ' />
+ <tag k='name:en' v='Svalbard and Jan Mayen' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+ <relation id='-58231'>
+ <member type='way' ref='-57721' role='outer' />
+ <member type='way' ref='-57483' role='outer' />
+ <member type='way' ref='-57479' role='inner' />
+ <tag k='ISO3166-2' v='OM-MU' />
+ <tag k='name:en' v='Musandam' />
+ <tag k='type' v='multipolygon' />
+ </relation>
+</osm>
diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index 912e96e..f8feaba 100644
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -331,7 +331,7 @@
</optional>
</chunk>
<chunk id="waterway">
- <reference ref="name_layer" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<check key="intermittent" text="Intermittent" disable_off="true" />
<check key="seasonal" text="Seasonal" disable_off="true" />
<check key="tidal" text="In the tidal range" disable_off="true" />
@@ -1004,7 +1004,9 @@
<combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
<combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
<combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
+ <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" />
</optional>
+ <preset_link preset_name="Road Restrictions" />
</item> <!-- Track -->
<item name="Path" icon="presets/transport/way/path.svg" type="way,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
@@ -1998,6 +2000,7 @@
<space />
<key key="waterway" value="drain" />
<optional>
+ <text key="name" text="Name" />
<reference ref="waterway" />
</optional>
</item> <!-- Drain -->
@@ -2012,6 +2015,7 @@
<space />
<key key="waterway" value="ditch" />
<optional>
+ <text key="name" text="Name" />
<reference ref="waterway" />
</optional>
</item> <!-- Ditch -->
@@ -2029,6 +2033,7 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=stream" />
<space />
<key key="waterway" value="stream" />
+ <text key="name" text="Name" />
<optional>
<reference ref="waterway_wikipedia" />
</optional>
@@ -2048,8 +2053,10 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=river" />
<space />
<key key="waterway" value="river" />
+ <text key="name" text="Name" />
<optional>
<reference ref="waterway_wikipedia" />
+ <check key="lock" text="Lock" disable_off="true" />
</optional>
<reference ref="water_access" />
</item> <!-- River -->
@@ -2064,11 +2071,13 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=canal" />
<space />
<key key="waterway" value="canal" />
+ <text key="name" text="Name" />
<optional>
- <reference ref="name_layer" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<combo key="tunnel" text="Tunnel" values="culvert,yes" />
<text key="width" text="Width (meters)" />
<text key="wikipedia" text="Wikipedia" />
+ <check key="lock" text="Lock" disable_off="true" />
</optional>
<reference ref="water_access" />
</item> <!-- Canal -->
@@ -2400,7 +2409,7 @@
<combo key="mooring" text="Mooring" values="yes,no,private,commercial" />
<check key="floating" text="Floating" />
</item> <!-- Pier -->
- <item name="Lock Gate" icon="presets/nautical/lock_gate.svg" type="node" preset_name_label="true">
+ <item name="Lock Gate" icon="presets/nautical/lock_gate.svg" type="node,way" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=lock_gate"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=lock_gate"
@@ -3627,6 +3636,19 @@
<reference ref="link_contact_address_payment" />
<preset_link preset_name="Building" />
</item> <!-- Guest House/Bed & Breakfast -->
+ <item name="Apartment" icon="presets/accommodation/apartment.svg" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=apartment" />
+ <space />
+ <key key="tourism" value="apartment" />
+ <reference ref="name_operator" />
+ <combo key="number_of_apartments" text="Number of apartments" values="1,2,3,4,5,6,7,8,9,10" />
+ <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+ <reference ref="wheelchair" />
+ <space />
+ <reference ref="internet_smoking" />
+ <space />
+ <reference ref="link_contact_address_payment" />
+ </item> <!-- Apartment -->
<item name="Chalet" icon="presets/accommodation/chalet.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=chalet"
@@ -3776,6 +3798,7 @@
<check key="microbrewery" text="Microbrewery" />
<check key="outdoor_seating" text="Outdoor seating" />
<combo key="takeaway" text="Takeaway" values="yes,no,only" />
+ <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" />
<reference ref="oh_wheelchair" />
<combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
<space />
@@ -3797,6 +3820,7 @@
<reference ref="cuisine" />
<check key="outdoor_seating" text="Outdoor seating" />
<combo key="takeaway" text="Takeaway" values="yes,no,only" />
+ <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" />
<reference ref="oh_wheelchair" />
<space />
<reference ref="internet_smoking" />
@@ -3814,7 +3838,6 @@
<key key="amenity" value="food_court" />
<reference ref="name_operator" />
<check key="outdoor_seating" text="Outdoor seating" />
- <combo key="takeaway" text="Takeaway" values="yes,no,only" />
<reference ref="oh_wheelchair" />
<space />
<reference ref="internet_smoking" />
@@ -3839,6 +3862,7 @@
<combo key="cuisine" text="Cuisine" values="ice_cream" />
<check key="outdoor_seating" text="Outdoor seating" />
<combo key="takeaway" text="Takeaway" values="yes,no,only" />
+ <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" />
<reference ref="oh_wheelchair" />
<space />
<reference ref="internet_smoking" />
@@ -3852,6 +3876,7 @@
<reference ref="name_operator" />
<check key="outdoor_seating" text="Outdoor seating" />
<combo key="takeaway" text="Takeaway" values="yes,no,only" />
+ <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" />
<reference ref="oh_wheelchair" />
<space />
<reference ref="internet_smoking" />
@@ -3872,6 +3897,7 @@
<check key="microbrewery" text="Microbrewery" />
<check key="outdoor_seating" text="Outdoor seating" />
<combo key="takeaway" text="Takeaway" values="yes,no,only" />
+ <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" />
<reference ref="oh_wheelchair" />
<space />
<reference ref="internet_smoking" />
@@ -5400,10 +5426,10 @@
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=hunting_stand" />
<space />
<key key="amenity" value="hunting_stand" />
- <combo key="height" text="Height" values="low,half,full,5,10,15,20" values_context="height" />
+ <text key="height" text="Height (meters)" />
<check key="shelter" text="Shelter" />
<check key="hide" text="Hide" text_context="hunting stand" />
- <check key="lock" text="Lock" />
+ <check key="lockable" text="Lockable" />
</item> <!-- Hunting Stand -->
<separator/>
<item name="Drinking Water" icon="presets/food/drinking_water.svg" type="node" preset_name_label="true">
@@ -5434,6 +5460,15 @@
<text key="description" text="Description" />
</optional>
</item> <!-- Water Point -->
+ <item name="Animal watering place" icon="presets/misc/watering_place.svg" type="node,closedway" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=watering_place" />
+ <space />
+ <key key="amenity" value="watering_place" />
+ <optional>
+ <text key="name" text="Name" />
+ <text key="description" text="Description" />
+ </optional>
+ </item> <!-- Animal watering place -->
<item name="Compressed Air" icon="presets/vehicle/compressed_air.svg" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=compressed_air"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=compressed_air"
@@ -6109,7 +6144,7 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:building" />
<space />
- <combo key="building" text="Building" values="yes,residential,apartments,house,hotel,hut,dormitory,terrace,detached,farm,roof" default="residential" match="keyvalue!" values_context="building" values_searchable="true" />
+ <combo key="building" text="Building" values="yes,residential,apartments,house,hotel,hut,bungalow,dormitory,terrace,detached,farm,roof" default="residential" match="keyvalue!" values_context="building" values_searchable="true" />
<optional>
<text key="name" text="Name" />
<combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
@@ -7298,6 +7333,15 @@
<reference ref="name_operator_oh_wheelchair" />
<reference ref="link_contact_address_payment" />
</item> <!-- Seafood -->
+ <item name="Dairy" icon="presets/shop/groceries/dairy.svg" type="node,closedway,multipolygon" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dairy"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=dairy"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=dairy" />
+ <space />
+ <key key="shop" value="dairy" />
+ <reference ref="name_operator_oh_wheelchair" />
+ <reference ref="link_contact_address_payment" />
+ </item> <!-- Dairy -->
<item name="Deli (Fine Food)" icon="presets/shop/groceries/deli.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=deli"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=deli"
diff --git a/data/left-right-hand-traffic.osm b/data/left-right-hand-traffic.osm
deleted file mode 100644
index 1e24fa9..0000000
--- a/data/left-right-hand-traffic.osm
+++ /dev/null
@@ -1,1090 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Polygons enclosing areas of the earth with left-hand traffic. -->
-<!-- License: CC0 -->
-<osm version='0.6' upload='false' generator='JOSM'>
-<node id='-1056' lat='-21.1350' lon='179.9793'/>
-<node id='-1054' lat='-21.1278' lon='174.3219'/>
-<node id='-1052' lat='-4.3732' lon='172.6749'/>
-<node id='-1050' lat='-11.1030' lon='-170.7261'/>
-<node id='-1048' lat='-4.7709' lon='179.9855'/>
-<node id='-1046' lat='-14.6388' lon='-176.2245'/>
-<node id='-1044' lat='-16.4592' lon='-171.5003'/>
-<node id='-1042' lat='-22.6869' lon='-171.8080'/>
-<node id='-1040' lat='-25.2267' lon='-179.9598'/>
-<node id='-1038' lat='7.6617' lon='-151.7930'/>
-<node id='-1036' lat='-6.8416' lon='-152.9117'/>
-<node id='-1034' lat='-5.5442' lon='-177.7709'/>
-<node id='-1032' lat='7.6617' lon='-164.7820'/>
-<node id='-1030' lat='-15.3637' lon='-179.9892'/>
-<node id='-1028' lat='-25.7854' lon='-165.0388'/>
-<node id='-1026' lat='-24.4325' lon='-155.8981'/>
-<node id='-1024' lat='-8.2173' lon='-154.8434'/>
-<node id='-1022' lat='-8.1303' lon='-167.4997'/>
-<node id='-1020' lat='-53.4474' lon='-62.7087'/>
-<node id='-1018' lat='-53.4526' lon='-56.5408'/>
-<node id='-1016' lat='-50.4271' lon='-56.5339'/>
-<node id='-1014' lat='-50.4216' lon='-62.7018'/>
-<node id='-1012' lat='5.8619' lon='-53.9640'/>
-<node id='-1010' lat='5.5380' lon='-54.0154'/>
-<node id='-1008' lat='14.2862' lon='-57.8882'/>
-<node id='-1006' lat='9.8501' lon='-61.0137'/>
-<node id='-1004' lat='10.0286' lon='-62.0794'/>
-<node id='-1002' lat='10.9307' lon='-61.6948'/>
-<node id='-1000' lat='14.2817' lon='-61.5405'/>
-<node id='-998' lat='20.2924' lon='-79.3347'/>
-<node id='-996' lat='18.8283' lon='-79.2592'/>
-<node id='-994' lat='18.7022' lon='-82.0011'/>
-<node id='-992' lat='20.1674' lon='-82.0766'/>
-<node id='-990' lat='19.0059' lon='-75.6368'/>
-<node id='-988' lat='17.2887' lon='-75.6409'/>
-<node id='-986' lat='17.2953' lon='-78.7446'/>
-<node id='-984' lat='19.0124' lon='-78.7406'/>
-<node id='-982' lat='11.8840' lon='-62.2923'/>
-<node id='-980' lat='15.1710' lon='-60.6717'/>
-<node id='-978' lat='14.8512' lon='-61.8478'/>
-<node id='-976' lat='15.5239' lon='-62.0440'/>
-<node id='-974' lat='15.8427' lon='-60.8679'/>
-<node id='-972' lat='18.8180' lon='-64.0719'/>
-<node id='-970' lat='18.8440' lon='-64.5553'/>
-<node id='-968' lat='32.9498' lon='-64.1204'/>
-<node id='-966' lat='31.7610' lon='-63.9018'/>
-<node id='-964' lat='31.5824' lon='-65.2519'/>
-<node id='-962' lat='32.7736' lon='-65.4706'/>
-<node id='-960' lat='20.5929' lon='-73.7628'/>
-<node id='-958' lat='20.9851' lon='-70.1038'/>
-<node id='-956' lat='28.1824' lon='-77.7904'/>
-<node id='-954' lat='24.0705' lon='-79.8339'/>
-<node id='-952' lat='27.6582' lon='-79.4494'/>
-<node id='-950' lat='16.4284' lon='-62.2680'/>
-<node id='-948' lat='16.9099' lon='-61.2820'/>
-<node id='-946' lat='18.4094' lon='-61.3397'/>
-<node id='-944' lat='17.6088' lon='-62.7939'/>
-<node id='-942' lat='17.1085' lon='-63.1752'/>
-<node id='-940' lat='18.3935' lon='-63.4918'/>
-<node id='-938' lat='18.5993' lon='-62.8765'/>
-<node id='-936' lat='18.2279' lon='-62.6582'/>
-<node id='-934' lat='18.0583' lon='-63.4204'/>
-<node id='-932' lat='18.4496' lon='-65.1410'/>
-<node id='-930' lat='17.4911' lon='-65.2325'/>
-<node id='-928' lat='17.5697' lon='-64.4113'/>
-<node id='-926' lat='22.5299' lon='114.0785'/>
-<node id='-924' lat='22.5192' lon='114.0738'/>
-<node id='-922' lat='22.5166' lon='114.0640'/>
-<node id='-920' lat='22.5122' lon='114.0584'/>
-<node id='-918' lat='22.5062' lon='114.0576'/>
-<node id='-916' lat='22.5020' lon='114.0528'/>
-<node id='-914' lat='22.5101' lon='113.9946'/>
-<node id='-912' lat='22.4225' lon='113.8655'/>
-<node id='-910' lat='22.2103' lon='113.7996'/>
-<node id='-908' lat='22.1391' lon='113.8930'/>
-<node id='-906' lat='22.1506' lon='114.4931'/>
-<node id='-904' lat='22.5137' lon='114.4648'/>
-<node id='-902' lat='22.5593' lon='114.4366'/>
-<node id='-900' lat='22.5655' lon='114.3633'/>
-<node id='-898' lat='7.7227' lon='103.1838'/>
-<node id='-896' lat='11.3085' lon='102.5287'/>
-<node id='-894' lat='-25.2529' lon='164.3942'/>
-<node id='-892' lat='-16.8133' lon='161.4059'/>
-<node id='-890' lat='0.6350' lon='168.6914'/>
-<node id='-888' lat='0.8540' lon='152.0786'/>
-<node id='-886' lat='1.6887' lon='131.6331'/>
-<node id='-884' lat='15.4135' lon='141.8740'/>
-<node id='-882' lat='43.1067' lon='146.1158'/>
-<node id='-880' lat='43.4263' lon='145.7856'/>
-<node id='-878' lat='43.7396' lon='145.2626'/>
-<node id='-876' lat='44.7392' lon='145.7351'/>
-<node id='-874' lat='45.4912' lon='143.0105'/>
-<node id='-872' lat='45.8290' lon='140.7583'/>
-<node id='-870' lat='41.8165' lon='133.9186'/>
-<node id='-868' lat='34.2106' lon='129.7152'/>
-<node id='-866' lat='33.5662' lon='128.4622'/>
-<node id='-864' lat='27.9431' lon='123.1009'/>
-<node id='-862' lat='23.5699' lon='122.5282'/>
-<node id='-860' lat='21.5456' lon='127.3298'/>
-<node id='-858' lat='6.7814' lon='127.4068'/>
-<node id='-856' lat='5.1096' lon='125.8797'/>
-<node id='-854' lat='3.9227' lon='119.9233'/>
-<node id='-852' lat='4.4322' lon='119.0335'/>
-<node id='-850' lat='5.4228' lon='119.4180'/>
-<node id='-848' lat='7.1622' lon='117.9410'/>
-<node id='-846' lat='7.6257' lon='117.1499'/>
-<node id='-844' lat='21.0353' lon='92.2534'/>
-<node id='-842' lat='20.9653' lon='92.2713'/>
-<node id='-840' lat='20.7963' lon='92.3488'/>
-<node id='-838' lat='20.6492' lon='92.3740'/>
-<node id='-836' lat='16.3003' lon='93.3251'/>
-<node id='-834' lat='9.5597' lon='97.5910'/>
-<node id='-832' lat='9.5597' lon='98.2172'/>
-<node id='-830' lat='9.9054' lon='98.3417'/>
-<node id='-828' lat='9.9212' lon='98.5074'/>
-<node id='-826' lat='9.9290' lon='98.5500'/>
-<node id='-824' lat='10.1517' lon='98.6675'/>
-<node id='-822' lat='10.1651' lon='98.6685'/>
-<node id='-820' lat='10.2035' lon='98.6937'/>
-<node id='-818' lat='10.2797' lon='98.7243'/>
-<node id='-816' lat='-30.1837' lon='179.9610'/>
-<node id='-814' lat='-58.7459' lon='179.9651'/>
-<node id='-812' lat='-56.8495' lon='129.2392'/>
-<node id='-810' lat='-11.5068' lon='69.4680'/>
-<node id='-808' lat='-17.6084' lon='11.2730'/>
-<node id='-806' lat='-35.7245' lon='15.6990'/>
-<node id='-804' lat='-36.4348' lon='27.0369'/>
-<node id='-802' lat='-18.1618' lon='41.4510'/>
-<node id='-800' lat='-23.0381' lon='66.3988'/>
-<node id='-798' lat='-22.4650' lon='52.4155'/>
-<node id='-796' lat='-16.7898' lon='55.6472'/>
-<node id='-794' lat='-8.5735' lon='44.3857'/>
-<node id='-792' lat='-0.9925' lon='56.1317'/>
-<node id='-790' lat='-5.7372' lon='60.4199'/>
-<node id='-788' lat='-11.6627' lon='54.2051'/>
-<node id='-786' lat='-10.7178' lon='45.5665'/>
-<node id='-784' lat='34.2373' lon='31.7327'/>
-<node id='-782' lat='34.2950' lon='35.0313'/>
-<node id='-780' lat='35.8046' lon='34.9923'/>
-<node id='-778' lat='35.7480' lon='31.6937'/>
-<node id='-776' lat='36.3722' lon='15.2442'/>
-<node id='-774' lat='35.4444' lon='15.2358'/>
-<node id='-772' lat='35.4534' lon='13.7284'/>
-<node id='-770' lat='36.3811' lon='13.7367'/>
-<node id='-768' lat='49.9978' lon='0.1203'/>
-<node id='-766' lat='51.7136' lon='2.3626'/>
-<node id='-764' lat='63.1290' lon='2.4035'/>
-<node id='-762' lat='57.6493' lon='-16.5155'/>
-<node id='-760' lat='49.4527' lon='-19.3755'/>
-<node id='-758' lat='49.1018' lon='-1.9463'/>
-<node id='-756' lat='49.9266' lon='-2.0292'/>
-<node id='-754' lat='22.2160' lon='113.6160'/>
-<node id='-752' lat='22.1200' lon='113.6329'/>
-<node id='-750' lat='11.6458' lon='102.9135'/>
-<node id='-748' lat='21.0611' lon='92.2651'/>
-<node id='-746' lat='5.3483' lon='-54.1709'/>
-<node id='-744' lat='10.3505' lon='98.7474'/>
-<node id='-742' lat='8.5580' lon='-60.0209'/>
-<node id='-740' lat='25.2020' lon='61.5882'/>
-<node id='-738' lat='-1.6962' lon='41.5351'/>
-<node id='-736' lat='-17.2526' lon='11.7661'/>
-<node id='-734' lat='22.5450' lon='114.2298'/>
-<node id='-732' lat='22.5293' lon='114.0823'/>
-<node id='-730' lat='-1.5808' lon='41.5337'/>
-<node id='-728' lat='-0.8246' lon='40.9988'/>
-<node id='-726' lat='2.8232' lon='40.9836'/>
-<node id='-724' lat='3.2077' lon='41.3547'/>
-<node id='-722' lat='3.9783' lon='41.9014'/>
-<node id='-720' lat='3.9502' lon='41.8195'/>
-<node id='-718' lat='3.9586' lon='41.1414'/>
-<node id='-716' lat='4.2799' lon='40.7775'/>
-<node id='-714' lat='3.4693' lon='39.2733'/>
-<node id='-712' lat='3.7134' lon='37.9740'/>
-<node id='-710' lat='4.4292' lon='36.8949'/>
-<node id='-708' lat='4.4728' lon='35.9902'/>
-<node id='-706' lat='4.9824' lon='35.2778'/>
-<node id='-704' lat='4.2405' lon='33.9942'/>
-<node id='-702' lat='2.4853' lon='34.9065'/>
-<node id='-700' lat='1.7558' lon='35.0014'/>
-<node id='-698' lat='1.3851' lon='34.7990'/>
-<node id='-696' lat='1.2321' lon='34.7990'/>
-<node id='-694' lat='0.8701' lon='34.4415'/>
-<node id='-692' lat='0.8025' lon='34.4021'/>
-<node id='-690' lat='0.7608' lon='34.3151'/>
-<node id='-688' lat='0.6406' lon='34.2761'/>
-<node id='-686' lat='0.5808' lon='34.1351'/>
-<node id='-684' lat='0.4653' lon='34.1000'/>
-<node id='-682' lat='0.3073' lon='34.0527'/>
-<node id='-680' lat='0.0663' lon='33.8963'/>
-<node id='-678' lat='-1.0100' lon='31.7680'/>
-<node id='-676' lat='-0.9982' lon='30.8010'/>
-<node id='-674' lat='-1.0348' lon='30.6750'/>
-<node id='-672' lat='-1.0632' lon='30.4748'/>
-<node id='-670' lat='-1.1549' lon='30.4682'/>
-<node id='-668' lat='-1.3423' lon='30.5786'/>
-<node id='-666' lat='-1.6347' lon='30.8378'/>
-<node id='-664' lat='-2.0213' lon='30.8247'/>
-<node id='-662' lat='-2.0791' lon='30.8968'/>
-<node id='-660' lat='-2.3761' lon='30.7810'/>
-<node id='-658' lat='-2.4219' lon='30.5363'/>
-<node id='-656' lat='-2.6632' lon='30.4237'/>
-<node id='-654' lat='-2.9426' lon='30.4882'/>
-<node id='-652' lat='-2.9949' lon='30.8357'/>
-<node id='-650' lat='-3.2688' lon='30.8094'/>
-<node id='-648' lat='-3.5773' lon='30.4267'/>
-<node id='-646' lat='-4.1243' lon='30.1457'/>
-<node id='-644' lat='-4.3062' lon='29.9819'/>
-<node id='-642' lat='-4.4512' lon='29.6512'/>
-<node id='-640' lat='-5.3563' lon='29.4102'/>
-<node id='-638' lat='-8.2100' lon='30.6155'/>
-<node id='-636' lat='-8.4547' lon='28.8848'/>
-<node id='-634' lat='-9.4316' lon='28.5325'/>
-<node id='-632' lat='-10.6835' lon='28.6809'/>
-<node id='-630' lat='-11.7081' lon='28.3625'/>
-<node id='-628' lat='-12.4456' lon='29.3308'/>
-<node id='-626' lat='-12.1890' lon='29.7789'/>
-<node id='-624' lat='-13.4455' lon='29.7944'/>
-<node id='-622' lat='-13.2802' lon='28.9167'/>
-<node id='-620' lat='-12.4184' lon='28.3604'/>
-<node id='-618' lat='-12.2554' lon='27.6434'/>
-<node id='-616' lat='-11.5750' lon='27.1644'/>
-<node id='-614' lat='-11.9200' lon='26.0240'/>
-<node id='-612' lat='-11.2085' lon='25.3163'/>
-<node id='-610' lat='-11.4357' lon='24.4263'/>
-<node id='-608' lat='-10.8475' lon='24.0431'/>
-<node id='-606' lat='-11.0841' lon='23.9689'/>
-<node id='-604' lat='-12.9732' lon='24.0153'/>
-<node id='-602' lat='-13.0033' lon='21.9663'/>
-<node id='-600' lat='-16.1879' lon='21.9972'/>
-<node id='-598' lat='-17.6367' lon='23.4095'/>
-<node id='-596' lat='-18.0221' lon='21.3729'/>
-<node id='-594' lat='-17.8486' lon='19.6855'/>
-<node id='-592' lat='-17.4157' lon='18.4308'/>
-<node id='-590' lat='-17.3929' lon='14.2966'/>
-<node id='-588' lat='-17.4126' lon='13.9541'/>
-<node id='-586' lat='-16.9993' lon='13.4010'/>
-<node id='-584' lat='-16.9520' lon='13.1166'/>
-<node id='-582' lat='-17.2356' lon='12.5542'/>
-<node id='-580' lat='-17.1382' lon='12.0813'/>
-<node id='-578' lat='8.2996' lon='-59.8093'/>
-<node id='-576' lat='8.2293' lon='-59.8372'/>
-<node id='-574' lat='8.2120' lon='-59.9410'/>
-<node id='-572' lat='8.0286' lon='-60.0404'/>
-<node id='-570' lat='7.8306' lon='-60.3650'/>
-<node id='-568' lat='7.4361' lon='-60.6528'/>
-<node id='-566' lat='6.7246' lon='-60.9587'/>
-<node id='-564' lat='5.9467' lon='-61.3496'/>
-<node id='-562' lat='5.2073' lon='-60.7289'/>
-<node id='-560' lat='5.2413' lon='-60.1427'/>
-<node id='-558' lat='5.0728' lon='-59.9789'/>
-<node id='-556' lat='4.5216' lon='-60.1013'/>
-<node id='-554' lat='3.9499' lon='-59.5481'/>
-<node id='-552' lat='3.5707' lon='-59.8504'/>
-<node id='-550' lat='3.3574' lon='-59.8063'/>
-<node id='-548' lat='2.3886' lon='-59.9231'/>
-<node id='-546' lat='1.1960' lon='-58.9192'/>
-<node id='-544' lat='2.5178' lon='-54.8181'/>
-<node id='-542' lat='3.4034' lon='-54.0283'/>
-<node id='-540' lat='4.8474' lon='-54.4818'/>
-<node id='-538' lat='5.0836' lon='-54.4190'/>
-<node id='-536' lat='5.2306' lon='-54.3011'/>
-<node id='-534' lat='26.2590' lon='61.8994'/>
-<node id='-532' lat='26.6543' lon='63.2116'/>
-<node id='-530' lat='27.1977' lon='63.3069'/>
-<node id='-528' lat='27.2648' lon='62.7835'/>
-<node id='-526' lat='27.5834' lon='62.9131'/>
-<node id='-524' lat='28.3832' lon='62.7578'/>
-<node id='-522' lat='28.9100' lon='61.5758'/>
-<node id='-520' lat='29.6033' lon='61.1814'/>
-<node id='-518' lat='29.6015' lon='65.3798'/>
-<node id='-516' lat='29.9561' lon='66.3719'/>
-<node id='-514' lat='30.9227' lon='66.3697'/>
-<node id='-512' lat='32.0074' lon='69.3811'/>
-<node id='-510' lat='33.0763' lon='69.6782'/>
-<node id='-508' lat='33.3754' lon='70.3307'/>
-<node id='-506' lat='33.9978' lon='69.8545'/>
-<node id='-504' lat='33.9738' lon='71.0438'/>
-<node id='-502' lat='34.1939' lon='71.1368'/>
-<node id='-500' lat='34.7029' lon='71.1197'/>
-<node id='-498' lat='35.1838' lon='71.6694'/>
-<node id='-496' lat='35.3026' lon='71.5447'/>
-<node id='-494' lat='36.4231' lon='71.6176'/>
-<node id='-492' lat='36.9836' lon='75.2806'/>
-<node id='-490' lat='36.7231' lon='75.4882'/>
-<node id='-488' lat='34.2581' lon='78.8639'/>
-<node id='-486' lat='32.1847' lon='78.6052'/>
-<node id='-484' lat='31.7992' lon='78.7101'/>
-<node id='-482' lat='30.0435' lon='81.1228'/>
-<node id='-480' lat='30.4307' lon='81.6977'/>
-<node id='-478' lat='29.2674' lon='83.6508'/>
-<node id='-476' lat='29.2485' lon='84.1422'/>
-<node id='-474' lat='28.5532' lon='84.7757'/>
-<node id='-472' lat='27.7924' lon='88.1119'/>
-<node id='-470' lat='27.8589' lon='92.7411'/>
-<node id='-468' lat='28.7746' lon='96.6746'/>
-<node id='-466' lat='27.1456' lon='97.0549'/>
-<node id='-464' lat='27.3646' lon='96.5951'/>
-<node id='-462' lat='27.1859' lon='96.0401'/>
-<node id='-460' lat='26.5582' lon='95.1529'/>
-<node id='-458' lat='25.7225' lon='94.9824'/>
-<node id='-456' lat='24.7698' lon='94.5891'/>
-<node id='-454' lat='23.8558' lon='94.1245'/>
-<node id='-452' lat='24.0478' lon='93.3442'/>
-<node id='-450' lat='23.3718' lon='93.3879'/>
-<node id='-448' lat='23.0734' lon='93.3581'/>
-<node id='-446' lat='22.7585' lon='93.0958'/>
-<node id='-444' lat='22.2488' lon='93.1968'/>
-<node id='-442' lat='21.9878' lon='92.8909'/>
-<node id='-440' lat='21.9776' lon='92.5992'/>
-<node id='-438' lat='21.3089' lon='92.6487'/>
-<node id='-436' lat='21.4202' lon='92.2570'/>
-<node id='-434' lat='21.2064' lon='92.1837'/>
-<node id='-432' lat='10.5275' lon='98.8221'/>
-<node id='-430' lat='10.6877' lon='98.7812'/>
-<node id='-428' lat='10.8422' lon='99.0074'/>
-<node id='-426' lat='10.9762' lon='99.0767'/>
-<node id='-424' lat='11.3567' lon='99.3657'/>
-<node id='-422' lat='11.6399' lon='99.4978'/>
-<node id='-420' lat='11.8275' lon='99.6353'/>
-<node id='-418' lat='12.1479' lon='99.5194'/>
-<node id='-416' lat='12.4884' lon='99.4066'/>
-<node id='-414' lat='13.9205' lon='99.0640'/>
-<node id='-412' lat='14.4231' lon='98.5274'/>
-<node id='-410' lat='14.8819' lon='98.2258'/>
-<node id='-408' lat='15.2174' lon='98.1865'/>
-<node id='-406' lat='15.3596' lon='98.5330'/>
-<node id='-404' lat='16.0485' lon='98.5909'/>
-<node id='-402' lat='16.2284' lon='98.8685'/>
-<node id='-400' lat='16.4508' lon='98.8562'/>
-<node id='-398' lat='16.2684' lon='98.6847'/>
-<node id='-396' lat='16.5619' lon='98.5827'/>
-<node id='-394' lat='16.6224' lon='98.5716'/>
-<node id='-392' lat='16.6335' lon='98.5625'/>
-<node id='-390' lat='16.6464' lon='98.5128'/>
-<node id='-388' lat='16.6936' lon='98.5162'/>
-<node id='-386' lat='16.7141' lon='98.4869'/>
-<node id='-384' lat='16.7315' lon='98.4637'/>
-<node id='-382' lat='16.7877' lon='98.4874'/>
-<node id='-380' lat='16.8160' lon='98.5475'/>
-<node id='-378' lat='17.0228' lon='98.4509'/>
-<node id='-376' lat='17.1214' lon='98.2825'/>
-<node id='-374' lat='17.8475' lon='97.6746'/>
-<node id='-372' lat='18.5410' lon='97.3989'/>
-<node id='-370' lat='18.5864' lon='97.7837'/>
-<node id='-368' lat='19.4424' lon='97.8001'/>
-<node id='-366' lat='19.7862' lon='98.1017'/>
-<node id='-364' lat='19.7718' lon='98.9299'/>
-<node id='-362' lat='20.1190' lon='99.1418'/>
-<node id='-360' lat='20.1062' lon='99.4744'/>
-<node id='-358' lat='20.3599' lon='99.5123'/>
-<node id='-356' lat='20.3418' lon='99.8360'/>
-<node id='-354' lat='20.4476' lon='99.8627'/>
-<node id='-352' lat='20.4495' lon='99.9301'/>
-<node id='-350' lat='20.4342' lon='99.9847'/>
-<node id='-348' lat='20.3759' lon='100.0765'/>
-<node id='-346' lat='20.3192' lon='100.0971'/>
-<node id='-344' lat='20.2586' lon='100.1004'/>
-<node id='-342' lat='20.2456' lon='100.1725'/>
-<node id='-340' lat='20.2966' lon='100.1674'/>
-<node id='-338' lat='20.3109' lon='100.1829'/>
-<node id='-336' lat='20.3545' lon='100.2272'/>
-<node id='-334' lat='20.3998' lon='100.2646'/>
-<node id='-332' lat='20.3941' lon='100.3353'/>
-<node id='-330' lat='20.3273' lon='100.3823'/>
-<node id='-328' lat='20.2486' lon='100.4195'/>
-<node id='-326' lat='20.2371' lon='100.4476'/>
-<node id='-324' lat='20.1979' lon='100.4566'/>
-<node id='-322' lat='20.1492' lon='100.5129'/>
-<node id='-320' lat='20.1474' lon='100.5312'/>
-<node id='-318' lat='20.1761' lon='100.5574'/>
-<node id='-316' lat='20.1566' lon='100.5869'/>
-<node id='-314' lat='19.8656' lon='100.4996'/>
-<node id='-312' lat='19.8445' lon='100.4548'/>
-<node id='-310' lat='19.7609' lon='100.4061'/>
-<node id='-308' lat='19.5375' lon='100.4903'/>
-<node id='-306' lat='19.4924' lon='100.5916'/>
-<node id='-304' lat='19.6125' lon='100.9045'/>
-<node id='-302' lat='19.5994' lon='101.0798'/>
-<node id='-300' lat='19.5659' lon='101.2606'/>
-<node id='-298' lat='19.3605' lon='101.1826'/>
-<node id='-296' lat='18.9416' lon='101.2939'/>
-<node id='-294' lat='18.4131' lon='101.0806'/>
-<node id='-292' lat='18.0550' lon='101.1780'/>
-<node id='-290' lat='17.7609' lon='100.9508'/>
-<node id='-288' lat='17.5489' lon='100.9663'/>
-<node id='-286' lat='17.4752' lon='101.1594'/>
-<node id='-284' lat='17.7080' lon='101.3932'/>
-<node id='-282' lat='17.8961' lon='101.6452'/>
-<node id='-280' lat='17.9134' lon='101.6969'/>
-<node id='-278' lat='18.0677' lon='101.7818'/>
-<node id='-276' lat='18.0282' lon='101.8993'/>
-<node id='-274' lat='18.2172' lon='102.0790'/>
-<node id='-272' lat='18.2006' lon='102.1703'/>
-<node id='-270' lat='18.0537' lon='102.2916'/>
-<node id='-268' lat='17.9856' lon='102.4292'/>
-<node id='-266' lat='17.9674' lon='102.4822'/>
-<node id='-264' lat='17.9728' lon='102.5463'/>
-<node id='-262' lat='17.9574' lon='102.6037'/>
-<node id='-260' lat='17.9376' lon='102.6147'/>
-<node id='-258' lat='17.9041' lon='102.6125'/>
-<node id='-256' lat='17.8609' lon='102.5940'/>
-<node id='-254' lat='17.8407' lon='102.5901'/>
-<node id='-252' lat='17.8275' lon='102.6255'/>
-<node id='-250' lat='17.8034' lon='102.6776'/>
-<node id='-248' lat='17.8256' lon='102.6985'/>
-<node id='-246' lat='17.8458' lon='102.6755'/>
-<node id='-244' lat='17.8754' lon='102.6977'/>
-<node id='-242' lat='17.8962' lon='102.7636'/>
-<node id='-240' lat='17.9341' lon='102.7856'/>
-<node id='-238' lat='17.9477' lon='102.8291'/>
-<node id='-236' lat='17.9728' lon='102.8557'/>
-<node id='-234' lat='17.9863' lon='102.9125'/>
-<node id='-232' lat='18.0063' lon='102.9579'/>
-<node id='-230' lat='17.9885' lon='102.9985'/>
-<node id='-228' lat='17.9714' lon='103.0203'/>
-<node id='-226' lat='17.9998' lon='103.0576'/>
-<node id='-224' lat='18.1311' lon='103.0817'/>
-<node id='-222' lat='18.1733' lon='103.1447'/>
-<node id='-220' lat='18.2471' lon='103.1574'/>
-<node id='-218' lat='18.2691' lon='103.1941'/>
-<node id='-216' lat='18.2900' lon='103.2733'/>
-<node id='-214' lat='18.3138' lon='103.2980'/>
-<node id='-212' lat='18.3332' lon='103.2741'/>
-<node id='-210' lat='18.3442' lon='103.2397'/>
-<node id='-208' lat='18.3838' lon='103.2486'/>
-<node id='-206' lat='18.4330' lon='103.3081'/>
-<node id='-204' lat='18.4462' lon='103.4201'/>
-<node id='-202' lat='18.4242' lon='103.4642'/>
-<node id='-200' lat='18.4172' lon='103.5499'/>
-<node id='-198' lat='18.3758' lon='103.6500'/>
-<node id='-196' lat='18.3387' lon='103.7125'/>
-<node id='-194' lat='18.3435' lon='103.8157'/>
-<node id='-192' lat='18.2845' lon='103.8605'/>
-<node id='-190' lat='18.3010' lon='103.8953'/>
-<node id='-188' lat='18.3402' lon='103.9451'/>
-<node id='-186' lat='18.3142' lon='103.9953'/>
-<node id='-184' lat='18.1483' lon='104.0938'/>
-<node id='-182' lat='18.0305' lon='104.1773'/>
-<node id='-180' lat='17.9309' lon='104.2480'/>
-<node id='-178' lat='17.8548' lon='104.2785'/>
-<node id='-176' lat='17.8055' lon='104.3650'/>
-<node id='-174' lat='17.6521' lon='104.4713'/>
-<node id='-172' lat='17.5311' lon='104.7011'/>
-<node id='-170' lat='17.4038' lon='104.7932'/>
-<node id='-168' lat='17.3485' lon='104.8036'/>
-<node id='-166' lat='17.1720' lon='104.8092'/>
-<node id='-164' lat='17.0288' lon='104.7412'/>
-<node id='-162' lat='16.9216' lon='104.7350'/>
-<node id='-160' lat='16.8430' lon='104.7649'/>
-<node id='-158' lat='16.8046' lon='104.7379'/>
-<node id='-156' lat='16.7006' lon='104.7665'/>
-<node id='-154' lat='16.5344' lon='104.7383'/>
-<node id='-152' lat='16.4692' lon='104.8070'/>
-<node id='-150' lat='16.2287' lon='105.0193'/>
-<node id='-148' lat='16.0996' lon='105.0587'/>
-<node id='-146' lat='16.0093' lon='105.4149'/>
-<node id='-144' lat='15.9230' lon='105.3422'/>
-<node id='-142' lat='15.7535' lon='105.4380'/>
-<node id='-140' lat='15.7178' lon='105.6103'/>
-<node id='-138' lat='15.4155' lon='105.5901'/>
-<node id='-136' lat='15.1704' lon='105.4765'/>
-<node id='-134' lat='15.1088' lon='105.4742'/>
-<node id='-132' lat='14.9362' lon='105.5876'/>
-<node id='-130' lat='14.4213' lon='105.4410'/>
-<node id='-128' lat='14.2880' lon='105.1319'/>
-<node id='-126' lat='14.2273' lon='105.0448'/>
-<node id='-124' lat='14.4036' lon='104.9159'/>
-<node id='-122' lat='14.4163' lon='104.6192'/>
-<node id='-120' lat='14.3512' lon='104.4634'/>
-<node id='-118' lat='14.3777' lon='104.1443'/>
-<node id='-116' lat='14.3745' lon='103.7215'/>
-<node id='-114' lat='14.4295' lon='103.5434'/>
-<node id='-112' lat='14.2983' lon='103.1009'/>
-<node id='-110' lat='14.1754' lon='102.9359'/>
-<node id='-108' lat='13.8425' lon='102.7447'/>
-<node id='-106' lat='13.6736' lon='102.5468'/>
-<node id='-104' lat='13.5737' lon='102.5453'/>
-<node id='-102' lat='13.5655' lon='102.3401'/>
-<node id='-100' lat='13.2603' lon='102.3533'/>
-<node id='-98' lat='13.0768' lon='102.4418'/>
-<node id='-96' lat='12.8617' lon='102.5118'/>
-<node id='-94' lat='12.6662' lon='102.5069'/>
-<node id='-92' lat='12.4091' lon='102.7800'/>
-<node id='-90' lat='12.1561' lon='102.6981'/>
-<node id='-88' lat='12.0359' lon='102.7789'/>
-<node id='-86' lat='11.8200' lon='102.8625'/>
-<node id='-84' lat='11.7499' lon='102.9133'/>
-<node id='-82' lat='22.2181' lon='113.5553'/>
-<node id='-80' lat='22.2127' lon='113.5332'/>
-<node id='-78' lat='22.2059' lon='113.5351'/>
-<node id='-76' lat='22.1819' lon='113.5272'/>
-<node id='-74' lat='22.1545' lon='113.5408'/>
-<node id='-72' lat='22.1448' lon='113.5497'/>
-<node id='-70' lat='22.1361' lon='113.5491'/>
-<node id='-68' lat='22.1358' lon='113.5402'/>
-<node id='-66' lat='22.1238' lon='113.5406'/>
-<node id='-64' lat='22.1207' lon='113.5457'/>
-<node id='-62' lat='22.1207' lon='113.5483'/>
-<node id='-60' lat='22.1086' lon='113.5488'/>
-<node id='-58' lat='22.2136' lon='113.5358'/>
-<node id='-56' lat='22.2131' lon='113.5412'/>
-<node id='-54' lat='22.2167' lon='113.5435'/>
-<node id='-52' lat='22.2166' lon='113.5481'/>
-<node id='-50' lat='22.2172' lon='113.5516'/>
-<node id='-48' lat='22.5551' lon='114.2194'/>
-<node id='-46' lat='22.5566' lon='114.2002'/>
-<node id='-44' lat='22.5502' lon='114.1649'/>
-<node id='-42' lat='22.5276' lon='114.1155'/>
-<way id='-1120'>
-<nd ref='-1048'/>
-<nd ref='-1052'/>
-<nd ref='-1054'/>
-<nd ref='-1056'/>
-<nd ref='-1048'/>
-</way>
-<way id='-1118'>
-<nd ref='-1030'/>
-<nd ref='-1046'/>
-<nd ref='-1050'/>
-<nd ref='-1044'/>
-<nd ref='-1042'/>
-<nd ref='-1040'/>
-<nd ref='-1030'/>
-</way>
-<way id='-1116'>
-<nd ref='-1032'/>
-<nd ref='-1038'/>
-<nd ref='-1036'/>
-<nd ref='-1024'/>
-<nd ref='-1026'/>
-<nd ref='-1028'/>
-<nd ref='-1022'/>
-<nd ref='-1034'/>
-<nd ref='-1032'/>
-</way>
-<way id='-1114'>
-<nd ref='-1014'/>
-<nd ref='-1016'/>
-<nd ref='-1018'/>
-<nd ref='-1020'/>
-<nd ref='-1014'/>
-</way>
-<way id='-1108'>
-<nd ref='-1002'/>
-<nd ref='-982'/>
-<nd ref='-1000'/>
-<nd ref='-1008'/>
-<nd ref='-1006'/>
-<nd ref='-1004'/>
-<nd ref='-1002'/>
-</way>
-<way id='-1106'>
-<nd ref='-992'/>
-<nd ref='-994'/>
-<nd ref='-996'/>
-<nd ref='-998'/>
-<nd ref='-992'/>
-</way>
-<way id='-1104'>
-<nd ref='-984'/>
-<nd ref='-986'/>
-<nd ref='-988'/>
-<nd ref='-990'/>
-<nd ref='-984'/>
-</way>
-<way id='-1102'>
-<nd ref='-974'/>
-<nd ref='-976'/>
-<nd ref='-978'/>
-<nd ref='-980'/>
-<nd ref='-974'/>
-</way>
-<way id='-1100'>
-<nd ref='-928'/>
-<nd ref='-930'/>
-<nd ref='-932'/>
-<nd ref='-970'/>
-<nd ref='-972'/>
-<nd ref='-928'/>
-</way>
-<way id='-1098'>
-<nd ref='-962'/>
-<nd ref='-964'/>
-<nd ref='-966'/>
-<nd ref='-968'/>
-<nd ref='-962'/>
-</way>
-<way id='-1096'>
-<nd ref='-960'/>
-<nd ref='-958'/>
-<nd ref='-956'/>
-<nd ref='-952'/>
-<nd ref='-954'/>
-<nd ref='-960'/>
-</way>
-<way id='-1094'>
-<nd ref='-942'/>
-<nd ref='-944'/>
-<nd ref='-946'/>
-<nd ref='-948'/>
-<nd ref='-950'/>
-<nd ref='-942'/>
-</way>
-<way id='-1092'>
-<nd ref='-934'/>
-<nd ref='-936'/>
-<nd ref='-938'/>
-<nd ref='-940'/>
-<nd ref='-934'/>
-</way>
-<way id='-1088'>
-<nd ref='-754'/>
-<nd ref='-752'/>
-<nd ref='-60'/>
-<nd ref='-62'/>
-<nd ref='-64'/>
-<nd ref='-66'/>
-<nd ref='-68'/>
-<nd ref='-70'/>
-<nd ref='-72'/>
-<nd ref='-74'/>
-<nd ref='-76'/>
-<nd ref='-78'/>
-<nd ref='-80'/>
-<nd ref='-58'/>
-<nd ref='-56'/>
-<nd ref='-54'/>
-<nd ref='-52'/>
-<nd ref='-50'/>
-<nd ref='-82'/>
-<nd ref='-754'/>
-</way>
-<way id='-1084'>
-<nd ref='-860'/>
-<nd ref='-862'/>
-<nd ref='-864'/>
-<nd ref='-866'/>
-<nd ref='-868'/>
-<nd ref='-870'/>
-<nd ref='-872'/>
-<nd ref='-874'/>
-<nd ref='-876'/>
-<nd ref='-878'/>
-<nd ref='-880'/>
-<nd ref='-882'/>
-<nd ref='-884'/>
-<nd ref='-860'/>
-</way>
-<way id='-1082'>
-<nd ref='-744'/>
-<nd ref='-818'/>
-<nd ref='-820'/>
-<nd ref='-822'/>
-<nd ref='-824'/>
-<nd ref='-826'/>
-<nd ref='-828'/>
-<nd ref='-830'/>
-<nd ref='-832'/>
-<nd ref='-834'/>
-<nd ref='-836'/>
-<nd ref='-838'/>
-<nd ref='-840'/>
-<nd ref='-842'/>
-<nd ref='-844'/>
-<nd ref='-748'/>
-<nd ref='-434'/>
-<nd ref='-436'/>
-<nd ref='-438'/>
-<nd ref='-440'/>
-<nd ref='-442'/>
-<nd ref='-444'/>
-<nd ref='-446'/>
-<nd ref='-448'/>
-<nd ref='-450'/>
-<nd ref='-452'/>
-<nd ref='-454'/>
-<nd ref='-456'/>
-<nd ref='-458'/>
-<nd ref='-460'/>
-<nd ref='-462'/>
-<nd ref='-464'/>
-<nd ref='-466'/>
-<nd ref='-468'/>
-<nd ref='-470'/>
-<nd ref='-472'/>
-<nd ref='-474'/>
-<nd ref='-476'/>
-<nd ref='-478'/>
-<nd ref='-480'/>
-<nd ref='-482'/>
-<nd ref='-484'/>
-<nd ref='-486'/>
-<nd ref='-488'/>
-<nd ref='-490'/>
-<nd ref='-492'/>
-<nd ref='-494'/>
-<nd ref='-496'/>
-<nd ref='-498'/>
-<nd ref='-500'/>
-<nd ref='-502'/>
-<nd ref='-504'/>
-<nd ref='-506'/>
-<nd ref='-508'/>
-<nd ref='-510'/>
-<nd ref='-512'/>
-<nd ref='-514'/>
-<nd ref='-516'/>
-<nd ref='-518'/>
-<nd ref='-520'/>
-<nd ref='-522'/>
-<nd ref='-524'/>
-<nd ref='-526'/>
-<nd ref='-528'/>
-<nd ref='-530'/>
-<nd ref='-532'/>
-<nd ref='-534'/>
-<nd ref='-740'/>
-<nd ref='-810'/>
-<nd ref='-812'/>
-<nd ref='-814'/>
-<nd ref='-816'/>
-<nd ref='-894'/>
-<nd ref='-892'/>
-<nd ref='-890'/>
-<nd ref='-888'/>
-<nd ref='-886'/>
-<nd ref='-858'/>
-<nd ref='-856'/>
-<nd ref='-854'/>
-<nd ref='-852'/>
-<nd ref='-850'/>
-<nd ref='-848'/>
-<nd ref='-846'/>
-<nd ref='-898'/>
-<nd ref='-896'/>
-<nd ref='-750'/>
-<nd ref='-84'/>
-<nd ref='-86'/>
-<nd ref='-88'/>
-<nd ref='-90'/>
-<nd ref='-92'/>
-<nd ref='-94'/>
-<nd ref='-96'/>
-<nd ref='-98'/>
-<nd ref='-100'/>
-<nd ref='-102'/>
-<nd ref='-104'/>
-<nd ref='-106'/>
-<nd ref='-108'/>
-<nd ref='-110'/>
-<nd ref='-112'/>
-<nd ref='-114'/>
-<nd ref='-116'/>
-<nd ref='-118'/>
-<nd ref='-120'/>
-<nd ref='-122'/>
-<nd ref='-124'/>
-<nd ref='-126'/>
-<nd ref='-128'/>
-<nd ref='-130'/>
-<nd ref='-132'/>
-<nd ref='-134'/>
-<nd ref='-136'/>
-<nd ref='-138'/>
-<nd ref='-140'/>
-<nd ref='-142'/>
-<nd ref='-144'/>
-<nd ref='-146'/>
-<nd ref='-148'/>
-<nd ref='-150'/>
-<nd ref='-152'/>
-<nd ref='-154'/>
-<nd ref='-156'/>
-<nd ref='-158'/>
-<nd ref='-160'/>
-<nd ref='-162'/>
-<nd ref='-164'/>
-<nd ref='-166'/>
-<nd ref='-168'/>
-<nd ref='-170'/>
-<nd ref='-172'/>
-<nd ref='-174'/>
-<nd ref='-176'/>
-<nd ref='-178'/>
-<nd ref='-180'/>
-<nd ref='-182'/>
-<nd ref='-184'/>
-<nd ref='-186'/>
-<nd ref='-188'/>
-<nd ref='-190'/>
-<nd ref='-192'/>
-<nd ref='-194'/>
-<nd ref='-196'/>
-<nd ref='-198'/>
-<nd ref='-200'/>
-<nd ref='-202'/>
-<nd ref='-204'/>
-<nd ref='-206'/>
-<nd ref='-208'/>
-<nd ref='-210'/>
-<nd ref='-212'/>
-<nd ref='-214'/>
-<nd ref='-216'/>
-<nd ref='-218'/>
-<nd ref='-220'/>
-<nd ref='-222'/>
-<nd ref='-224'/>
-<nd ref='-226'/>
-<nd ref='-228'/>
-<nd ref='-230'/>
-<nd ref='-232'/>
-<nd ref='-234'/>
-<nd ref='-236'/>
-<nd ref='-238'/>
-<nd ref='-240'/>
-<nd ref='-242'/>
-<nd ref='-244'/>
-<nd ref='-246'/>
-<nd ref='-248'/>
-<nd ref='-250'/>
-<nd ref='-252'/>
-<nd ref='-254'/>
-<nd ref='-256'/>
-<nd ref='-258'/>
-<nd ref='-260'/>
-<nd ref='-262'/>
-<nd ref='-264'/>
-<nd ref='-266'/>
-<nd ref='-268'/>
-<nd ref='-270'/>
-<nd ref='-272'/>
-<nd ref='-274'/>
-<nd ref='-276'/>
-<nd ref='-278'/>
-<nd ref='-280'/>
-<nd ref='-282'/>
-<nd ref='-284'/>
-<nd ref='-286'/>
-<nd ref='-288'/>
-<nd ref='-290'/>
-<nd ref='-292'/>
-<nd ref='-294'/>
-<nd ref='-296'/>
-<nd ref='-298'/>
-<nd ref='-300'/>
-<nd ref='-302'/>
-<nd ref='-304'/>
-<nd ref='-306'/>
-<nd ref='-308'/>
-<nd ref='-310'/>
-<nd ref='-312'/>
-<nd ref='-314'/>
-<nd ref='-316'/>
-<nd ref='-318'/>
-<nd ref='-320'/>
-<nd ref='-322'/>
-<nd ref='-324'/>
-<nd ref='-326'/>
-<nd ref='-328'/>
-<nd ref='-330'/>
-<nd ref='-332'/>
-<nd ref='-334'/>
-<nd ref='-336'/>
-<nd ref='-338'/>
-<nd ref='-340'/>
-<nd ref='-342'/>
-<nd ref='-344'/>
-<nd ref='-346'/>
-<nd ref='-348'/>
-<nd ref='-350'/>
-<nd ref='-352'/>
-<nd ref='-354'/>
-<nd ref='-356'/>
-<nd ref='-358'/>
-<nd ref='-360'/>
-<nd ref='-362'/>
-<nd ref='-364'/>
-<nd ref='-366'/>
-<nd ref='-368'/>
-<nd ref='-370'/>
-<nd ref='-372'/>
-<nd ref='-374'/>
-<nd ref='-376'/>
-<nd ref='-378'/>
-<nd ref='-380'/>
-<nd ref='-382'/>
-<nd ref='-384'/>
-<nd ref='-386'/>
-<nd ref='-388'/>
-<nd ref='-390'/>
-<nd ref='-392'/>
-<nd ref='-394'/>
-<nd ref='-396'/>
-<nd ref='-398'/>
-<nd ref='-400'/>
-<nd ref='-402'/>
-<nd ref='-404'/>
-<nd ref='-406'/>
-<nd ref='-408'/>
-<nd ref='-410'/>
-<nd ref='-412'/>
-<nd ref='-414'/>
-<nd ref='-416'/>
-<nd ref='-418'/>
-<nd ref='-420'/>
-<nd ref='-422'/>
-<nd ref='-424'/>
-<nd ref='-426'/>
-<nd ref='-428'/>
-<nd ref='-430'/>
-<nd ref='-432'/>
-<nd ref='-744'/>
-</way>
-<way id='-1076'>
-<nd ref='-790'/>
-<nd ref='-792'/>
-<nd ref='-794'/>
-<nd ref='-786'/>
-<nd ref='-788'/>
-<nd ref='-796'/>
-<nd ref='-798'/>
-<nd ref='-800'/>
-<nd ref='-790'/>
-</way>
-<way id='-1074'>
-<nd ref='-778'/>
-<nd ref='-780'/>
-<nd ref='-782'/>
-<nd ref='-784'/>
-<nd ref='-778'/>
-</way>
-<way id='-1072'>
-<nd ref='-772'/>
-<nd ref='-774'/>
-<nd ref='-776'/>
-<nd ref='-770'/>
-<nd ref='-772'/>
-</way>
-<way id='-1070'>
-<nd ref='-756'/>
-<nd ref='-758'/>
-<nd ref='-760'/>
-<nd ref='-762'/>
-<nd ref='-764'/>
-<nd ref='-766'/>
-<nd ref='-768'/>
-<nd ref='-756'/>
-</way>
-<way id='-1068'>
-<nd ref='-738'/>
-<nd ref='-730'/>
-<nd ref='-728'/>
-<nd ref='-726'/>
-<nd ref='-724'/>
-<nd ref='-722'/>
-<nd ref='-720'/>
-<nd ref='-718'/>
-<nd ref='-716'/>
-<nd ref='-714'/>
-<nd ref='-712'/>
-<nd ref='-710'/>
-<nd ref='-708'/>
-<nd ref='-706'/>
-<nd ref='-704'/>
-<nd ref='-702'/>
-<nd ref='-700'/>
-<nd ref='-698'/>
-<nd ref='-696'/>
-<nd ref='-694'/>
-<nd ref='-692'/>
-<nd ref='-690'/>
-<nd ref='-688'/>
-<nd ref='-686'/>
-<nd ref='-684'/>
-<nd ref='-682'/>
-<nd ref='-680'/>
-<nd ref='-678'/>
-<nd ref='-676'/>
-<nd ref='-674'/>
-<nd ref='-672'/>
-<nd ref='-670'/>
-<nd ref='-668'/>
-<nd ref='-666'/>
-<nd ref='-664'/>
-<nd ref='-662'/>
-<nd ref='-660'/>
-<nd ref='-658'/>
-<nd ref='-656'/>
-<nd ref='-654'/>
-<nd ref='-652'/>
-<nd ref='-650'/>
-<nd ref='-648'/>
-<nd ref='-646'/>
-<nd ref='-644'/>
-<nd ref='-642'/>
-<nd ref='-640'/>
-<nd ref='-638'/>
-<nd ref='-636'/>
-<nd ref='-634'/>
-<nd ref='-632'/>
-<nd ref='-630'/>
-<nd ref='-628'/>
-<nd ref='-626'/>
-<nd ref='-624'/>
-<nd ref='-622'/>
-<nd ref='-620'/>
-<nd ref='-618'/>
-<nd ref='-616'/>
-<nd ref='-614'/>
-<nd ref='-612'/>
-<nd ref='-610'/>
-<nd ref='-608'/>
-<nd ref='-606'/>
-<nd ref='-604'/>
-<nd ref='-602'/>
-<nd ref='-600'/>
-<nd ref='-598'/>
-<nd ref='-596'/>
-<nd ref='-594'/>
-<nd ref='-592'/>
-<nd ref='-590'/>
-<nd ref='-588'/>
-<nd ref='-586'/>
-<nd ref='-584'/>
-<nd ref='-582'/>
-<nd ref='-580'/>
-<nd ref='-736'/>
-<nd ref='-808'/>
-<nd ref='-806'/>
-<nd ref='-804'/>
-<nd ref='-802'/>
-<nd ref='-738'/>
-</way>
-<way id='-1066'>
-<nd ref='-742'/>
-<nd ref='-578'/>
-<nd ref='-576'/>
-<nd ref='-574'/>
-<nd ref='-572'/>
-<nd ref='-570'/>
-<nd ref='-568'/>
-<nd ref='-566'/>
-<nd ref='-564'/>
-<nd ref='-562'/>
-<nd ref='-560'/>
-<nd ref='-558'/>
-<nd ref='-556'/>
-<nd ref='-554'/>
-<nd ref='-552'/>
-<nd ref='-550'/>
-<nd ref='-548'/>
-<nd ref='-546'/>
-<nd ref='-544'/>
-<nd ref='-542'/>
-<nd ref='-540'/>
-<nd ref='-538'/>
-<nd ref='-536'/>
-<nd ref='-746'/>
-<nd ref='-1010'/>
-<nd ref='-1012'/>
-<nd ref='-742'/>
-</way>
-<way id='-1058'>
-<nd ref='-734'/>
-<nd ref='-48'/>
-<nd ref='-46'/>
-<nd ref='-44'/>
-<nd ref='-42'/>
-<nd ref='-732'/>
-<nd ref='-926'/>
-<nd ref='-924'/>
-<nd ref='-922'/>
-<nd ref='-920'/>
-<nd ref='-918'/>
-<nd ref='-916'/>
-<nd ref='-914'/>
-<nd ref='-912'/>
-<nd ref='-910'/>
-<nd ref='-908'/>
-<nd ref='-906'/>
-<nd ref='-904'/>
-<nd ref='-902'/>
-<nd ref='-900'/>
-<nd ref='-734'/>
-</way>
-</osm>
diff --git a/data/validator/combinations.mapcss b/data/validator/combinations.mapcss
index 3a8ccb4..6ac7d9a 100644
--- a/data/validator/combinations.mapcss
+++ b/data/validator/combinations.mapcss
@@ -4,46 +4,44 @@
/* {0.key} without {1.key} (warning level) */
way[junction ][!highway][junction!=yes],
-*[lanes ][!highway],
-*[living_street ][!highway],
-*[maintenance ][!highway],
-*[median ][!highway],
-*[motorroad ][!highway],
-*[ntd_id ][!highway],
-*[sac_scale ][!highway],
-*[sidewalk ][!highway],
-*[step_count ][!highway],
-*[tracktype ][!highway],
-*[trail_visibility ][!highway],
-*[trolley_wire ][!highway],
-*[zip_left ][!highway],
-*[zip_right ][!highway],
-*[detail ][!railway][route!=railway],
-*[eddy_current_brake ][!railway][route!=railway],
-*[electrified ][!railway][route!=railway],
-*[etcs ][!railway][route!=railway],
-*[gauge ][!railway][route!=railway],
-*[grade_of_track ][!railway][route!=railway],
-*[kursbuchstrecke ][!railway][route!=railway],
-*[lzb ][!railway][route!=railway],
-*[old_railway_operator ][!railway][route!=railway],
-*[operating_procedure ][!railway][route!=railway],
-*[pzb ][!railway][route!=railway],
-*[radio ][!railway][route!=railway],
-*[structure_gauge ][!railway][route!=railway],
-*[tilting_technology ][!railway][route!=railway],
-*[track_class ][!railway][route!=railway],
-*[tracks ][!railway][route!=railway],
-*[traffic_mode ][!railway][route!=railway],
-*[usage ][!railway][route!=railway][man_made!=pipeline],
-*[workrules ][!railway][route!=railway],
-*[stream ][!waterway],
-*[length_unit ][!waterway],
-*[llid ][!waterway],
-*[canal ][!waterway],
-*[have_riverbank ][!waterway],
+way[lanes ][!highway][leisure!=track][leisure!=swimming_pool],
+way[living_street ][!highway],
+way[maintenance ][!highway],
+way[median ][!highway],
+way[motorroad ][!highway],
+node[ntd_id ][!highway],
+way[sac_scale ][!highway],
+way[sidewalk ][!highway],
+way[step_count ][!highway],
+way[tracktype ][!highway],
+way[trail_visibility ][!highway],
+way[trolley_wire ][!highway],
+way[zip_left ][!highway],
+way[zip_right ][!highway],
+way[detail ][!railway][route!=railway],
+way[eddy_current_brake ][!railway][route!=railway],
+way[electrified ][!railway][route!=railway],
+way[etcs ][!railway][route!=railway],
+way[gauge ][!railway][route!=railway],
+way[grade_of_track ][!railway][route!=railway],
+way[kursbuchstrecke ][!railway][route!=railway],
+way[lzb ][!railway][route!=railway],
+way[old_railway_operator ][!railway][route!=railway],
+way[operating_procedure ][!railway][route!=railway],
+way[pzb ][!railway][route!=railway],
+way[structure_gauge ][!railway][route!=railway],
+way[tilting_technology ][!railway][route!=railway],
+way[track_class ][!railway][route!=railway],
+way[tracks ][!railway][route!=railway],
+way[traffic_mode ][!railway][route!=railway],
+way[usage ][!railway][route!=railway][man_made!=pipeline],
+way[workrules ][!railway][route!=railway],
+way[stream ][!waterway],
+way[length_unit ][!waterway],
+way[canal ][!waterway],
+way[have_riverbank ][!waterway],
*[border_type ][!boundary],
-*[bridge:structure ][!bridge],
+way[bridge:structure ][!bridge],
*[piste:difficulty ][!piste:type],
*[source:date ][!source],
*[source:name ][!name],
@@ -84,8 +82,8 @@ way[junction ][!highway][junction!=yes],
}
/* {0.key} without {1.key} (info level) */
-*[lanes:forward][!lanes:backward][oneway!=yes][oneway!=-1],
-*[lanes:backward][!lanes:forward][oneway!=yes][oneway!=-1],
+way[lanes:forward][!lanes:backward][oneway!=yes][oneway!=-1],
+way[lanes:backward][!lanes:forward][oneway!=yes][oneway!=-1],
*[leaf_type ][!leaf_cycle],
*[leaf_cycle][!leaf_type] {
throwOther: tr("{0} without {1}", "{0.key}", "{1.key}");
@@ -94,19 +92,19 @@ way[junction ][!highway][junction!=yes],
/* {0.key} without {1.tag} */
*[transformer ][!power],
-*[fence_type ][barrier!=fence],
+way[fence_type ][barrier!=fence],
*[recycling_type ][amenity!=recycling],
*[information ][tourism!=information],
-*[board_type ][information!=board],
+node[board_type ][information!=board],
*[shelter_type ][amenity!=shelter],
-*[lamp_type ][highway!=street_lamp],
-*[map_type ][information!=map],
+node[lamp_type ][highway!=street_lamp],
+node[map_type ][information!=map],
*[site_type ][historic!=archaeological_site],
*[artwork_type ][tourism!=artwork],
*[castle_type ][historic!=castle],
*[bridge:movable ][bridge!=movable],
*[parking ][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/],
-*[cutline ][man_made!=cutline],
+way[cutline ][man_made!=cutline],
*[bunker_type ][military!=bunker] {
throwWarning: tr("{0} without {1}", "{0.key}", "{1.tag}");
group: tr("missing tag");
@@ -130,6 +128,7 @@ relation[route=ski][!piste:type][type=route],
*[leisure=pitch][!sport],
*[aeroway=terminal][!building],
*[power=generator][!generator:source],
+*[amenity=social_facility][!social_facility],
*[amenity=place_of_worship][!religion] {
throwWarning: tr("{0} without {1}", "{0.tag}", "{1.key}");
group: tr("missing tag");
@@ -174,8 +173,8 @@ way[oneway][!highway][!railway] {
}
/* {0.tag} without {1.tag} (info level) see #11600 #11393 #11850 */
-*[highway=motorway][!oneway][junction!=roundabout],
-*[highway=motorway_link][!oneway][junction!=roundabout] {
+way[highway=motorway][!oneway][junction!=roundabout],
+way[highway=motorway_link][!oneway][junction!=roundabout] {
throwOther: tr("{0} without {1}", "{0.tag}", "{1.tag}");
group: tr("missing tag");
}
@@ -200,13 +199,14 @@ way[oneway][!highway][!railway] {
}
/* {0.key} without {1.key}, {2.key} or {3.tag} */
-*[incline ][!highway][!railway][aeroway!~/^(runway|taxiway)$/],
+way[incline ][!highway][!railway][aeroway!~/^(runway|taxiway)$/],
*[toll ][!highway][!barrier][route!~/^(ferry|road)$/] {
throwWarning: tr("{0} without {1}, {2} or {3}", "{0.key}", "{1.key}", "{2.key}", "{3.tag}");
group: tr("missing tag");
}
-/* {0.tag} together with {1.key}, see #10837 */
+/* {0.tag} together with {1.key}, see #10837, #14034 */
+*[amenity=vending_machine][shop],
*[noname?][name] {
throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.key}");
group: tr("suspicious tag combination");
@@ -222,13 +222,13 @@ way[oneway=-1 ][/:forward/][!traffic_sign:forward][bicycle:forward!=use_sidepath
}
/* {0.tag} together with {1.tag} (info level), see #9696 */
-*[highway=footway][oneway=no] {
+way[highway=footway][oneway=no] {
throwOther: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
group: tr("suspicious tag combination");
}
/* {0.tag} together with {1.tag}, see #10186 */
-*[highway=footway][bicycle=designated] {
+way[highway=footway][bicycle=designated] {
throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
group: tr("suspicious tag combination");
}
@@ -295,7 +295,7 @@ way[highway][highway!=services][highway!=rest_area][!postal_code]["addr:postcode
}
/* #9195 */
-*[highway=footway][cycleway=lane] {
+way[highway=footway][cycleway=lane] {
throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
suggestAlternative: "highway=path + foot=designated + bicycle=designated + segregated=yes";
group: tr("suspicious tag combination");
@@ -474,4 +474,15 @@ way["addr:housenumber"][!building][!"building:part"][!"demolished:building"][!no
/* don't exclude shop because a lot of real missing bulding tag cases have a shop tag. */
throwOther: tr("possibly missing {0} tag", "{1.key}");
group: tr("missing tag");
+}
+
+/* #14125 */
+way[highway][lanes][!lanes:forward][!lanes:backward][oneway!=yes][oneway!=-1][lanes>2][get(split(".", tag(lanes)/2), 1)=5] {
+ throwWarning: tr("street with odd number of {0}, but without {1} and {2} or {3}", "{1.key}", "{2.key}", "{3.key}", "{4.key}");
+ group: tr("missing tag");
+ assertNoMatch: "way highway=primary lanes=2";
+ assertNoMatch: "way highway=primary lanes=3 lanes:backward=2";
+ assertNoMatch: "way highway=primary lanes=3 oneway=-1";
+ assertNoMatch: "way highway=primary lanes=4";
+ assertMatch: "way highway=primary lanes=3";
}
\ No newline at end of file
diff --git a/data/validator/deprecated.mapcss b/data/validator/deprecated.mapcss
index 521f39a..49532b5 100644
--- a/data/validator/deprecated.mapcss
+++ b/data/validator/deprecated.mapcss
@@ -700,8 +700,10 @@ relation[/^..$/][!to] {
fixAdd: "intermittent=yes";
}
-*[type][man_made=pipeline],
-*[type][pipeline=marker] {
+/* #10907, #14141 */
+/* type=waterway on ways is questionable, but the autofix doesn't make it better, so disabled; type=route and type=network is used only on relations */
+way[type][type!=waterway][man_made=pipeline],
+node[type][pipeline=marker] {
throwWarning: tr("{0} is deprecated", "{0.key}");
suggestAlternative: "substance";
group: tr("deprecated tagging");
@@ -1074,4 +1076,81 @@ way[highway=emergency_access_point][phone][emergency_telephone_code][phone!=*eme
assertNoMatch: "node highway=emergency_access_point phone=123";
assertNoMatch: "node highway=emergency_access_point emergency_telephone_code=123";
assertNoMatch: "node highway=emergency_access_point phone=123 emergency_telephone_code=123";
+}
+
+/* #13879 */
+way[tracktype=1] {
+ throwError: tr("{0}", "{0.tag}");
+ suggestAlternative: "tracktype=grade1";
+ group: tr("misspelled value");
+ fixAdd: "tracktype=grade1";
+}
+way[tracktype=2] {
+ throwError: tr("{0}", "{0.tag}");
+ suggestAlternative: "tracktype=grade2";
+ group: tr("misspelled value");
+ fixAdd: "tracktype=grade2";
+}
+way[tracktype=3] {
+ throwError: tr("{0}", "{0.tag}");
+ suggestAlternative: "tracktype=grade3";
+ group: tr("misspelled value");
+ fixAdd: "tracktype=grade3";
+}
+way[tracktype=4] {
+ throwError: tr("{0}", "{0.tag}");
+ suggestAlternative: "tracktype=grade4";
+ group: tr("misspelled value");
+ fixAdd: "tracktype=grade4";
+}
+way[tracktype=5] {
+ throwError: tr("{0}", "{0.tag}");
+ suggestAlternative: "tracktype=grade5";
+ group: tr("misspelled value");
+ fixAdd: "tracktype=grade5";
+}
+way[tracktype][tracktype!~/^(1|2|3|4|5|grade1|grade2|grade3|grade4|grade5)$/] {
+ throwError: tr("wrong value: {0}", "{0.tag}");
+ suggestAlternative: "tracktype=grade1";
+ suggestAlternative: "tracktype=grade2";
+ suggestAlternative: "tracktype=grade3";
+ suggestAlternative: "tracktype=grade4";
+ suggestAlternative: "tracktype=grade5";
+}
+
+/* #13953 */
+*[amenity=hunting_stand][lock=yes],
+*[amenity=hunting_stand][lock=no] {
+ throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");
+ suggestAlternative: "lockable";
+ group: tr("deprecated tagging");
+ fixChangeKey: "lock => lockable";
+}
+
+*[amenity=advertising][!advertising] {
+ throwWarning: tr("{0} is deprecated", "{0.tag}");
+ suggestAlternative: "advertising=*";
+ group: tr("deprecated tagging");
+}
+*[amenity=advertising][advertising] {
+ throwWarning: tr("{0} is deprecated", "{0.tag}");
+ suggestAlternative: "advertising=*";
+ group: tr("deprecated tagging");
+ fixRemove: "amenity";
+}
+
+way[direction=up][incline=up],
+way[direction=down][incline=down],
+way[direction=up][!incline],
+way[direction=down][!incline] {
+ throwWarning: tr("{0} is deprecated", "{0.tag}");
+ suggestAlternative: "incline";
+ group: tr("deprecated tagging");
+ fixChangeKey: "direction => incline";
+}
+way[direction=up][incline][incline!=up],
+way[direction=down][incline][incline!=down] {
+ throwWarning: tr("{0} is deprecated", "{0.tag}");
+ suggestAlternative: "incline";
+ group: tr("deprecated tagging");
}
\ No newline at end of file
diff --git a/data/validator/geometry.mapcss b/data/validator/geometry.mapcss
index b0839cd..10b3250 100644
--- a/data/validator/geometry.mapcss
+++ b/data/validator/geometry.mapcss
@@ -139,6 +139,7 @@ area:closed:areaStyle ⧉ area:closed:areaStyle {
/* see ticket #9311 */
node[amenity=parking]["capacity:disabled" !~ /^(yes|[0-9]+)$/] ∈ *[amenity=parking] {
throwWarning: tr("{0} inside {1}", "amenity=parking", "amenity=parking");
+ group: tr("{0} inside {1}", "amenity", "amenity");
}
/* see ticket #9556 */
@@ -295,4 +296,12 @@ way[waterway] > node[ford?] { set ford_on_waterway; }
way[highway] > node[ford?] { set ford_on_highway; }
node[ford?]:in-downloaded-area!.ford_on_waterway, node[ford?]:in-downloaded-area!.ford_on_highway {
throwWarning: tr("{0} should be on the node where {1} and {2} intersect", "ford", "highway", "waterway");
+}
+/* #13877 */
+area:closed[waterway = canal][area!=no],
+area:closed[waterway = drain][area!=no],
+area:closed[waterway = ditch][area!=no],
+area:closed[waterway = stream][area!=no],
+area:closed[waterway = river][area!=no] {
+ throwWarning: tr("{0} is the tag for the linear waterway. To tag the water area use {1} + {2} instead.", "{1.tag}", "natural=water", "water=*");
}
\ No newline at end of file
diff --git a/data/validator/highway.mapcss b/data/validator/highway.mapcss
index e512abc..235689b 100644
--- a/data/validator/highway.mapcss
+++ b/data/validator/highway.mapcss
@@ -52,11 +52,12 @@ way[highway=unclassified][!name][noname!=yes] {
assertNoMatch: "way highway=unclassified name=Foo";
}
-way.major_road[!ref] {
+way.major_road[!ref][!destination:ref] {
throwOther: tr("highway without a reference");
group: tr("missing tag");
assertMatch: "way highway=primary";
assertNoMatch: "way highway=primary ref=123";
+ assertNoMatch: "way highway=primary destination:ref=123";
}
way[highway=road] {
@@ -90,29 +91,44 @@ way[highway=cycleway][cycleway=lane] {
assertNoMatch: "way name=Foobarstraße";
}
-/* footway, see #10851 */
-way[footway=left],
-way[footway=right],
-way[footway=both],
-way[footway=no] {
+/* footway, see #10851, #10976 */
+way[footway=left][/footway:/],
+way[footway=right][/footway:/],
+way[footway=both][/footway:/],
+way[footway=no][/footway:/] {
+ throwWarning: tr("{0} is deprecated, use {1} instead. Also check similar tags like {2}", "{0.tag}", "sidewalk", "{1.key}");
+ group: tr("deprecated tagging");
+ set not_fixable_footway;
+ assertMatch: "way footway=both footway:surface=asphalt";
+}
+way[footway=none][/footway:/] {
+ throwWarning: tr("{0} is deprecated, use {1} instead. Also check similar tags like {2}", "{0.tag}", "sidewalk=no", "{1.key}");
+ group: tr("deprecated tagging");
+ set not_fixable_footway;
+}
+way[footway=left]!.not_fixable_footway,
+way[footway=right]!.not_fixable_footway,
+way[footway=both]!.not_fixable_footway,
+way[footway=no]!.not_fixable_footway {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "sidewalk";
group: tr("deprecated tagging");
fixChangeKey: "footway => sidewalk";
- set footway_to_sidewalk;
+ set fixable_footway;
}
-way[footway=none] {
+way[footway=none]!.not_fixable_footway {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "sidewalk=no";
group: tr("deprecated tagging");
fixRemove: "footway";
fixAdd: "sidewalk=no";
- set footway_to_sidewalk;
+ set fixable_footway;
}
-way[footway][footway!=sidewalk][footway!=crossing]!.footway_to_sidewalk { /* do not trigger this rule if already one of the two previous rules applied */
+way[footway][footway!=sidewalk][footway!=crossing]!.fixable_footway!.not_fixable_footway { /* do not trigger this rule if already one of the 4 previous rules applied */
throwWarning: tr("Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use ''{3}'' instead.", "{0.key}", "{1.value}", "{2.value}", "sidewalk=left|right|both|no");
assertNoMatch: "way footway=left";
assertNoMatch: "way footway=none";
+ assertNoMatch: "way footway=left footway:left:surface=asphalt";
assertMatch: "way footway=bar";
}
diff --git a/data/validator/ignoretags.cfg b/data/validator/ignoretags.cfg
index 5b030ad..7751a5e 100644
--- a/data/validator/ignoretags.cfg
+++ b/data/validator/ignoretags.cfg
@@ -117,6 +117,7 @@ E:amperage
E:capacity
E:cables
E:circuits
+E:direction
;
; Ignore valid and semi-valid keys that end with...
;
diff --git a/data/validator/numeric.mapcss b/data/validator/numeric.mapcss
index 0a05b5d..5ae3735 100644
--- a/data/validator/numeric.mapcss
+++ b/data/validator/numeric.mapcss
@@ -184,4 +184,24 @@ way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
assertMatch: "node admin_level=-1";
assertMatch: "node admin_level=13";
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 {
+ throwWarning: tr("unusual value of {0}", "{1.key}");
+ assertMatch: "node direction=360";
+ assertMatch: "node direction=-10";
+ assertMatch: "node direction=north-east";
+ 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=N";
+ assertNoMatch: "node direction=NNE";
+ assertNoMatch: "node direction=west";
+ assertNoMatch: "node direction=forward";
+ assertNoMatch: "node direction=anti-clockwise";
+ assertNoMatch: "node direction=anticlockwise"; /* both spellings are in use and even wiki uses both */
}
\ No newline at end of file
diff --git a/data/validator/religion.mapcss b/data/validator/religion.mapcss
index 484c443..249d061 100644
--- a/data/validator/religion.mapcss
+++ b/data/validator/religion.mapcss
@@ -1,6 +1,6 @@
/* absent/unknown denomination (ticket #7811) */
-*[religion =~ /^(christian|jewish|muslim)$/][!denomination] {
+*[religion =~ /^(christian|jewish|muslim)$/][!denomination][type!=route] {
throwOther: tr("religion without denomination");
group: tr("missing tag");
assertMatch: "node religion=christian";
diff --git a/data/validator/speed_limits.json b/data/validator/speed_limits.json
deleted file mode 100644
index 61a2f1b..0000000
--- a/data/validator/speed_limits.json
+++ /dev/null
@@ -1,234 +0,0 @@
-{
- "AT" : {
- "ref": [
- "http://ec.europa.eu/transport/road_safety/going_abroad/austria/speed_limits_en.htm",
- "http://www.bmvit.gv.at/en/service/publications/downloads/folder_austria.pdf"
- ],
- "speeds" : {
- "urban": "50",
- "rural": "100",
- "motorway": "130"
- }
- },
- "AU" : {
- "ref": ["http://www.ntc.gov.au/filemedia/Reports/ARRFeb12.pdf"],
- "speeds" : {
- "urban": "50",
- "rural": "100"
- }
- },
- "BE" : {
- "ref": [
- "http://ec.europa.eu/transport/road_safety/going_abroad/belgium/speed_limits_en.htm",
- "http://www.code-de-la-route.be/textes-legaux/sections/ar/code-de-la-route/170-art11-v15-170",
- "http://www.code-de-la-route.be/textes-legaux/sections/ar/code-de-la-route/182-art22bis"
- ],
- "speeds" : {
- "living_street": "20",
- "urban": "50",
- "rural": "90",
- "motorway": "120"
- }
- },
- "BG" : {
- "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/bulgaria/speed_limits_en.htm"],
- "speeds" : {
- "urban": "50",
- "rural": "90",
- "trunk" : "120",
- "motorway": "140"
- }
- },
- "CH" : {
- "ref": ["http://www.ch.ch/en/driving-over-speed-limit"],
- "speeds" : {
- "living_street": "20",
- "urban": "50",
- "rural": "80",
- "trunk": "100",
- "motorway": "120"
- }
- },
- "CZ" : {
- "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/czech_republic/speed_limits_en.htm"],
- "speeds" : {
- "urban": "50",
- "rural": "90",
- "motorway": "130"
- }
- },
- "DE" : {
- "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/germany/speed_limits_en.htm"],
- "speeds" : {
- "urban": "50",
- "rural": "100"
- }
- },
- "DK" : {
- "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/denmark/speed_limits_en.htm"],
- "speeds" : {
- "urban": "50",
- "rural": "90",
- "motorway": "130"
- }
- },
- "EE" : {
- "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/estonia/speed_limits_en.htm"],
- "speeds" : {
- "urban": "50",
- "rural": "90",
- "motorway": "90"
- }
- },
- "ES" : {
- "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/spain/speed_limits_en.htm"],
- "speeds" : {
- "urban": "50",
- "rural": "90",
- "rural_shoulder": "100",
- "motorway": "120"
- }
- },
- "FI" : {
- "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/finland/speed_limits_en.htm"],
- "speeds" : {
- "urban": "50",
- "rural": "80"
- }
- },
- "FR" : {
- "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/france/speed_limits_en.htm"],
- "speeds" : {
- "living_street" : "20",
- "urban": "50",
- "rural": "90",
- "trunk": "110",
- "motorway": "130"
- }
- },
- "GB" : {
- "ref": [
- "http://www.gov.uk/speed-limits",
- "http://ec.europa.eu/transport/road_safety/going_abroad/united_kingdom/speed_limits_en.htm"
- ],
- "speeds" : {
- "urban": "30 mph",
- "nsl_single": "60 mph",
- "nsl_dual": "70 mph",
- "motorway": "70 mph"
- }
- },
- "HU" : {
- "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/hungary/speed_limits_en.htm"],
- "speeds" : {
- "urban": "50",
- "rural": "90",
- "trunk": "110",
- "motorway": "130"
- }
- },
- "IT" : {
- "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/italy/speed_limits_en.htm"],
- "speeds" : {
- "urban": "50",
- "rural": "90",
- "motorway": "130"
- }
- },
- "LT" : {
- "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/lithuania/speed_limits_en.htm"],
- "speeds" : {
- "urban": "50",
- "unpaved": "70",
- "rural": "90",
- "motorway": "120"
- }
- },
- "NL" : {
- "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/netherlands/speed_limits_en.htm"],
- "speeds" : {
- "urban": "50",
- "rural": "80",
- "trunk": "100",
- "motorway": "130"
- }
- },
- "NO" : {
- "ref": ["http://www.visitnorway.com/en/About-Norway/Safety-first/Driving-in-Norway/"],
- "speeds" : {
- "urban": "50",
- "rural": "80",
- "trunk": "90",
- "motorway": "100"
- }
- },
- "PL" : {
- "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/poland/speed_limits_en.htm"],
- "speeds" : {
- "living_street": "20",
- "urban": "50",
- "rural": "90",
- "rural_dual": "100",
- "trunk_single": "100",
- "trunk": "120",
- "motorway": "140"
- }
- },
- "RO" : {
- "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/romania/speed_limits_en.htm"],
- "speeds" : {
- "urban": "50",
- "rural": "90",
- "trunk": "100",
- "motorway": "130"
- }
- },
- "RU" : {
- "speeds" : {
- "urban": "60",
- "rural": "90",
- "motorway": "110"
- }
- },
- "SE" : {
- "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/sweden/speed_limits_en.htm"],
- "speeds" : {
- "urban": "50",
- "rural": "70",
- "motorway": "110"
- }
- },
- "SI" : {
- "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/slovenia/speed_limits_en.htm"],
- "speeds" : {
- "urban": "50",
- "rural": "90",
- "trunk": "110",
- "motorway": "130"
- }
- },
- "SK" : {
- "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/slovakia/speed_limits_en.htm"],
- "speeds" : {
- "urban": "50",
- "rural": "90",
- "motorway": "130"
- }
- },
- "UA" : {
- "speeds" : {
- "urban": "60",
- "rural": "90",
- "trunk": "110",
- "motorway": "130"
- }
- },
- "ZA" : {
- "ref": ["http://www.southafrica.info/travel/advice/driving.htm"],
- "speeds" : {
- "urban": "60",
- "rural": "100",
- "motorway": "120"
- }
- }
-}
\ No newline at end of file
diff --git a/data/validator/territories.mapcss b/data/validator/territories.mapcss
new file mode 100644
index 0000000..903d881
--- /dev/null
+++ b/data/validator/territories.mapcss
@@ -0,0 +1,7 @@
+/* see ticket #12914 -- Discourage contributors to use operator=ERDF in France. */
+*[operator=ERDF][inside("FR")] {
+ throwWarning: tr("{0} is deprecated", "{0.tag}");
+ suggestAlternative: "operator=Enedis";
+ group: tr("deprecated tagging");
+ fixAdd: "operator=Enedis";
+}
diff --git a/data_nodist/trans/ast.lang b/data_nodist/trans/ast.lang
index 4758050..6596cb8 100644
Binary files a/data_nodist/trans/ast.lang and b/data_nodist/trans/ast.lang differ
diff --git a/data_nodist/trans/be.lang b/data_nodist/trans/be.lang
index 7af5136..23338bb 100644
Binary files a/data_nodist/trans/be.lang and b/data_nodist/trans/be.lang differ
diff --git a/data_nodist/trans/bg.lang b/data_nodist/trans/bg.lang
index 7c82679..94636e5 100644
Binary files a/data_nodist/trans/bg.lang and b/data_nodist/trans/bg.lang differ
diff --git a/data_nodist/trans/ca-valencia.lang b/data_nodist/trans/ca-valencia.lang
index 3e8572d..65f5d4d 100644
Binary files a/data_nodist/trans/ca-valencia.lang and b/data_nodist/trans/ca-valencia.lang differ
diff --git a/data_nodist/trans/ca.lang b/data_nodist/trans/ca.lang
index baa7aa9..397c44b 100644
Binary files a/data_nodist/trans/ca.lang and b/data_nodist/trans/ca.lang differ
diff --git a/data_nodist/trans/cs.lang b/data_nodist/trans/cs.lang
index bd14d9c..c9d5b2e 100644
Binary files a/data_nodist/trans/cs.lang and b/data_nodist/trans/cs.lang differ
diff --git a/data_nodist/trans/da.lang b/data_nodist/trans/da.lang
index c5a5d71..d858a34 100644
Binary files a/data_nodist/trans/da.lang and b/data_nodist/trans/da.lang differ
diff --git a/data_nodist/trans/de.lang b/data_nodist/trans/de.lang
index b424cfc..7058c5b 100644
Binary files a/data_nodist/trans/de.lang and b/data_nodist/trans/de.lang differ
diff --git a/data_nodist/trans/el.lang b/data_nodist/trans/el.lang
index a546c56..27fb88b 100644
Binary files a/data_nodist/trans/el.lang and b/data_nodist/trans/el.lang differ
diff --git a/data_nodist/trans/en.lang b/data_nodist/trans/en.lang
index c29324d..ea69437 100644
Binary files a/data_nodist/trans/en.lang and b/data_nodist/trans/en.lang differ
diff --git a/data_nodist/trans/en_AU.lang b/data_nodist/trans/en_AU.lang
index 12316e5..bb1020f 100644
Binary files a/data_nodist/trans/en_AU.lang and b/data_nodist/trans/en_AU.lang differ
diff --git a/data_nodist/trans/en_GB.lang b/data_nodist/trans/en_GB.lang
index ee794f7..d7eda8a 100644
Binary files a/data_nodist/trans/en_GB.lang and b/data_nodist/trans/en_GB.lang differ
diff --git a/data_nodist/trans/es.lang b/data_nodist/trans/es.lang
index 96e3e4c..22430b4 100644
Binary files a/data_nodist/trans/es.lang and b/data_nodist/trans/es.lang differ
diff --git a/data_nodist/trans/et.lang b/data_nodist/trans/et.lang
index 4848310..2411b26 100644
Binary files a/data_nodist/trans/et.lang and b/data_nodist/trans/et.lang differ
diff --git a/data_nodist/trans/fi.lang b/data_nodist/trans/fi.lang
index 4abd3f4..e647735 100644
Binary files a/data_nodist/trans/fi.lang and b/data_nodist/trans/fi.lang differ
diff --git a/data_nodist/trans/fr.lang b/data_nodist/trans/fr.lang
index 7f91dfa..f604964 100644
Binary files a/data_nodist/trans/fr.lang and b/data_nodist/trans/fr.lang differ
diff --git a/data_nodist/trans/gl.lang b/data_nodist/trans/gl.lang
index 7c3c789..cfbb07c 100644
Binary files a/data_nodist/trans/gl.lang and b/data_nodist/trans/gl.lang differ
diff --git a/data_nodist/trans/hu.lang b/data_nodist/trans/hu.lang
index 6944c21..18f59f8 100644
Binary files a/data_nodist/trans/hu.lang and b/data_nodist/trans/hu.lang differ
diff --git a/data_nodist/trans/id.lang b/data_nodist/trans/id.lang
index 04df697..bec5a2e 100644
Binary files a/data_nodist/trans/id.lang and b/data_nodist/trans/id.lang differ
diff --git a/data_nodist/trans/it.lang b/data_nodist/trans/it.lang
index 35d1067..cb1e960 100644
Binary files a/data_nodist/trans/it.lang and b/data_nodist/trans/it.lang differ
diff --git a/data_nodist/trans/ja.lang b/data_nodist/trans/ja.lang
index 2fa2fa9..04071af 100644
Binary files a/data_nodist/trans/ja.lang and b/data_nodist/trans/ja.lang differ
diff --git a/data_nodist/trans/km.lang b/data_nodist/trans/km.lang
index c0911f7..b2f8c5a 100644
Binary files a/data_nodist/trans/km.lang and b/data_nodist/trans/km.lang differ
diff --git a/data_nodist/trans/lt.lang b/data_nodist/trans/lt.lang
index d3798b1..4fc97cf 100644
Binary files a/data_nodist/trans/lt.lang and b/data_nodist/trans/lt.lang differ
diff --git a/data_nodist/trans/nb.lang b/data_nodist/trans/nb.lang
index 86e78c3..ac600be 100644
Binary files a/data_nodist/trans/nb.lang and b/data_nodist/trans/nb.lang differ
diff --git a/data_nodist/trans/nl.lang b/data_nodist/trans/nl.lang
index 9f76467..bf9f0cb 100644
Binary files a/data_nodist/trans/nl.lang and b/data_nodist/trans/nl.lang differ
diff --git a/data_nodist/trans/pl.lang b/data_nodist/trans/pl.lang
index d55286c..f8737fe 100644
Binary files a/data_nodist/trans/pl.lang and b/data_nodist/trans/pl.lang differ
diff --git a/data_nodist/trans/pt.lang b/data_nodist/trans/pt.lang
index 535b3e5..d2fa888 100644
Binary files a/data_nodist/trans/pt.lang and b/data_nodist/trans/pt.lang differ
diff --git a/data_nodist/trans/pt_BR.lang b/data_nodist/trans/pt_BR.lang
index 2d41d7e..8ec1935 100644
Binary files a/data_nodist/trans/pt_BR.lang and b/data_nodist/trans/pt_BR.lang differ
diff --git a/data_nodist/trans/ru.lang b/data_nodist/trans/ru.lang
index 2d3e037..d642c5d 100644
Binary files a/data_nodist/trans/ru.lang and b/data_nodist/trans/ru.lang differ
diff --git a/data_nodist/trans/sk.lang b/data_nodist/trans/sk.lang
index 4c79700..e3f9277 100644
Binary files a/data_nodist/trans/sk.lang and b/data_nodist/trans/sk.lang differ
diff --git a/data_nodist/trans/sv.lang b/data_nodist/trans/sv.lang
index c3cdef3..d8da772 100644
Binary files a/data_nodist/trans/sv.lang and b/data_nodist/trans/sv.lang differ
diff --git a/data_nodist/trans/uk.lang b/data_nodist/trans/uk.lang
index ae12957..f076e3c 100644
Binary files a/data_nodist/trans/uk.lang and b/data_nodist/trans/uk.lang differ
diff --git a/data_nodist/trans/vi.lang b/data_nodist/trans/vi.lang
index cc189e6..0701da6 100644
Binary files a/data_nodist/trans/vi.lang and b/data_nodist/trans/vi.lang differ
diff --git a/data_nodist/trans/zh_CN.lang b/data_nodist/trans/zh_CN.lang
index 3076cfc..62a8083 100644
Binary files a/data_nodist/trans/zh_CN.lang and b/data_nodist/trans/zh_CN.lang differ
diff --git a/data_nodist/trans/zh_TW.lang b/data_nodist/trans/zh_TW.lang
index b6ce718..5f85fe4 100644
Binary files a/data_nodist/trans/zh_TW.lang and b/data_nodist/trans/zh_TW.lang differ
diff --git a/i18n/build.xml b/i18n/build.xml
index fc8d3c5..f6dc0b8 100644
--- a/i18n/build.xml
+++ b/i18n/build.xml
@@ -101,7 +101,7 @@
<antcall target="buildplugins"/>
</target>
<target name="buildplugins" depends="init">
- <foreach param="path" target="plugintrans">
+ <foreach param="path" target="plugintrans" parallel="true" maxThreads="8">
<path>
<dirset dir="${plugin.dir}" includes="*" excludes="00_*" />
</path>
diff --git a/i18n/po/af.po b/i18n/po/af.po
index 714c700..16aa784 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:31+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:33+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: af\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr "Hulp"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr ""
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -708,6 +714,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -729,9 +738,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -782,6 +788,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -931,22 +940,28 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Goed"
+
msgid "Open Location..."
msgstr ""
msgid "Open an URL."
msgstr ""
-msgid "Separate Layer"
+msgid "Enter URL to download:"
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Enter an URL from where data should be downloaded"
msgstr ""
-msgid "Enter URL to download:"
+msgid "Separate Layer"
msgstr ""
-msgid "Enter an URL from where data should be downloaded"
+msgid "Select if the data should be downloaded into a new layer"
msgstr ""
msgid "Download Location"
@@ -964,12 +979,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr "Goed"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1762,9 +1771,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3950,9 +3956,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3982,12 +3985,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4680,12 +4698,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4702,8 +4726,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5024,9 +5048,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5165,82 +5186,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5406,6 +5351,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5465,7 +5486,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6857,212 +6878,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8168,6 +8189,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9654,6 +9678,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9666,9 +9693,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9765,14 +9789,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9785,6 +9801,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10773,6 +10792,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10785,6 +10807,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10797,6 +10831,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10856,6 +10893,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10874,9 +10916,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12071,6 +12120,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13106,6 +13161,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13127,12 +13188,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14092,6 +14147,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14580,13 +14638,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14610,7 +14671,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14661,7 +14725,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14670,10 +14734,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14709,6 +14785,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14754,10 +14836,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14790,34 +14878,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14856,6 +14984,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14889,9 +15023,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14948,9 +15079,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14978,9 +15106,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15014,9 +15139,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15053,19 +15223,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15128,9 +15307,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15164,12 +15355,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15296,9 +15509,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15308,6 +15518,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15329,12 +15553,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15356,6 +15598,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15398,6 +15643,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15419,6 +15667,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15434,6 +15688,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15461,9 +15718,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15485,9 +15787,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15497,9 +15796,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15811,7 +16107,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15899,6 +16195,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18295,6 +18594,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19343,6 +19645,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19409,6 +19717,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20352,31 +20666,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20968,6 +21270,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22261,6 +22567,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23074,9 +23383,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24121,6 +24427,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24212,6 +24521,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24288,6 +24603,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24312,6 +24632,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25085,6 +25408,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25127,7 +25460,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25930,6 +26263,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25971,8 +26307,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27570,6 +27906,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29731,9 +30126,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29891,9 +30283,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29951,6 +30340,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30148,9 +30540,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/am.po b/i18n/po/am.po
index 77cd221..21cea66 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:32+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:35+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: am\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr ""
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr ""
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -708,6 +714,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -729,9 +738,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -782,6 +788,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -931,16 +940,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -949,6 +958,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -964,12 +979,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1762,9 +1771,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3950,9 +3956,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3982,12 +3985,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4680,12 +4698,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4702,8 +4726,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5024,9 +5048,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5165,82 +5186,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5406,6 +5351,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5465,7 +5486,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6857,212 +6878,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8168,6 +8189,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9654,6 +9678,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9666,9 +9693,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9765,14 +9789,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9785,6 +9801,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10773,6 +10792,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10785,6 +10807,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10797,6 +10831,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10856,6 +10893,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10874,9 +10916,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12071,6 +12120,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13106,6 +13161,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13127,12 +13188,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14092,6 +14147,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14580,13 +14638,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14610,7 +14671,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14661,7 +14725,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14670,10 +14734,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14709,6 +14785,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14754,10 +14836,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14790,34 +14878,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14856,6 +14984,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14889,9 +15023,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14948,9 +15079,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14978,9 +15106,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15014,9 +15139,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15053,19 +15223,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15128,9 +15307,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15164,12 +15355,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15296,9 +15509,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15308,6 +15518,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15329,12 +15553,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15356,6 +15598,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15398,6 +15643,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15419,6 +15667,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15434,6 +15688,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15461,9 +15718,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15485,9 +15787,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15497,9 +15796,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15811,7 +16107,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15899,6 +16195,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18295,6 +18594,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19343,6 +19645,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19409,6 +19717,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20352,31 +20666,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20968,6 +21270,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22261,6 +22567,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23074,9 +23383,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24121,6 +24427,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24212,6 +24521,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24288,6 +24603,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24312,6 +24632,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25085,6 +25408,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25127,7 +25460,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25930,6 +26263,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25971,8 +26307,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27570,6 +27906,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29731,9 +30126,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29891,9 +30283,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29951,6 +30340,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30148,9 +30540,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/ar.po b/i18n/po/ar.po
index 7b2deb6..19ecefe 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
"PO-Revision-Date: 2015-10-08 23:09+0000\n"
"Last-Translator: mourad101ee <mourad101ee 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: 2016-11-07 04:33+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:35+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: ar\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -65,9 +65,15 @@ msgstr "بناء القائمة الرئيسية"
msgid "Help"
msgstr "مساعدة"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "تهيئة OSM API"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "تهيئة المدقق"
@@ -204,6 +210,12 @@ msgid ""
msgstr ""
"إضبط العناصر المحددة في الخريطة على العناصر المحددة على القائمة أعلاه."
+msgid "Select WMS layers"
+msgstr "تحديد طبقات خدمة خرائط الويب"
+
+msgid "Add layers"
+msgstr "إضافة طبقات"
+
msgid "Add imagery layer {0}"
msgstr "إضافة طبقة صور {0}"
@@ -225,12 +237,6 @@ msgstr "خطأ"
msgid "Select image format for WMS layer"
msgstr "تحديد بنية الصورة من أجل طبقة خدمة خرائط الويب"
-msgid "Select WMS layers"
-msgstr "تحديد طبقات خدمة خرائط الويب"
-
-msgid "Add layers"
-msgstr "إضافة طبقات"
-
msgid "Add Node..."
msgstr "أضف عقدة..."
@@ -722,6 +728,9 @@ msgstr "أقفز إلى الموقع"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "فتح الحوار الذي يسمح بالإنتقال إلى موقع معين"
+msgid "Jump to Position"
+msgstr "اقفز إلى الموقع"
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -743,9 +752,6 @@ msgstr ""
msgid "Jump there"
msgstr "اقفز إلى هناك"
-msgid "Jump to Position"
-msgstr "اقفز إلى الموقع"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -796,6 +802,9 @@ msgstr "أدمج الطبقة"
msgid "Merge the current layer into another layer"
msgstr "أدمج الطبقة الحالية في طبقة أخرى"
+msgid "{0} completed in {1}"
+msgstr "{0} يكتمل في {1}"
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -945,24 +954,30 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr "جاري فتح الملف ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid "Open Location..."
msgstr "إفتح الموقع..."
msgid "Open an URL."
msgstr "إفتح URL"
-msgid "Separate Layer"
-msgstr ""
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr ""
-
msgid "Enter URL to download:"
msgstr "أدخل الــ URL للتنزيل:"
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr "موقع التنزيل"
@@ -978,12 +993,6 @@ msgstr "أغلق الحوار و الغي التنزيل"
msgid "Download Data"
msgstr "نزل معطيات"
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1780,9 +1789,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3981,9 +3987,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -4013,12 +4016,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4715,12 +4733,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4737,8 +4761,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5059,9 +5083,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr "{0} يكتمل في {1}"
-
msgid "Enlarge"
msgstr ""
@@ -5200,82 +5221,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr "الأعضاء"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5441,6 +5386,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr "الأعضاء"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5500,7 +5521,7 @@ msgstr "الدّور"
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6896,212 +6917,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
+msgstr "الأساسي"
+
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "From URL"
msgstr ""
-msgid "Invalid user name"
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Date: "
+msgid "Advanced"
msgstr ""
-msgid "Time:"
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Closed after - "
+msgid "Query changesets"
msgstr ""
-msgid "Date:"
+msgid "Query and download changesets"
msgstr ""
-msgid "Created before - "
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+msgid "Query open changesets only"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query both open and closed changesets"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Date: "
msgstr ""
-msgid "Invalid bounding box"
+msgid "Time:"
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid "Invalid date/time values"
msgstr ""
msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
-msgstr ""
-
-msgid "<html>Download my open changesets</html>"
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
-msgstr "الأساسي"
+msgid "Examples"
+msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8207,6 +8228,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9694,6 +9718,9 @@ msgstr "الإتجاه"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "ملفات صوتيت (*.wav)"
+
msgid "Import Audio"
msgstr "إستورد صوت مسجل"
@@ -9706,9 +9733,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr "ملفات صوتيت (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "العلامات الصوتية من {0}"
@@ -9809,14 +9833,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9829,6 +9845,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10818,6 +10837,9 @@ msgstr "ضوبان الموقع (أحمر=عالي،أخضر=منخفض، عند
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10830,6 +10852,18 @@ msgstr "الدراجة"
msgid "Foot"
msgstr "المشي"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "حرج"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10842,6 +10876,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10902,6 +10939,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10920,9 +10962,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "تلوين الأثر و النقطة"
@@ -12117,6 +12166,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13158,6 +13213,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "إحفظ المستخدم و كلمة المرور (غير معتمة)"
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13179,12 +13240,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14144,6 +14199,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14632,13 +14690,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14662,7 +14723,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14713,7 +14777,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14722,10 +14786,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14761,6 +14837,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14806,10 +14888,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14839,37 +14927,77 @@ msgstr ""
msgid "SPW(allonie) 2012-2013 aerial imagery"
msgstr ""
-msgid "SPW(allonie) 2009-2010 aerial imagery"
+msgid "SPW(allonie) 2009-2010 aerial imagery"
+msgstr ""
+
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14908,6 +15036,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14941,9 +15075,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -15000,9 +15131,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15030,9 +15158,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15066,9 +15191,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15105,19 +15275,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15180,9 +15359,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15216,12 +15407,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15348,9 +15561,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15360,6 +15570,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15381,12 +15605,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15408,6 +15650,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15450,6 +15695,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15471,6 +15719,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15486,6 +15740,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15513,9 +15770,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15537,9 +15839,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15549,9 +15848,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15863,7 +16159,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15951,6 +16247,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18347,6 +18646,9 @@ msgstr "جدول نهر"
msgid "River"
msgstr "نهر"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "قناة"
@@ -19395,6 +19697,12 @@ msgstr "فندق (رخيص)"
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "كوخ"
@@ -19461,6 +19769,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "وجبات سريعة"
@@ -20404,31 +20718,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr "الإرتفاع"
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -21020,6 +21322,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22313,6 +22619,9 @@ msgstr "جزار"
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23126,9 +23435,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr "حرج"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24173,6 +24479,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24264,6 +24573,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24340,6 +24655,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24364,6 +24684,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25137,6 +25460,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25179,7 +25512,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25982,6 +26315,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26023,8 +26359,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27622,6 +27958,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29783,9 +30178,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29943,9 +30335,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -30003,6 +30392,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30200,9 +30592,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/ast.po b/i18n/po/ast.po
index a8bc585..bc06a24 100644
--- a/i18n/po/ast.po
+++ b/i18n/po/ast.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
"PO-Revision-Date: 2016-08-09 15:33+0000\n"
"Last-Translator: Don-vip <Unknown>\n"
"Language-Team: Asturian <ast 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: 2016-11-07 04:34+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:37+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: ast\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr "Construyendo''l menú principal"
msgid "Help"
msgstr "Ayuda"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Aniciando API d''OSM"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Aniciando validador"
@@ -207,6 +213,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr "Escueye nel mapa los elementos escoyíos na llista cimera."
+msgid "Select WMS layers"
+msgstr "Escoyer capes WMS"
+
+msgid "Add layers"
+msgstr "Añader capes"
+
msgid "Add imagery layer {0}"
msgstr "Amestar capa de imaxes {0}"
@@ -228,12 +240,6 @@ msgstr "Fallu"
msgid "Select image format for WMS layer"
msgstr "Escoyer formatu d''imaxe pa la capa WMS"
-msgid "Select WMS layers"
-msgstr "Escoyer capes WMS"
-
-msgid "Add layers"
-msgstr "Añader capes"
-
msgid "Add Node..."
msgstr "Amestar nudu..."
@@ -755,6 +761,9 @@ msgstr "Saltar a posición"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Abre un diálogu que permite saltar a un llugar específicu"
+msgid "Jump to Position"
+msgstr "Saltar a posición"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Escribi Llat/Llon pa saltar a la posición."
@@ -776,9 +785,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Dir allí"
-msgid "Jump to Position"
-msgstr "Saltar a posición"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Nun se pue analizar la Llatitú, Llonxitú o Zoom. Comprueba-lo por favor."
@@ -832,6 +838,9 @@ msgstr "Xunir capa"
msgid "Merge the current layer into another layer"
msgstr "Sumir la capa actual n''otra capa"
+msgid "{0} completed in {1}"
+msgstr "{0} completáu en {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Fundiendo capes con distintes polítiques de carga"
@@ -1002,24 +1011,30 @@ msgstr[1] "Abriendo {0} ficheros..."
msgid "Opening file ''{0}'' ..."
msgstr "Abriendo ficheru ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr "¿Qué xeres hai que facer?"
+
+msgid "Ok"
+msgstr "Aceutar"
+
msgid "Open Location..."
msgstr "Abrir llocalización..."
msgid "Open an URL."
msgstr "Abrir una URL"
-msgid "Separate Layer"
-msgstr "Capa separada"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Seleicionar si los datos tienen de descargase nuna capa nueva"
-
msgid "Enter URL to download:"
msgstr "Escribi la URL a descargar:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Escribi la URL de la que tienen de descargase los datos"
+msgid "Separate Layer"
+msgstr "Capa separada"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Seleicionar si los datos tienen de descargase nuna capa nueva"
+
msgid "Download Location"
msgstr "Llugar de descarga"
@@ -1035,12 +1050,6 @@ msgstr "Zarrar el diálogu y encaboxar la descarga"
msgid "Download Data"
msgstr "Descargar datos"
-msgid "Which tasks to perform?"
-msgstr "¿Qué xeres hai que facer?"
-
-msgid "Ok"
-msgstr "Aceutar"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1900,9 +1909,6 @@ msgstr "Consultar y descargar cambeos..."
msgid "Errors during download"
msgstr "Fallos na descarga"
-msgid "Download Geo URL"
-msgstr "Descargar Geo URL"
-
msgid "Download GPS"
msgstr "Descargar GPS"
@@ -4299,9 +4305,6 @@ msgstr "La vía estilu área non foi pesllada"
msgid "No outer way for multipolygon"
msgstr "Nenguna vía esterior pal multipolígono"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "El rol pa ''{0}'' tendría de ser ''{1}''"
-
msgid "No area style for multipolygon"
msgstr "Nun hai un estilu d''área pa multipolígonu"
@@ -4337,12 +4340,27 @@ msgstr "Estilu d''área en vía esterna"
msgid "Multipolygon is not closed"
msgstr "El multipolígonu non tá peslláu"
-msgid "Multipolygon inner way is outside"
-msgstr "vía interna del multipolígonu tá fora"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "Intersección ente víes del multipolígonu"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "El rol pa ''{0}'' tendría de ser ''{1}''"
+
+msgid "Multipolygon inner way is outside"
+msgstr "vía interna del multipolígonu tá fora"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "El miembru de multipolígonu non tien un rol útil"
@@ -5068,12 +5086,18 @@ msgstr "Evacuar l''accesu al recursu(s) dáu(s), dixebraos por comes"
msgid "options provided as Java system properties"
msgstr "opciones proporcionaes como propiedaes de sistema Java"
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/PATH/TO/JOSM/PREF "
msgid "Set the preferences directory"
msgstr "Afitar el direutoriu de preferencies"
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/PATH/TO/JOSM/USERDATA"
@@ -5090,11 +5114,9 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/PATH/TO/JOSM/HOMEDIR "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Recolocar los 3 direutorios nel direutoriu personal. El direutoriu de caché "
-"tará en direutoriu_personal/cache"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5448,9 +5470,6 @@ msgstr "Faiga clic pa executar la xera en segundu planu"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} completáu en {1}"
-
msgid "Enlarge"
msgstr "Agrandar"
@@ -5592,86 +5611,6 @@ msgstr "Conflictu de fondu: esanicie el miembru"
msgid "Conflict foreground: remove member"
msgstr "Conflictu de fondu: esaniciar el miembru"
-msgid "My with Their"
-msgstr "Mía respectu a la suya"
-
-msgid "My with Merged"
-msgstr "Mía respectu a la fusionada"
-
-msgid "Their with Merged"
-msgstr "Suya respectu a la fusionada"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "La función {0} non participa na pareya de comparanza {1}"
-
-msgid "Properties"
-msgstr "Propiedaes"
-
-msgid "Tags"
-msgstr "Etiquetes"
-
-msgid "Nodes"
-msgstr "Nudos"
-
-msgid "Members"
-msgstr "Miembros"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Nengún conflito d''etiqueta pendiente de ser resueltu"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Etiquetes ({0} conflictu)"
-msgstr[1] "Etiquetes ({0} conflictos)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} conflictu d´etiquetes pendiente de resolver"
-msgstr[1] "{0} conflictos d´eitquetes pendientes de resolver"
-
-msgid "Nodes(resolved)"
-msgstr "Nudos (resueltos)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Llista de nudos fusionaos conxelada. Nun hai conflictos pendientes na llista "
-"de nudos d’esta vía"
-
-msgid "Nodes(with conflicts)"
-msgstr "Nudos (con conflictos)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Conflictos pendientes na llista de nudos d’esta vía"
-
-msgid "Members(resolved)"
-msgstr "Miembros (resueltos)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Llista de miembros fundíos conxelada. Nun hai conflictos pendientes na "
-"llista de miembros d''esta relación"
-
-msgid "Members(with conflicts)"
-msgstr "Miembros (con conflictos)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Conflictos pendientes na llista de miembros d''esta relación"
-
-msgid "No pending property conflicts"
-msgstr "Nengún conflictu de propiedaes pendiente"
-
-msgid "Properties(with conflicts)"
-msgstr "Propiedaes (con conflictos)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Conflictos de propiedaes pendientes de resolver"
-
-msgid "Conflict Resolution"
-msgstr "Resolución de conflictos"
-
msgid "{0} more..."
msgstr "{0} más..."
@@ -5862,6 +5801,86 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "La so versión ({0} ingresada)"
msgstr[1] "La so versión ({0} ingresaes)"
+msgid "My with Their"
+msgstr "Mía respectu a la suya"
+
+msgid "My with Merged"
+msgstr "Mía respectu a la fusionada"
+
+msgid "Their with Merged"
+msgstr "Suya respectu a la fusionada"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "La función {0} non participa na pareya de comparanza {1}"
+
+msgid "Properties"
+msgstr "Propiedaes"
+
+msgid "Tags"
+msgstr "Etiquetes"
+
+msgid "Nodes"
+msgstr "Nudos"
+
+msgid "Members"
+msgstr "Miembros"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Nengún conflito d''etiqueta pendiente de ser resueltu"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Etiquetes ({0} conflictu)"
+msgstr[1] "Etiquetes ({0} conflictos)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} conflictu d´etiquetes pendiente de resolver"
+msgstr[1] "{0} conflictos d´eitquetes pendientes de resolver"
+
+msgid "Nodes(resolved)"
+msgstr "Nudos (resueltos)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Llista de nudos fusionaos conxelada. Nun hai conflictos pendientes na llista "
+"de nudos d’esta vía"
+
+msgid "Nodes(with conflicts)"
+msgstr "Nudos (con conflictos)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Conflictos pendientes na llista de nudos d’esta vía"
+
+msgid "Members(resolved)"
+msgstr "Miembros (resueltos)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Llista de miembros fundíos conxelada. Nun hai conflictos pendientes na "
+"llista de miembros d''esta relación"
+
+msgid "Members(with conflicts)"
+msgstr "Miembros (con conflictos)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Conflictos pendientes na llista de miembros d''esta relación"
+
+msgid "No pending property conflicts"
+msgstr "Nengún conflictu de propiedaes pendiente"
+
+msgid "Properties(with conflicts)"
+msgstr "Propiedaes (con conflictos)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Conflictos de propiedaes pendientes de resolver"
+
+msgid "Conflict Resolution"
+msgstr "Resolución de conflictos"
+
msgid "Node"
msgstr "Nudu"
@@ -5928,10 +5947,8 @@ msgstr "Rol"
msgid "Primitive"
msgstr "Primitivu/a"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"Los nudos fusionaos inda nun tán conxelaos. Nun pué construyise la orde de "
-"resolvimientu."
msgid "<undefined>"
msgstr "<non definíu>"
@@ -7420,114 +7437,17 @@ msgstr ""
msgid "Select changesets owned by specific users"
msgstr "Escoyer los cambeos efectuaos por un usuariu específicu"
-msgid "Select changesets depending on whether they are open or closed"
-msgstr "Escueye los cambeos dependiendo de si tán abiertes o zarraes"
-
-msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr ""
-"Escueye''l cambeos basándose na fecha/hora en que fueren creaos o zarraos"
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr ""
-"Escueye los conxuntos de cambeos relativos a un recuadru de selección"
-
-msgid "Query open changesets only"
-msgstr "Consultar namá nos cambeos abiertos"
-
-msgid "Query closed changesets only"
-msgstr "Consultar namá nos cambeos zarraos"
-
-msgid "Query both open and closed changesets"
-msgstr "Consultar nos cambeos abiertos y zarraos"
-
-msgid "Only changesets owned by myself"
-msgstr "Namá cambeos realizaos por mi"
-
-msgid "User ID:"
-msgstr "ID Usuariu:"
-
-msgid "User name:"
-msgstr "Nome d''usuariu:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Namá cambeos realizaos pol usuariu col siguiente ID"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "Namá cambeos realizaos pol usuariu col siguiente nome"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Namá cambeos realizaos por mi (non disponible. Agora mesmu JOSM ta "
-"executándose por un usuariu anónimu)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Non puede acutase la consulta del conxuntu de cambeos al usuariu actual por "
-"cuenta de que''l mesmu ye anónimu"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "El valor actual \"{0}\" nun ye válidu pa la ID d´usuariu"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"Nun ye posible acutar la consulta del conxuntu de cambeos al nome d´usuariu "
-"\"{0}\""
-
-msgid "Please enter a valid user ID"
-msgstr "Por favor, introduza un ID d''usuariu válidu"
-
-msgid "Invalid user ID"
-msgstr "ID d''usuariu inválida"
-
-msgid "Please enter a non-empty user name"
-msgstr "Por favor, introduza un nome d''usuariu non valeru"
-
-msgid "Invalid user name"
-msgstr "Nome d''usuariu inválidu"
-
-msgid "Date: "
-msgstr "Fecha: "
-
-msgid "Time:"
-msgstr "Hora:"
-
-msgid "Closed after - "
-msgstr "Zarráu dempués de - "
-
-msgid "Date:"
-msgstr "Fecha:"
-
-msgid "Created before - "
-msgstr "Creáu enantes de - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Namá los cambeos zarraos dempués de fechar/hora siguiente"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-"Namá los cambeos zarraos dempués y creaos antes d''una fecha/hora determinada"
+msgid "Select changesets depending on whether they are open or closed"
+msgstr "Escueye los cambeos dependiendo de si tán abiertes o zarraes"
msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+"Select changesets based on the date/time they have been created or closed"
msgstr ""
-"Non puede construyise un pidimientu d''un conxuntu de cambeos con "
-"restricciones de tiempu. La entrada nun ye válida."
+"Escueye''l cambeos basándose na fecha/hora en que fueren creaos o zarraos"
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+msgid "Select only changesets related to a specific bounding box"
msgstr ""
-"<html>Por favor, introduza valores de fecha/hora válidos pa<br> acutar la "
-"consulta a un rangu de tiempu determináu.</html>"
-
-msgid "Invalid date/time values"
-msgstr "Valores de fecha/hora inválidos"
+"Escueye los conxuntos de cambeos relativos a un recuadru de selección"
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
@@ -7547,29 +7467,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Ventana d''escoyeta inválida"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"El valor actual nun ye una ID d''usuariu válida. Por favor, introduza un "
-"valor enteru mayor que cero"
-
-msgid "Please enter an integer value > 0"
-msgstr "Por favor, introduza un valor enteru > 0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Por favor, introduza la fecha nel formatu habitual de la so "
-"zona.<br>Exemplu: {0}<br>Exemplu: {1}<br>Exemplu: {2}<br>Exemplu: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Introduza la hora nel formatu habitual de la so zona.<br>Exemplu: "
-"{0}<br>Exemplu: {1}<br>Exemplu: {2}<br>Exemplu: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Descargar namá los mios cambeos"
@@ -7662,6 +7559,77 @@ msgstr "URL de consulta de cambeos incorreuta"
msgid "Close the dialog and abort querying of changesets"
msgstr "Pesllar el cuadru de diálogu y albortar la consulta de cambeos"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Por favor, introduza la fecha nel formatu habitual de la so "
+"zona.<br>Exemplu: {0}<br>Exemplu: {1}<br>Exemplu: {2}<br>Exemplu: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Consultar namá nos cambeos abiertos"
+
+msgid "Query closed changesets only"
+msgstr "Consultar namá nos cambeos zarraos"
+
+msgid "Query both open and closed changesets"
+msgstr "Consultar nos cambeos abiertos y zarraos"
+
+msgid "Date: "
+msgstr "Fecha: "
+
+msgid "Time:"
+msgstr "Hora:"
+
+msgid "Closed after - "
+msgstr "Zarráu dempués de - "
+
+msgid "Date:"
+msgstr "Fecha:"
+
+msgid "Created before - "
+msgstr "Creáu enantes de - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Namá los cambeos zarraos dempués de fechar/hora siguiente"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+"Namá los cambeos zarraos dempués y creaos antes d''una fecha/hora determinada"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Non puede construyise un pidimientu d''un conxuntu de cambeos con "
+"restricciones de tiempu. La entrada nun ye válida."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Por favor, introduza valores de fecha/hora válidos pa<br> acutar la "
+"consulta a un rangu de tiempu determináu.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Valores de fecha/hora inválidos"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Introduza la hora nel formatu habitual de la so zona.<br>Exemplu: "
+"{0}<br>Exemplu: {1}<br>Exemplu: {2}<br>Exemplu: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"El valor actual nun ye una ID d''usuariu válida. Por favor, introduza un "
+"valor enteru mayor que cero"
+
+msgid "Please enter an integer value > 0"
+msgstr "Por favor, introduza un valor enteru > 0"
+
msgid "URL: "
msgstr "URL: "
@@ -7681,6 +7649,55 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "La URL de consulta de cambeos non ye válida"
+msgid "Only changesets owned by myself"
+msgstr "Namá cambeos realizaos por mi"
+
+msgid "User ID:"
+msgstr "ID Usuariu:"
+
+msgid "User name:"
+msgstr "Nome d''usuariu:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Namá cambeos realizaos pol usuariu col siguiente ID"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "Namá cambeos realizaos pol usuariu col siguiente nome"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Namá cambeos realizaos por mi (non disponible. Agora mesmu JOSM ta "
+"executándose por un usuariu anónimu)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Non puede acutase la consulta del conxuntu de cambeos al usuariu actual por "
+"cuenta de que''l mesmu ye anónimu"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "El valor actual \"{0}\" nun ye válidu pa la ID d´usuariu"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"Nun ye posible acutar la consulta del conxuntu de cambeos al nome d´usuariu "
+"\"{0}\""
+
+msgid "Please enter a valid user ID"
+msgstr "Por favor, introduza un ID d''usuariu válidu"
+
+msgid "Invalid user ID"
+msgstr "ID d''usuariu inválida"
+
+msgid "Please enter a non-empty user name"
+msgstr "Por favor, introduza un nome d''usuariu non valeru"
+
+msgid "Invalid user name"
+msgstr "Nome d''usuariu inválidu"
+
msgid "Activate"
msgstr "Activar"
@@ -8881,6 +8898,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10554,6 +10574,9 @@ msgstr "Direición"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "arquivos Wave Audio (*.wav)"
+
msgid "Import Audio"
msgstr "Importar Audiu"
@@ -10569,9 +10592,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Nun ye posible importar"
-msgid "Wave Audio files (*.wav)"
-msgstr "arquivos Wave Audio (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Marcadores d´audiu dende {0}"
@@ -10684,15 +10704,6 @@ msgstr "(La URL yera: "
msgid "Select the map painting styles"
msgstr "Seleciones Estilu de Mapa de imagenes"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-"Erru al cargar los estilos Mappaint dende ''{0}''. La esceición foi: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr "cargando estilu ''{0}''..."
@@ -10709,6 +10720,10 @@ msgstr[1] ""
"Atopáronse {0} erros al tratar de cargar esti estilu. Pulsie ''Info'' nel "
"menú emerxente al pulsiar col botón derechu del mure pa más detalles."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+"Erru al cargar los estilos Mappaint dende ''{0}''. La esceición foi: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Erru al analizar los estilos Mappaint dende ''{0}''. L´erru foi: {1}"
@@ -11845,6 +11860,9 @@ msgstr ""
msgid "Track date"
msgstr "Fecha de traza"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Color únicu (pue ser personalizáu pa les capes nomaes)"
@@ -11857,6 +11875,18 @@ msgstr "Bicicleta"
msgid "Foot"
msgstr "Pie"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Monte natural"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Crear marcadores al lleer l''arquivu GPX"
@@ -11869,6 +11899,9 @@ msgstr "Gama de colores dinámica basada nes llendes de los datos"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Gráficos GPX anidiaos (antialiasing)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11941,6 +11974,11 @@ msgstr ""
"menos definíos."
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11964,10 +12002,17 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "Puntos de color y segmentos de rutes pola so fecha y hora."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
"Dexar afaer el color de trazar según les distintes velocidaes medies."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Coloriáu de traza y puntu"
@@ -13279,6 +13324,12 @@ msgstr "Verifica que nun haya erros n''oxetos relixosos"
msgid "Checks for errors on relations"
msgstr "Verifica que nun haya erros nes relaciones"
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr "Etiquetes innecesaries"
@@ -14436,6 +14487,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Guardar nome d''usuariu y contraseña (ensin cifrar)"
+msgid "Assume"
+msgstr "Asumir"
+
+msgid "Existing values"
+msgstr "Valores esistentes"
+
msgid "<delete from {0} objects>"
msgstr "<esaniciar dende {0} oxetos>"
@@ -14457,12 +14514,6 @@ msgstr "Añedir les etiquetes verificaes a los oxetos escoyíos"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Mayús+Enter: añede toles etiquetes a los oxetos escoyíos"
-msgid "Assume"
-msgstr "Asumir"
-
-msgid "Existing values"
-msgstr "Valores esistentes"
-
msgid "Enable the checkbox to accept the value"
msgstr "Active''l caxellu p''aceptar el valor"
@@ -15642,6 +15693,9 @@ msgstr "Añediendo certificáu localhost de JOSM a {0} almacén de claves."
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr "Conflictu d´atayu silenciosu: ''{0}'' movíu por ''{1}'' a ''{2}''."
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "Esta etiqueta {0} foi atopada nel búfer, esto ye sospechosu!"
@@ -16155,13 +16209,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -16185,8 +16242,11 @@ msgstr "Hike & Bike"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Camboya, Laos, Tailandia, Vietnam bilingüe"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (superposición)"
@@ -16236,7 +16296,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -16245,10 +16305,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -16284,6 +16356,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -16329,10 +16407,16 @@ msgstr "VoGIS: Flächenwidmungsplan"
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -16368,14 +16452,32 @@ msgstr ""
msgid "TEC bus lines (2014)"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
msgstr ""
msgid "IBGE Mapa de Setores Urbanos"
msgstr "IBGE Mapa de Setores Urbanos"
-msgid "IBGE Mapa de Setores Rurais"
-msgstr "IBGE Mapa de Setores Rurais"
+msgid "IBGE Mapa de Setores Rurais"
+msgstr "IBGE Mapa de Setores Rurais"
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
msgid "Geobase Hydrography"
msgstr "Xeobase d''Hidrografía"
@@ -16389,12 +16491,34 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "British Columbia Mosaic"
+msgid "Latest southwest British Columbia Landsat"
+msgstr ""
+
msgid "Kelowna 2012"
msgstr ""
msgid "Kelowna Roads overlay"
msgstr ""
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr ""
+
msgid "Czech CUZK:KM"
msgstr "Czech CUZK:KM"
@@ -16431,6 +16555,12 @@ msgstr "Stevns (Denmark)"
msgid "Vejmidte (Denmark)"
msgstr "Vejmidte (Denmark)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Estonia Basemap (Maaamet)"
@@ -16464,9 +16594,6 @@ msgstr "Catastru"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -16525,9 +16652,6 @@ msgstr ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
"- 1 m"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Sorbian Language)"
-
msgid "Hamburg (40 cm)"
msgstr "Hamburg (40 cm)"
@@ -16555,9 +16679,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16592,9 +16713,54 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Drone Imagery (Haiti)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone Imagery 2014 (Haiti)"
@@ -16631,19 +16797,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -16706,9 +16881,21 @@ msgstr "PCN 2012 - Italy"
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "USSR - Latvia"
@@ -16742,12 +16929,34 @@ msgstr "Niger Delta Oct 2012 Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Gaza Strip - Pléiades - 2014/07/06"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
@@ -16874,9 +17083,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Zabrze: Ortofotomapa 2011 (aerial image)"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Szlaki (paths)"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -16886,6 +17092,20 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Car"
@@ -16907,12 +17127,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr "South Africa CD:NGI Aerial"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr "Catastro Spain"
@@ -16934,6 +17172,9 @@ msgstr "IDEIB - Balearic Islands"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Canary Islands"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Kanton Aargau 25cm (AGIS 2011)"
@@ -16976,6 +17217,9 @@ msgstr "Canton de Fribourg 50cm (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -16997,6 +17241,12 @@ msgstr "Bonvillars Orthophoto 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Fiez Orthophoto 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -17012,6 +17262,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "MSR Maps Topo"
@@ -17039,9 +17292,54 @@ msgstr "NC Latest Orthoimagery"
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ukraine - Orthophotomaps 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -17063,9 +17361,6 @@ msgstr "Surrey Air Survey"
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Scotland 1842-82"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -17075,9 +17370,6 @@ msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25k historic (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "OS 1:25k historic (OSM-Limited)"
@@ -17410,7 +17702,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr "Crea una cuadrícula de viales"
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -17515,6 +17807,9 @@ msgstr "Cenciella ferramienta pa etiquetar númberos de cases."
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "Xenera imagen XML a partir de les llendes d''un multipolígono"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -20007,6 +20302,9 @@ msgstr "Regueru o regatu"
msgid "River"
msgstr "Ríu"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Canal"
@@ -21063,6 +21361,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Cabaña o bungalow"
@@ -21129,6 +21433,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Establecimientu de comida rápida"
@@ -22074,31 +22384,19 @@ msgstr "xoril d''observación de vida selvaxe"
msgid "Hunting Stand"
msgstr "Puestu de caza"
-msgid "Height"
-msgstr "Altor"
-
-msgctxt "height"
-msgid "low"
-msgstr "baxa"
-
-msgctxt "height"
-msgid "half"
-msgstr "media"
-
-msgctxt "height"
-msgid "full"
-msgstr "completa"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
-msgstr "Esclusa"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -22690,6 +22988,10 @@ msgid "hut"
msgstr "cabaña"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr "habitación"
@@ -23985,6 +24287,9 @@ msgstr "Carnicería"
msgid "Seafood"
msgstr "Pescadería o marisquería"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Delicatessen"
@@ -24807,9 +25112,6 @@ msgstr "Filera d''árboles"
msgid "A line of trees."
msgstr "Una filera d''árboles"
-msgid "Wood"
-msgstr "Monte natural"
-
msgid "Woodland where timber production does not dominate use."
msgstr "Área forestada onde la producción de lleña nun apodera l''usu."
@@ -25869,6 +26171,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0} ta obsoleto"
@@ -25964,6 +26269,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -26040,6 +26351,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} tendría de tar nel nodo onde {1} y {2} s´intersecten"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "nome de cai embrivíu"
@@ -26064,6 +26380,9 @@ msgstr "{0} utilizar con {1}"
msgid "street name contains ss"
msgstr "nome de cai contien ss"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -26876,6 +27195,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -26918,7 +27247,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -27841,6 +28170,9 @@ msgstr "Escueya una área (por casu, construcción) d''una imaxe subxacente."
msgid "Area Selector"
msgstr "Selector d''Área"
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr "Área creada"
@@ -27885,8 +28217,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -29595,6 +29927,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Abrir arquivu de XML d''imaxe aérea"
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr "Capa de Calibración"
@@ -31909,9 +32300,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -32071,9 +32459,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr "[interrupción]"
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "Patrones de ruta..."
@@ -32131,6 +32516,9 @@ msgstr "llau de la manzorga"
msgid "Maximum distance from route"
msgstr "Distancia máxima dende l''itinerariu"
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "Tresporte públicu: camudar tipu de parada"
@@ -32332,10 +32720,6 @@ msgstr "Reconstruyir polígonu"
msgid "Multipolygon must consist only of ways"
msgstr "El multipolígonu tien de tar compuestu namá de víes"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-"La reconstrucción de polígonos pue ser fecha namá a partir de víes esteriores"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Reconstruyir polígonos a partir de la relación {0}"
diff --git a/i18n/po/az.po b/i18n/po/az.po
index 4f3ba5e..cc5db4f 100644
--- a/i18n/po/az.po
+++ b/i18n/po/az.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2016-11-06 22:51+0100\n"
-"PO-Revision-Date: 2013-01-12 17:56+0000\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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"
"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: 2016-11-07 04:34+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:37+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -61,9 +61,15 @@ msgid "Building main menu"
msgstr ""
msgid "Help"
+msgstr "Kömək"
+
+msgid "Initializing internal boundaries data"
msgstr ""
msgid "Initializing OSM API"
+msgstr "OSM API-nin inisalizasiyası"
+
+msgid "Initializing internal traffic data"
msgstr ""
msgid "Initializing validator"
@@ -109,10 +115,10 @@ msgid "Version {0}"
msgstr ""
msgid "Last change at {0}"
-msgstr ""
+msgstr "Son dəyişiklik {0} edilib"
msgid "Java Version {0}"
-msgstr ""
+msgstr "Java Versiyası {0}"
msgid "Homepage"
msgstr ""
@@ -200,6 +206,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -221,12 +233,6 @@ msgstr ""
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -707,6 +713,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -728,9 +737,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -781,6 +787,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -930,16 +939,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -948,6 +957,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -963,12 +978,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1761,9 +1770,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3949,9 +3955,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3981,12 +3984,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4679,12 +4697,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4701,8 +4725,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5023,9 +5047,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5164,82 +5185,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5405,6 +5350,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5464,7 +5485,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6856,212 +6877,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8167,6 +8188,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9653,6 +9677,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9665,9 +9692,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9764,14 +9788,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9784,6 +9800,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10772,6 +10791,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10784,6 +10806,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10796,6 +10830,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10855,6 +10892,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10873,9 +10915,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12070,6 +12119,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13105,6 +13160,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13126,12 +13187,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14091,6 +14146,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14579,13 +14637,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14609,7 +14670,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14660,7 +14724,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14669,10 +14733,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14708,6 +14784,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14753,10 +14835,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14789,34 +14877,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14855,6 +14983,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14888,9 +15022,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14947,9 +15078,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14977,9 +15105,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15013,9 +15138,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15052,19 +15222,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15127,9 +15306,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15163,12 +15354,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15295,9 +15508,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15307,6 +15517,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15328,12 +15552,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15355,6 +15597,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15397,6 +15642,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15418,6 +15666,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15433,6 +15687,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15460,9 +15717,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15484,9 +15786,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15496,9 +15795,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15810,7 +16106,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15898,6 +16194,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18294,6 +18593,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19342,6 +19644,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19408,6 +19716,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20351,31 +20665,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20967,6 +21269,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22260,6 +22566,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23073,9 +23382,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24120,6 +24426,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24211,6 +24520,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24287,6 +24602,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24311,6 +24631,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25084,6 +25407,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25126,7 +25459,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25929,6 +26262,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25970,8 +26306,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27569,6 +27905,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29730,9 +30125,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29890,9 +30282,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29950,6 +30339,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30147,9 +30539,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/be.po b/i18n/po/be.po
index 1a1d754..df93cc9 100644
--- a/i18n/po/be.po
+++ b/i18n/po/be.po
@@ -10,17 +10,17 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-06 22:51+0100\n"
-"PO-Revision-Date: 2016-09-21 19:41+0000\n"
-"Last-Translator: Viktar Palstsiuk <Unknown>\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
+"PO-Revision-Date: 2016-11-30 18:58+0000\n"
+"Last-Translator: Viktar Palsciuk <Unknown>\n"
"Language-Team: Belarusian <i18n at mova.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%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: 2016-11-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:39+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: be\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -68,9 +68,15 @@ msgstr "Стварэнне асноўнага меню"
msgid "Help"
msgstr "Даведка"
+msgid "Initializing internal boundaries data"
+msgstr "Ініцыялізацыя ўнутраных даных пра межы"
+
msgid "Initializing OSM API"
msgstr "Ініцыялізацыя OSM API"
+msgid "Initializing internal traffic data"
+msgstr "Ініцыялізацыя ўнутраных даных пра дарожны рух"
+
msgid "Initializing validator"
msgstr "Iніцыялізацыя валідатара"
@@ -214,6 +220,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr "Вылучыць на карце аб’екты, абраныя ў спісе уверсе."
+msgid "Select WMS layers"
+msgstr "Выбраць WMS пласт"
+
+msgid "Add layers"
+msgstr "Дадаць пласт"
+
msgid "Add imagery layer {0}"
msgstr "Дадаць пласт здымка {0}"
@@ -235,12 +247,6 @@ msgstr "Памылка"
msgid "Select image format for WMS layer"
msgstr "Выберыце фармат малюнка для WMS пласта"
-msgid "Select WMS layers"
-msgstr "Выбраць WMS пласт"
-
-msgid "Add layers"
-msgstr "Дадаць пласт"
-
msgid "Add Node..."
msgstr "Дадаць ноду..."
@@ -754,6 +760,9 @@ msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
"Адкрывае дыялогавае акно, якое дазваляе перайсці да вызначанай мясцовасці"
+msgid "Jump to Position"
+msgstr "Перайсці да пазіцыі"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Каб перайсці - задайце шырату/даўгату месца"
@@ -775,9 +784,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Перайсці туды"
-msgid "Jump to Position"
-msgstr "Перайсці да пазіцыі"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Немагчыма распарсіць шырату/даўгату/павялічэнне - Праверце калі-ласка."
@@ -834,6 +840,9 @@ msgstr "Зліць пласт"
msgid "Merge the current layer into another layer"
msgstr "Зліць гэты пласт у другі"
+msgid "{0} completed in {1}"
+msgstr "{0} завершана за {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Аб’яднанне пластоў з рознымі палітыкамі перадачы на сервер"
@@ -1011,24 +1020,30 @@ msgstr[2] "Адкрыццё {0} файлаў ..."
msgid "Opening file ''{0}'' ..."
msgstr "Файл \"{0}\" адкрываецца.."
+msgid "Which tasks to perform?"
+msgstr "Што трэба зрабіць?"
+
+msgid "Ok"
+msgstr "Ok"
+
msgid "Open Location..."
msgstr "Адкрыць месца..."
msgid "Open an URL."
msgstr "Адкрыць URL."
-msgid "Separate Layer"
-msgstr "Асобны пласт"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Ці трэба каб дадзеныя былі запампаваны на асобны пласт"
-
msgid "Enter URL to download:"
msgstr "Пазначце URL для запампоўкі:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Пазначце URL дзе ёсць дадзеныя для запампоўкі"
+msgid "Separate Layer"
+msgstr "Асобны пласт"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Ці трэба каб дадзеныя былі запампаваны на асобны пласт"
+
msgid "Download Location"
msgstr "Знаходжанне запампоўкі"
@@ -1044,12 +1059,6 @@ msgstr "Спыніць запампоўку і закрыць дыялог"
msgid "Download Data"
msgstr "Запампаваць дадзеныя"
-msgid "Which tasks to perform?"
-msgstr "Што трэба зрабіць?"
-
-msgid "Ok"
-msgstr "Ok"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1919,9 +1928,6 @@ msgstr "Запытаць і запампаваць з сервера пакет
msgid "Errors during download"
msgstr "Памылкі пры запампоўцы з сервера"
-msgid "Download Geo URL"
-msgstr "Спампаваць Geo URL"
-
msgid "Download GPS"
msgstr "Спампаваць GPS дадзеныя"
@@ -4144,10 +4150,10 @@ msgid "Crossing barriers"
msgstr "Скрыжаванне бар’ераў"
msgid "Self crossing"
-msgstr ""
+msgstr "Самаперасячэнне"
msgid "Self-crossing ways"
-msgstr ""
+msgstr "Лініі з самаперасячэннем"
msgid ""
"This test checks if two roads, railways, waterways or buildings crosses in "
@@ -4333,9 +4339,6 @@ msgstr "Лінія стылю \"палігон\" не замкнёна"
msgid "No outer way for multipolygon"
msgstr "У мультыпалігона адсутнічае знешняя лінія"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "Роля для ''{0}'' павінна быць ''{1}''"
-
msgid "No area style for multipolygon"
msgstr "Адсутнічае стыль вобласці для мультыпалігона"
@@ -4376,12 +4379,27 @@ msgstr "Стыль вобласці на вонкавай лініі"
msgid "Multipolygon is not closed"
msgstr "Мультыпалігон не замкнёны"
-msgid "Multipolygon inner way is outside"
-msgstr "Унутраная лінія мультыпалігона знаходзіцца за яго межамі"
+msgid "Multipolygon rings share node(s)"
+msgstr "Контуры мультыпалігона маюць агульныя пункты"
msgid "Intersection between multipolygon ways"
msgstr "Скрыжаванне паміж лініямі мультыпалігона"
+msgid "Multipolygon rings are equal"
+msgstr "Контуры мультыпалігона аднолькавыя"
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "Роля для ''{0}'' павінна быць ''{1}''"
+
+msgid "Multipolygon inner way is outside"
+msgstr "Унутраная лінія мультыпалігона знаходзіцца за яго межамі"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr "Контур мультыпалігона ўтрымвае адзін і той жа сегмент двойчы"
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr "Вонкавая лінія мультыпалігона мае агульныя сегменты з іншым контурам"
+
msgid "No useful role for multipolygon member"
msgstr "Роля для ўдзельніка мультыпалігона зададзена няўдала"
@@ -4389,10 +4407,10 @@ msgid "Non-Way in multipolygon"
msgstr "Ня-лінія ў мультыпалігоне"
msgid "Multipolygon member(s) repeated with different role"
-msgstr ""
+msgstr "Паўторныя ўдзельнікі мультыпалігона з рознымі ролямі"
msgid "Multipolygon member(s) repeated with same role"
-msgstr ""
+msgstr "Паўторныя ўдзельнікі мультыпалігона з адной роллю"
msgid "Missing name:* translation"
msgstr "Адсутны пераклад name:*"
@@ -5098,12 +5116,18 @@ msgstr "Адключыць доступ да паказаных рэсурсаў
msgid "options provided as Java system properties"
msgstr "сістэмныя налады Java"
+msgid "Change the JOSM directory name"
+msgstr "Змяніць імя каталога JOSM"
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/PATH/TO/JOSM/PREF "
msgid "Set the preferences directory"
msgstr "Паказаць каталог налад"
+msgid "Default: {0}"
+msgstr "Па змаўчанні: {0}"
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/PATH/TO/JOSM/USERDATA"
@@ -5120,10 +5144,10 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/PATH/TO/JOSM/HOMEDIR "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Перамясціць усё 3 каталога ў homedir. Каталог кэша будзе ў homedir/cache"
+"Задаць каталог налад+даных+кэша (каталогам кэша будзе josm.home/cache)"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5478,9 +5502,6 @@ msgstr "Націсніце, для запуску задачы ў фонавым
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} завершана за {1}"
-
msgid "Enlarge"
msgstr "Пашырыць"
@@ -5626,6 +5647,192 @@ msgstr "Фон канфлікту: прыбраць удзельніка"
msgid "Conflict foreground: remove member"
msgstr "Пярэдні план канфлікту: прыбраць удзельніка"
+msgid "{0} more..."
+msgstr "Яшчэ {0} ..."
+
+msgid ""
+"The following objects could not be copied to the target object<br>because "
+"they are deleted in the target dataset:"
+msgstr ""
+"Наступныя аб’екты не могуць быць скапіяваны ў мэтавы аб’ект<br>бо яны былі "
+"выдалены ў мэтавым наборы дадзеных:"
+
+msgid "Merging deleted objects failed"
+msgstr "Памылка аб’яднання выдаленых аб’ектаў"
+
+msgid "List in role {0} is currently not participating in a compare pair."
+msgstr "Спіс у ролі {0} ў сапраўдны момант не ўдзельнічае ў параўнанні пары."
+
+msgid "Unexpected value of parameter ''index''. Got {0}."
+msgstr "недапушчальнае значэнне параметру \"index\". Бягучае значэнне {0}"
+
+msgid "Item {0} not found in list."
+msgstr "пункт {0} не знойдзены ў спісе"
+
+msgid "lock scrolling"
+msgstr "блакаваць прагортку"
+
+msgid "Compare "
+msgstr "Параўнаць "
+
+msgid "My version"
+msgstr "Мая версія"
+
+msgid "List of elements in my dataset, i.e. the local dataset"
+msgstr ""
+"Спіс элементаў у маім наборы дадзеных, гэта значыць лакальным наборы дадзеных"
+
+msgid "Merged version"
+msgstr "Аб’яднаная версія"
+
+msgid ""
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
+"Спіс аб''яднаных элементаў. Параметры ў маіх элементах будуць замененыя пры "
+"ўжыванні аб''яднання."
+
+msgid "Their version"
+msgstr "Іх версія"
+
+msgid "List of elements in their dataset, i.e. the server dataset"
+msgstr "Спіс элементаў у іх наборы дадзеных, набор дадзеных на серверы"
+
+msgid "> top"
+msgstr "> наверх"
+
+msgid "Copy my selected nodes to the start of the merged node list"
+msgstr "Скапіяваць вылучаныя пункты ў пачатак спісу аб’яднаных пунктаў"
+
+msgid "> bottom"
+msgstr "> уніз"
+
+msgid "Copy my selected elements to the end of the list of merged elements."
+msgstr "Скапіяваць выдзеленыя элементы ў канец спісу аб’яднаных элементаў"
+
+msgid "> before"
+msgstr "> перад"
+
+msgid ""
+"Copy my selected elements before the first selected element in the list of "
+"merged elements."
+msgstr ""
+"Скапіяваць вылучаныя элементы перад першым вылучаным элементам у спісе "
+"аб''яднаных элементаў"
+
+msgid "> after"
+msgstr "> пасля"
+
+msgid ""
+"Copy my selected elements after the first selected element in the list of "
+"merged elements."
+msgstr ""
+"Скапіяваць мае вылучаныя элементы пасля першага вылучанага элемента ў спісе "
+"аб''яднаных элементаў"
+
+msgid "< top"
+msgstr "< угару"
+
+msgid ""
+"Copy their selected element to the start of the list of merged elements."
+msgstr ""
+"Скапіяваць іх выдзеленыя элементы ў пачатак спісу аб’яднаных элементаў"
+
+msgid "< bottom"
+msgstr "< уніз"
+
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
+msgstr "Скапіяваць іх выдзеленыя элементы ў канец спісу аб’яднаных элементаў"
+
+msgid "< before"
+msgstr "< перад"
+
+msgid ""
+"Copy their selected elements before the first selected element in the list "
+"of merged elements."
+msgstr ""
+"Скапіяваць іх выдзеленыя элементы перад першым вылучаным элементам у спісе "
+"аб’яднаных элементаў"
+
+msgid "< after"
+msgstr "< пасля"
+
+msgid ""
+"Copy their selected element after the first selected element in the list of "
+"merged elements"
+msgstr ""
+"Скапіяваць іх вылучаныя элементы пасля першага вылучанага элемента ў спісе "
+"аб’яднаных элементаў"
+
+msgid "Copy all my elements to the target"
+msgstr "Скапіяваць усе мае элементы ў месца прызначэння"
+
+msgid "Copy all their elements to the target"
+msgstr "Скапіяваць усе чужыя элементы ў месца прызначэння"
+
+msgid "Up"
+msgstr "Угару"
+
+msgid "Move up the selected entries by one position."
+msgstr "Перамясціць вылучаныя запісы ўгару на адну пазіцыю."
+
+msgid "Down"
+msgstr "Уніз"
+
+msgid "Move down the selected entries by one position."
+msgstr "Апусціць вылучаныя элементы на адну пазіцыю"
+
+msgid "Remove"
+msgstr "Выдаліць"
+
+msgid "Remove the selected entries from the list of merged elements."
+msgstr "Выдаліць вылучаныя запісы са спісу аб’яднаных элементаў"
+
+msgid "Freeze"
+msgstr "Заблакаваць"
+
+msgid "Freeze the current list of merged elements."
+msgstr "Заблакаваць бягучы спіс аб’яднаных элементаў"
+
+msgid "Unfreeze"
+msgstr "Разблакаваць"
+
+msgid "Unfreeze the list of merged elements and start merging."
+msgstr "Разблакаваць спіс аб’яднаных элементаў і пачаць аб’яднанне"
+
+msgid ""
+"<html>Click <strong>{0}</strong> to start merging my and their "
+"entries.</html>"
+msgstr ""
+"<html>Націсніце <strong>{0}</strong>, каб пачаць аб’яднанне маіх і іх "
+"запісаў</html>"
+
+msgid ""
+"<html>Click <strong>{0}</strong> to finish merging my and their "
+"entries.</html>"
+msgstr ""
+"<html>Націсніце <strong>{0}</strong>, каб скончыць аб’яднанне маіх і іх "
+"запісаў</html>"
+
+msgid "My version ({0} entry)"
+msgid_plural "My version ({0} entries)"
+msgstr[0] "Мая версія ({0} запіс)"
+msgstr[1] "Мая версія ({0} запісы)"
+msgstr[2] "Мая версія ({0} запісаў)"
+
+msgid "Merged version ({0} entry)"
+msgid_plural "Merged version ({0} entries)"
+msgstr[0] "Аб’яднаная версія ({0} запіс)"
+msgstr[1] "Аб’яднаная версія ({0} запісы)"
+msgstr[2] "Аб’яднаная версія ({0} запісаў)"
+
+msgid "Their version ({0} entry)"
+msgid_plural "Their version ({0} entries)"
+msgstr[0] "Іх версія ({0} запіс)"
+msgstr[1] "Іх версія ({0} запісаў)"
+msgstr[2] "Іх версія ({0} запісаў)"
+
msgid "My with Their"
msgstr "Маю з іх"
@@ -5708,192 +5915,6 @@ msgstr "Канфлікты ўласцівасцяў, якія чакаюць в
msgid "Conflict Resolution"
msgstr "Канфлікт у дазволе малюнка"
-msgid "{0} more..."
-msgstr "Яшчэ {0} ..."
-
-msgid ""
-"The following objects could not be copied to the target object<br>because "
-"they are deleted in the target dataset:"
-msgstr ""
-"Наступныя аб’екты не могуць быць скапіяваны ў мэтавы аб’ект<br>бо яны былі "
-"выдалены ў мэтавым наборы дадзеных:"
-
-msgid "Merging deleted objects failed"
-msgstr "Памылка аб’яднання выдаленых аб’ектаў"
-
-msgid "List in role {0} is currently not participating in a compare pair."
-msgstr "Спіс у ролі {0} ў сапраўдны момант не ўдзельнічае ў параўнанні пары."
-
-msgid "Unexpected value of parameter ''index''. Got {0}."
-msgstr "недапушчальнае значэнне параметру \"index\". Бягучае значэнне {0}"
-
-msgid "Item {0} not found in list."
-msgstr "пункт {0} не знойдзены ў спісе"
-
-msgid "lock scrolling"
-msgstr "блакаваць прагортку"
-
-msgid "Compare "
-msgstr "Параўнаць "
-
-msgid "My version"
-msgstr "Мая версія"
-
-msgid "List of elements in my dataset, i.e. the local dataset"
-msgstr ""
-"Спіс элементаў у маім наборы дадзеных, гэта значыць лакальным наборы дадзеных"
-
-msgid "Merged version"
-msgstr "Аб’яднаная версія"
-
-msgid ""
-"List of merged elements. They will replace the list of my elements when the "
-"merge decisions are applied."
-msgstr ""
-"Спіс аб''яднаных элементаў. Параметры ў маіх элементах будуць замененыя пры "
-"ўжыванні аб''яднання."
-
-msgid "Their version"
-msgstr "Іх версія"
-
-msgid "List of elements in their dataset, i.e. the server dataset"
-msgstr "Спіс элементаў у іх наборы дадзеных, набор дадзеных на серверы"
-
-msgid "> top"
-msgstr "> наверх"
-
-msgid "Copy my selected nodes to the start of the merged node list"
-msgstr "Скапіяваць вылучаныя пункты ў пачатак спісу аб’яднаных пунктаў"
-
-msgid "> bottom"
-msgstr "> уніз"
-
-msgid "Copy my selected elements to the end of the list of merged elements."
-msgstr "Скапіяваць выдзеленыя элементы ў канец спісу аб’яднаных элементаў"
-
-msgid "> before"
-msgstr "> перад"
-
-msgid ""
-"Copy my selected elements before the first selected element in the list of "
-"merged elements."
-msgstr ""
-"Скапіяваць вылучаныя элементы перад першым вылучаным элементам у спісе "
-"аб''яднаных элементаў"
-
-msgid "> after"
-msgstr "> пасля"
-
-msgid ""
-"Copy my selected elements after the first selected element in the list of "
-"merged elements."
-msgstr ""
-"Скапіяваць мае вылучаныя элементы пасля першага вылучанага элемента ў спісе "
-"аб''яднаных элементаў"
-
-msgid "< top"
-msgstr "< угару"
-
-msgid ""
-"Copy their selected element to the start of the list of merged elements."
-msgstr ""
-"Скапіяваць іх выдзеленыя элементы ў пачатак спісу аб’яднаных элементаў"
-
-msgid "< bottom"
-msgstr "< уніз"
-
-msgid ""
-"Copy their selected elements to the end of the list of merged elements."
-msgstr "Скапіяваць іх выдзеленыя элементы ў канец спісу аб’яднаных элементаў"
-
-msgid "< before"
-msgstr "< перад"
-
-msgid ""
-"Copy their selected elements before the first selected element in the list "
-"of merged elements."
-msgstr ""
-"Скапіяваць іх выдзеленыя элементы перад першым вылучаным элементам у спісе "
-"аб’яднаных элементаў"
-
-msgid "< after"
-msgstr "< пасля"
-
-msgid ""
-"Copy their selected element after the first selected element in the list of "
-"merged elements"
-msgstr ""
-"Скапіяваць іх вылучаныя элементы пасля першага вылучанага элемента ў спісе "
-"аб’яднаных элементаў"
-
-msgid "Copy all my elements to the target"
-msgstr "Скапіяваць усе мае элементы ў месца прызначэння"
-
-msgid "Copy all their elements to the target"
-msgstr "Скапіяваць усе чужыя элементы ў месца прызначэння"
-
-msgid "Up"
-msgstr "Угару"
-
-msgid "Move up the selected entries by one position."
-msgstr "Перамясціць вылучаныя запісы ўгару на адну пазіцыю."
-
-msgid "Down"
-msgstr "Уніз"
-
-msgid "Move down the selected entries by one position."
-msgstr "Апусціць вылучаныя элементы на адну пазіцыю"
-
-msgid "Remove"
-msgstr "Выдаліць"
-
-msgid "Remove the selected entries from the list of merged elements."
-msgstr "Выдаліць вылучаныя запісы са спісу аб’яднаных элементаў"
-
-msgid "Freeze"
-msgstr "Заблакаваць"
-
-msgid "Freeze the current list of merged elements."
-msgstr "Заблакаваць бягучы спіс аб’яднаных элементаў"
-
-msgid "Unfreeze"
-msgstr "Разблакаваць"
-
-msgid "Unfreeze the list of merged elements and start merging."
-msgstr "Разблакаваць спіс аб’яднаных элементаў і пачаць аб’яднанне"
-
-msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
-msgstr ""
-"<html>Націсніце <strong>{0}</strong>, каб пачаць аб’яднанне маіх і іх "
-"запісаў</html>"
-
-msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
-msgstr ""
-"<html>Націсніце <strong>{0}</strong>, каб скончыць аб’яднанне маіх і іх "
-"запісаў</html>"
-
-msgid "My version ({0} entry)"
-msgid_plural "My version ({0} entries)"
-msgstr[0] "Мая версія ({0} запіс)"
-msgstr[1] "Мая версія ({0} запісы)"
-msgstr[2] "Мая версія ({0} запісаў)"
-
-msgid "Merged version ({0} entry)"
-msgid_plural "Merged version ({0} entries)"
-msgstr[0] "Аб’яднаная версія ({0} запіс)"
-msgstr[1] "Аб’яднаная версія ({0} запісы)"
-msgstr[2] "Аб’яднаная версія ({0} запісаў)"
-
-msgid "Their version ({0} entry)"
-msgid_plural "Their version ({0} entries)"
-msgstr[0] "Іх версія ({0} запіс)"
-msgstr[1] "Іх версія ({0} запісаў)"
-msgstr[2] "Іх версія ({0} запісаў)"
-
msgid "Node"
msgstr "Кропка"
@@ -5959,10 +5980,8 @@ msgstr "Роля"
msgid "Primitive"
msgstr "Элемент"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"Аб’яднаныя пункты яшчэ не заблакаваныя. Немагчыма пабудаваць каманду "
-"ліквідацыі канфліктаў"
msgid "<undefined>"
msgstr "<не вызначана>"
@@ -7020,7 +7039,7 @@ msgid "Sort"
msgstr "Сартаваць"
msgid "Open the note in an external browser"
-msgstr ""
+msgstr "Адкрыць нататку ў вонкавым браўзары"
msgid "Object type:"
msgstr "Тып аб’екта"
@@ -7272,12 +7291,13 @@ msgid "Download the content of the selected changesets from the server"
msgstr "Запампаваць з сервера змесціва вылучаных пакетаў правак"
msgid "Download changed objects"
-msgstr ""
+msgstr "Спампаваць змененыя аб''екты"
msgid ""
"Download the current version of the changed objects in the selected "
"changesets"
msgstr ""
+"Спампаваць бягучую версію змененых аб''ектаў у абраных пакетах правак"
msgid "My changesets"
msgstr "Мае пакеты правак"
@@ -7490,102 +7510,6 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr "Абраць пакеты правак у паказаных межах"
-msgid "Query open changesets only"
-msgstr "Запытаць толькі адкрытыя пакеты правак"
-
-msgid "Query closed changesets only"
-msgstr "Запытаць толькі зачыненыя пакеты правак"
-
-msgid "Query both open and closed changesets"
-msgstr "Запытаць адкрытыя і зачыненыя пакеты правак"
-
-msgid "Only changesets owned by myself"
-msgstr "Толькі мае пакеты правак"
-
-msgid "User ID:"
-msgstr "ID карыстальніка:"
-
-msgid "User name:"
-msgstr "Імя карыстальніка:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Толькі пакеты правак карыстальніка з ідэнтыфікатарам"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "Толькі пакеты правак карыстальніка з імем"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Толькі мае пакеты правак (адключана. JOSM цяпер запушчаны ананімным "
-"карыстальнікам)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Немагчыма абраць пакеты правак бягучага карыстальніка, паколькі бягучы "
-"карыстальнік - ананімны"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "Няслушнае бягучае значэнне ''{0}'' для ID карыстальніка"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"Немагчыма абмежаваць запыт пакета правак для карыстальніка з імем ''{0}''"
-
-msgid "Please enter a valid user ID"
-msgstr "Калі ласка, увядзіце правільны ID карыстальніка"
-
-msgid "Invalid user ID"
-msgstr "Няслушны ID карыстальніка"
-
-msgid "Please enter a non-empty user name"
-msgstr "Калі ласка, увядзіце імя карыстальніка"
-
-msgid "Invalid user name"
-msgstr "Няслушнае імя карыстальніка"
-
-msgid "Date: "
-msgstr "Дата: "
-
-msgid "Time:"
-msgstr "Час:"
-
-msgid "Closed after - "
-msgstr "Зачынены пасля - "
-
-msgid "Date:"
-msgstr "Дата:"
-
-msgid "Created before - "
-msgstr "Створаны да - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Толькі пакеты правак, зачыненыя пасля даты/чакай"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-"Толькі пакеты правак, закрытыя пасля і адкрытыя да названай даты/часу"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"Немагчыма выканаць запыт пакета правак на аснове абмежаванняў па часе. "
-"Уведзена няслушнае значэнне."
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr ""
-"<html>Калі ласка, задайце правільныя значэнні для даты/часу, каб "
-"абмежаваць<br>запыт зададзеным часавым інтэрвалам.</html>"
-
-msgid "Invalid date/time values"
-msgstr "Няслушныя значэнні даты/часу"
-
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
"invalid."
@@ -7602,29 +7526,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Няслушная мяжа выбару"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"Бягучае значэнне гэта няслушны ID карыстальніка. Калі ласка, увядзіце цэлае "
-"значэнне > 0"
-
-msgid "Please enter an integer value > 0"
-msgstr "Увядзіце цэлы лік > 0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Калі ласка, увядзіце дату ў звычайным фармаце для вашага "
-"рэгіёна.<br>Прыклад: {0}<br>Прыклад: {1}<br>Прыклад: {2}<br>Прыклад: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Калі ласка, увядзіце правільны час у звычайным фармаце для вашага "
-"рэгіёна.<br>Прыклад: {0}<br>Прыклад: {1}<br>Прыклад: {2}<br>Прыклад: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Запампаваць з сервера толькі мае пакеты правак"
@@ -7714,6 +7615,77 @@ msgstr "Няслушны URL для запыту пакета правак"
msgid "Close the dialog and abort querying of changesets"
msgstr "Зачыніць дыялог і спыніць фармаванне запытаў пакетаў правак"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Калі ласка, увядзіце дату ў звычайным фармаце для вашага "
+"рэгіёна.<br>Прыклад: {0}<br>Прыклад: {1}<br>Прыклад: {2}<br>Прыклад: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Запытаць толькі адкрытыя пакеты правак"
+
+msgid "Query closed changesets only"
+msgstr "Запытаць толькі зачыненыя пакеты правак"
+
+msgid "Query both open and closed changesets"
+msgstr "Запытаць адкрытыя і зачыненыя пакеты правак"
+
+msgid "Date: "
+msgstr "Дата: "
+
+msgid "Time:"
+msgstr "Час:"
+
+msgid "Closed after - "
+msgstr "Зачынены пасля - "
+
+msgid "Date:"
+msgstr "Дата:"
+
+msgid "Created before - "
+msgstr "Створаны да - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Толькі пакеты правак, зачыненыя пасля даты/чакай"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+"Толькі пакеты правак, закрытыя пасля і адкрытыя да названай даты/часу"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Немагчыма выканаць запыт пакета правак на аснове абмежаванняў па часе. "
+"Уведзена няслушнае значэнне."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Калі ласка, задайце правільныя значэнні для даты/часу, каб "
+"абмежаваць<br>запыт зададзеным часавым інтэрвалам.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Няслушныя значэнні даты/часу"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Калі ласка, увядзіце правільны час у звычайным фармаце для вашага "
+"рэгіёна.<br>Прыклад: {0}<br>Прыклад: {1}<br>Прыклад: {2}<br>Прыклад: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"Бягучае значэнне гэта няслушны ID карыстальніка. Калі ласка, увядзіце цэлае "
+"значэнне > 0"
+
+msgid "Please enter an integer value > 0"
+msgstr "Увядзіце цэлы лік > 0"
+
msgid "URL: "
msgstr "URL: "
@@ -7735,6 +7707,54 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Няправільны URL запыту пакета правак"
+msgid "Only changesets owned by myself"
+msgstr "Толькі мае пакеты правак"
+
+msgid "User ID:"
+msgstr "ID карыстальніка:"
+
+msgid "User name:"
+msgstr "Імя карыстальніка:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Толькі пакеты правак карыстальніка з ідэнтыфікатарам"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "Толькі пакеты правак карыстальніка з імем"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Толькі мае пакеты правак (адключана. JOSM цяпер запушчаны ананімным "
+"карыстальнікам)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Немагчыма абраць пакеты правак бягучага карыстальніка, паколькі бягучы "
+"карыстальнік - ананімны"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "Няслушнае бягучае значэнне ''{0}'' для ID карыстальніка"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"Немагчыма абмежаваць запыт пакета правак для карыстальніка з імем ''{0}''"
+
+msgid "Please enter a valid user ID"
+msgstr "Калі ласка, увядзіце правільны ID карыстальніка"
+
+msgid "Invalid user ID"
+msgstr "Няслушны ID карыстальніка"
+
+msgid "Please enter a non-empty user name"
+msgstr "Калі ласка, увядзіце імя карыстальніка"
+
+msgid "Invalid user name"
+msgstr "Няслушнае імя карыстальніка"
+
msgid "Activate"
msgstr "Актываваць"
@@ -8943,6 +8963,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9337,7 +9360,7 @@ msgstr ""
"Незахаваныя змены - Захаваць лакальна ці перадаць на сервер перад выдаленнем?"
msgid "Unsaved changes - Save/Upload before restarting?"
-msgstr ""
+msgstr "Незахаваныя змены - захаваць/перадаць перад перазапускам?"
msgid "Uploading and saving modified layers ..."
msgstr "Перадача на сервер і захаванне змененых пластоў ..."
@@ -9417,10 +9440,10 @@ msgid "Exit JOSM without saving. Unsaved changes are lost."
msgstr "Выйсці з JOSM без захавання. Незахаваныя змены будуць згублены."
msgid "Restart now!"
-msgstr ""
+msgstr "Перазапусціць зараз!"
msgid "Restart JOSM without saving. Unsaved changes are lost."
-msgstr ""
+msgstr "Перазапусціць JOSM без захавання. Незахаваныя змены будуць страчаны."
msgid "Delete now!"
msgstr "Выдаліць цяпер!"
@@ -9437,10 +9460,12 @@ msgstr ""
"загружаныя на сервер."
msgid "Perform actions before restarting"
-msgstr ""
+msgstr "Выполнить действия перед перезапуском"
msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
msgstr ""
+"Перазапусціць JOSM з захаваннем. Незахаваныя змены будуць перададзены на "
+"сервер і/ці захаваны."
msgid "Perform actions before deleting"
msgstr "Выканаць дзеянні перад выдаленнем"
@@ -10654,6 +10679,9 @@ msgstr "Кірунак"
msgid "Velocity, {0}"
msgstr "Хуткасць, {0}"
+msgid "Wave Audio files (*.wav)"
+msgstr "Аўдыёфайлы Wave (*.wav)"
+
msgid "Import Audio"
msgstr "Імпартаваць аўдыёфайлы"
@@ -10669,9 +10697,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Імпарт немагчымы"
-msgid "Wave Audio files (*.wav)"
-msgstr "Аўдыёфайлы Wave (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Аўдыё маркеры з {0}"
@@ -10785,16 +10810,6 @@ msgstr "(па спасылцы: "
msgid "Select the map painting styles"
msgstr "Абярыце стылі адмалёўкі карты"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "Не атрымалася загрузіць стылі Mappaint з ''{0}''. Памылка: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-"JOSM больш не падтрымлівае стылі mappaint, напісаныя ў старым фармаце XML.\n"
-"Абнавіце ''{0}'' на MapCSS"
-
msgid "loading style ''{0}''..."
msgstr "загрузка стылю ''{0}''..."
@@ -10814,6 +10829,9 @@ msgstr[2] ""
"Адбылося {0} памылак пры загрузцы стылю. Падрабязнасці глядзіце ў пункце "
"\"Інфармацыя\" з кантэкстнага меню."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "Не атрымалася загрузіць стылі Mappaint з ''{0}''. Памылка: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
"Не атрымалася выканаць разбор стыляў Mappaint з ''{0}''. Памылка: {1}"
@@ -11773,7 +11791,7 @@ msgid "Draw segment order numbers"
msgstr "Адлюстроўваць парадкавыя нумары сегментаў"
msgid "Draw segment order numbers on selected way"
-msgstr ""
+msgstr "Паказваць парадкавыя нумары сегментаў на вылучанай лініі"
msgid "Draw boundaries of downloaded data"
msgstr "Адлюстроўваць межы запампаваных дадзеных"
@@ -11919,6 +11937,9 @@ msgstr ""
msgid "Track date"
msgstr "Дата трэка"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Адным колерам (можа быць вызначана для найменных пластоў)"
@@ -11931,6 +11952,18 @@ msgstr "Вела"
msgid "Foot"
msgstr "Пешшу"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Лес"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Стварыць маркеры пры чытанні GPX"
@@ -11943,6 +11976,9 @@ msgstr "Дынамічны каляровы дыяпазон на аснове
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Згладжваць GPX трэкі"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -12011,6 +12047,11 @@ msgid ""
msgstr "Прымяніць згладжванне да GPX ліній, каб палепшыць іх выгляд."
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -12033,9 +12074,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "Размаляваць пункты і сегменты трэка па пазнаках часу."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr "Дазваляе наладжваць афарбоўку трэка для розных сярэдніх хуткасцяў."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Размаляваць трэкі і пункты"
@@ -13353,6 +13401,12 @@ msgstr "Праверка на памылкі рэлігійных аб’ект
msgid "Checks for errors on relations"
msgstr "Праверка памылак у дачыненнях"
+msgid "Territories"
+msgstr "Тэрыторыі"
+
+msgid "Checks for territories-specific features"
+msgstr "Праверка на ўласцівасці, спецыфічныя для асобных тэрыторый"
+
msgid "Unnecessary tags"
msgstr "Непатрэбныя тэгі"
@@ -14505,6 +14559,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Захаваць імя карыстальніка і пароль (не зашыфравана)"
+msgid "Assume"
+msgstr "Прысвоіць"
+
+msgid "Existing values"
+msgstr "Існыя значэнні"
+
msgid "<delete from {0} objects>"
msgstr "<выдаліць з {0} аб’ектаў>"
@@ -14526,12 +14586,6 @@ msgstr "Дадаць пазначаныя тэгі да вылучаных аб
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Enter: дадаць усе тэгі да вылучаных аб’ектаў"
-msgid "Assume"
-msgstr "Прысвоіць"
-
-msgid "Existing values"
-msgstr "Існыя значэнні"
-
msgid "Enable the checkbox to accept the value"
msgstr "Пастаўце сцяжок каб ужыць значэнне"
@@ -15761,6 +15815,9 @@ msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
"Канфлікт камбінацый клавіш: ''{0}'' пераназначаны з ''{1}'' на ''{2}''."
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "У буферы знойдзены {0} тэг, гэта падазрона!"
@@ -16288,14 +16345,17 @@ msgstr "Спадарожнікавыя здымкі Mapbox"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr "Рэльеф ад Thunderforest"
+
msgid "OpenSeaMap"
msgstr "OpenSeaMap"
-msgid "OpenStreetMap Carto (Standard layer)"
-msgstr "OpenStreetMap Carto (стандартны пласт)"
+msgid "OpenStreetMap Carto (Standard)"
+msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik чорна-белы)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr "OpenStreetMap (стандартны чорна-белы)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, без подпісаў)"
@@ -16318,8 +16378,11 @@ msgstr "Hike & Bike"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Камбоджа, Лаос, Тайланд, В''етнам 2-моўная"
+msgid "Stamen Terrain"
+msgstr "Рэльеф ад Stamen"
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr "Камбоджа, Лаос, Тайланд, В''етнам, М''янма (двухмоўная)"
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (аверлэй)"
@@ -16369,8 +16432,8 @@ msgstr "OSM Inspector: Месцы"
msgid "OSM Inspector: Highways"
msgstr "OSM Inspector: Аўтадарогі"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM Inspector: Мультыпалігоны"
+msgid "OSM Inspector: Area"
+msgstr "OSM Inspector: вобласці"
msgid "OSM Inspector: Routing"
msgstr "OSM Inspector: Маршруты"
@@ -16378,11 +16441,24 @@ msgstr "OSM Inspector: Маршруты"
msgid "OSM Inspector: Addresses"
msgstr "OSM Inspector: Адрасы"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM Inspector: Межы (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr "Інспектар OSM: Берагавая лінія (ЕС)"
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr "Здымкі з imagico.de: горны масіў Праклецце"
-msgid "IGN Argentina (WMTS)"
-msgstr "IGN Аргенціна (WMTS)"
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr "Здымкі з imagico.de: «Паўднёвыя» Трансантарктычныя горы"
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr "Здымкі з imagico.de: горы Пенсакала"
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+"Здымкі з imagico.de: выспа Мардвінава (Элефант)/выспа Шышкава (Кларанс)"
+
+msgid "IGN Argentina (TMS)"
+msgstr ""
msgid "IGN Argentina (WMS)"
msgstr "IGN Аргенціна (WMS)"
@@ -16417,6 +16493,12 @@ msgstr "LPI NSW адміністрацыйныя межы дзяржаўных
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr "LPI NSW адміністрацыйныя межы ахоўваных прыродных зон NPWS"
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr "Здымкі з imagico.de: паўночны захад выспы Херд"
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr "Здымкі з imagico.de: узбярэжжа выспы Херд"
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -16436,7 +16518,7 @@ msgid "Tiris: DOM (Surface model)"
msgstr "Tiris: DOM (мадэль паверхні)"
msgid "Tiris: contour lines"
-msgstr ""
+msgstr "Tiris: гарызанталі"
msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr "Вена: шматмэтавая карта (агульнага прызначэння)"
@@ -16462,11 +16544,17 @@ msgstr "VoGIS: Планы"
msgid "VoGIS: Höhen und Gelände"
msgstr "VoGIS: вышыні і рэльеф мясцовасці"
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
-msgstr "AGIV (Фландрыя) найноўшыя аэрафотаздымкі (зіма)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr "Здымкі з imagico.de: горныя масівы Рыла і Пірын"
-msgid "AGIV aerial imagery 10cm 2013-15"
-msgstr "AGIV аэрафота 10 см 2013-15"
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr "AGIV Фландрыя - найноўшыя аэрафотаздымкі"
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
+msgstr "AGIV Фландрыя - аэрафотаздымка 2013-2015, 10см"
+
+msgid "AGIV Flanders GRB"
+msgstr ""
msgid "URBISfr numerical imagery (2013)"
msgstr "URBISfr - лічбавая выява (2013)"
@@ -16501,8 +16589,17 @@ msgstr "SPW(allonie) 2009-2010 аэрафотаздымка"
msgid "TEC bus lines (2014)"
msgstr "TEC аўтобусныя маршруты (2014)"
-msgid "Benin:cotonou_pleiade_2016"
-msgstr "Бенін: Катану, Pleiade 2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr "Бенін: Катану 2016 (Pleiade)"
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr "Здымкі з imagico.de: Катану"
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr "Здымкі з imagico.de: выспа Буве"
msgid "IBGE Mapa de Setores Urbanos"
msgstr "IBGE Карта гарадскіх раёнаў"
@@ -16510,6 +16607,15 @@ msgstr "IBGE Карта гарадскіх раёнаў"
msgid "IBGE Mapa de Setores Rurais"
msgstr "IBGE Карта сельскіх раёнаў"
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Geobase Гідраграфія"
@@ -16522,12 +16628,34 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "Брытанская Калумбія Мазаіка"
+msgid "Latest southwest British Columbia Landsat"
+msgstr "Апошнія здымкі Landsat паўднёвага захаду Брытанскай Калумбіі"
+
msgid "Kelowna 2012"
msgstr "Келоўна 2012"
msgid "Kelowna Roads overlay"
msgstr "Келоўна - оверлэй дарог"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr "Здымкі з imagico.de: усходняе ўзбярэжжа выспы Дэвон"
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr "Здымкі з imagico.de: поўнач выспы Элсмір"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr "Здымкі з imagico.de: выспа Фагу, Каба-Вэрдэ"
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr "Здымкі з imagico.de: выспа Ландандэры"
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr "Здымкі з imagico.de: вулкан Кальбуко"
+
msgid "Czech CUZK:KM"
msgstr "Чэхія CUZK:KM"
@@ -16550,10 +16678,10 @@ msgid "Geodatastyrelsen DTK Kort25"
msgstr "Геададзеныя агенцтва DTK Kort25"
msgid "SDFE Terræn Skyggekort (40 cm)"
-msgstr ""
+msgstr "Данія: адмыўка рэльефу SDFE (40 см)"
msgid "SDFE Overflade Skyggekort (40 cm)"
-msgstr ""
+msgstr "Данія: адмыўка паверхні SDFE (40 см)"
msgid "Geodatastyrelsen Skærmkort"
msgstr "Геададзеныя агенцтва Skærmkort"
@@ -16564,6 +16692,12 @@ msgstr "Стэвнс (Данія)"
msgid "Vejmidte (Denmark)"
msgstr "Vejmidte (Данія)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr "Здымкі з imagico.de: вулкан Алтар"
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Эстонія Базавая карта (Maaamet)"
@@ -16597,9 +16731,6 @@ msgstr "Кадастр"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr "CRAIG - Овернь 2013 - 25 см"
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Прыморскія Альпы 2009 - 40 см"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "Вялікі Нансі: артафота 2012"
@@ -16656,9 +16787,6 @@ msgid ""
"- 1 m"
msgstr "Веркор - запаведнік горнага масіва Веркор - артафота 1999 - 1 м"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Сербская мова)"
-
msgid "Hamburg (40 cm)"
msgstr "Гамбург (40 см)"
@@ -16686,9 +16814,6 @@ msgstr "Берлін - аэрафотаздымка 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Берлін - аэрафотаздымка 2016"
-msgid "Stuttgart (aerial imagery)"
-msgstr "Штутгарт (аэрафотаздымка)"
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Эрланген - аэрафотаздымка (2016 5.0 cm)"
@@ -16722,9 +16847,58 @@ msgstr "NRW-Atlas: Тапаграфічная карта 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Агламерацыя Рур: Аэрафотаздымкі (10 см)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+"imagico.de - здымкі OSM для картаграфіі: узбярэжныя водмелі Паўночнай "
+"Германіі"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+"imagico.de - здымкі OSM для картаграфіі: узбярэжныя водмелі Паўночнай "
+"Германіі (інфрачырвоныя здымкі)"
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr "Здымкі з imagico.de: Касігіянгуіт"
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr "Здымкі з imagico.de: авіябаза Туле"
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr "Здымкі з imagico.de: мазаіка Грэнландыі"
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr "Здымкі з imagico.de: Landsat не ў надзіры (травень 2013)"
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr "Здымкі з imagico.de: поўнач Грэнландыі (ASTER)"
+
msgid "Drone Imagery (Haiti)"
msgstr "Здымкі дронаў (Гаіці)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Здымкі з дрону 2014 (Гаіці)"
@@ -16732,7 +16906,7 @@ msgid "Drone Imagery Canaan(Haiti) November 2015"
msgstr "Canaan (Гаіці) - здымка з дрона, лістапад 2015"
msgid "Drone Imagery Matthew(Haiti) October 2016"
-msgstr ""
+msgstr "Matthew (Гаіці) - здымка з дрона, кастрычнік 2016"
msgid "FÖMI ortophoto 2000"
msgstr "FÖMI артафота 2000"
@@ -16761,14 +16935,8 @@ msgstr "Разліў Дуная - артафота 2013"
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Рэчышча Дуная ў Будапешце, Сентэндры і Сігетманасторы"
-msgid "Budapest district XII ortophoto 2013"
-msgstr "Будапешт, акруга XII - артафота 2013"
-
-msgid "Interspect Budapest ortophoto 2014"
-msgstr "Interspect - Будапешт, артафота 2014"
-
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
-msgstr "Пяць акруг Будапешта: III, IV, XIII, XIV, XV"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Вугоршчына (маршруты пешага турызму)"
@@ -16776,6 +16944,21 @@ msgstr "OpenStreetMap Вугоршчына (маршруты пешага тур
msgid "Hillshade Hungary"
msgstr "Вугоршчына: рэльеф"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgstr "Здымкі з imagico.de: усход Ісландыі"
+
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr "Здымкі з imagico.de: Качскі Ран"
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr "Здымкі з imagico.de: паўднёвы ўсход Сулавесі"
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr "Здымкі з imagico.de: вадасховішча Бакун"
+
+msgid "imagico.de OSM images for mapping: Batam"
+msgstr "Здымкі з imagico.de: Батам"
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ірландыя Міністэрства абароны Вялікабрытаніі 1:25000 GSGS 3906"
@@ -16837,9 +17020,21 @@ msgstr "PCN 2012 - Італія"
msgid "South Tyrol Orthofoto 2011"
msgstr "Паўднёвы Ціроль - артафота 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr "Паўднёвы Ціроль - тапакарта"
+msgid "Japan GSI ortho Imagery"
+msgstr "Японія: ортаздымкі GSI"
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "СССР - Латвія"
@@ -16873,12 +17068,36 @@ msgstr "Дэльта Нігера, кастрычнік 2012 Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Шпіцберген - артафота 2009/2011 EPSG: 25833"
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr "Здымкі з imagico.de: заходняя частка Каракарума"
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Сектар Газа - Pléiades - 06.07.2014"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Сектар Газа - Pléiades - 06.07.2014 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr "Здымкі з imagico.de: Панамскі канал"
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr "Здымкі з imagico.de: Ванацінаі"
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr "Здымкі з imagico.de: Новая Ірландыя"
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+"Здымкі з imagico.de: хрыбет Кардыльера-дэ-Вільканота і ледавіковая шапка "
+"Келькая"
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Пангасінан/Булакан (Філіпіны HiRes)"
@@ -17005,9 +17224,6 @@ msgstr "Свентахлавіцы: артафотакарта 2012"
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Забжэ: артафота 2011"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: шляхі"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr "Вроцлаў: артафота 2015 (аэрафотаздымкі)"
@@ -17017,6 +17233,20 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Аўтамабільная"
@@ -17038,12 +17268,30 @@ msgstr "RABA-KGZ: Славенія - выкарыстанне сельгасзя
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr "RABA-KGZ: Славенія - вобласці забудовы"
+msgid "City of Cape Town 2013 Aerial"
+msgstr "Гарадская акруга Кейптаўн: аэраздымка 2013"
+
msgid "City of Cape Town 2015 Aerial"
msgstr "Кейптаўн, аэрафотаздымка 2015"
msgid "South Africa CD:NGI Aerial"
msgstr "Паўднёвая Афрыка CD: NGI аэрафотаздымкі"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr "Здымкі з imagico.de: выспа Ляскова (ASTER)"
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr "Здымкі з imagico.de: выспа Скота"
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr "Здымкі з imagico.de: выспа Ляскова (Landsat)"
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr "Здымкі з imagico.de: Скалы Клерк"
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr "Здымкі з imagico.de: Скалы Шаг"
+
msgid "Catastro Spain"
msgstr "Кадастравая карта Іспаніі"
@@ -17065,6 +17313,9 @@ msgstr "IDEIB - Балеарскія выспы"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Канарскія выспы"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Кантон Аргаў 25 см (AGIS 2011)"
@@ -17108,6 +17359,9 @@ msgstr "Кантон Фрыбур 50 см (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Горад Берн 10см/25см (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr "Горад Берн 10см (2016)"
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / артафота Івердон-Ле-Бэн 25см (2007)"
@@ -17129,6 +17383,12 @@ msgstr "Банвілар - артафота 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Фіез - артафота 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr "Кантон Базель-Штадт 2015"
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr "Тайвань e-Map Open Data"
@@ -17144,6 +17404,9 @@ msgstr "Тайвань Зямельны падзел"
msgid "NLSC Open Data WMTS"
msgstr "NLSC Open Data WMTS"
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "MSR Maps Topo"
@@ -17171,9 +17434,54 @@ msgstr "Паўночная Караліна: апошнія артаздымкі
msgid "U.S. Forest Service roads"
msgstr "U.S. Forest Service - дарогі"
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr "Здымкі з imagico.de: Аляскінскі хрыбет"
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr "NJ 2015 аэрафотаздымка (інфрачырвоная)"
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr "NJ 2015 аэрафотаздымка (натуральныя колеры)"
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr "Метрапалітэнскі арэал Сан-Хуан: орта-здымка 2013 USACE"
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr "Акруга Сан-Хуан (Вашынгтон) - аэрафотаздымка 2013"
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr "Вектарная карта вуліц акругі Сан-Хуан (Вашынгтон)"
+
+msgid "Texas Orthophoto"
+msgstr "Ортафота Тэхаса"
+
+msgid "Philadelphia 2015 Imagery"
+msgstr "Філадэльфія - здымкі 2015"
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr "Мэрыленд: здымкі 6 цаляў, 2014"
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr "Мэрыленд: здымкі 3 цалі"
+
+msgid "MD Transportation Basemap"
+msgstr "Мэрыленд: базавая карта транспарта"
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr "Здымкі з imagico.de: горы Рувензоры"
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Украіна - артафота 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr "Украіна - Кіеў 2014 (DZK)"
@@ -17195,9 +17503,6 @@ msgstr "Сурэй, аэраздымкі"
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-цалевая карта Шатландыі 1842-82"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr "NLS - OS 6-дзюймаў County Series 1888-1913"
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - ОС 1:25000 1-й серыі 1937-61"
@@ -17207,9 +17512,6 @@ msgstr "NLS - АС 1-цалевая 7-й серыі 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr "NLS - OS 25-цалевая (Шатландыя) 1892-1905"
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25000 гістарычная (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "OS 1:25000 гістарычная (OSM-Limited)"
@@ -17547,8 +17849,8 @@ msgstr "Падпампоўвае новыя дадзеныя пры панара
msgid "Create a grid of ways."
msgstr "Стварае сетку з ліній."
-msgid "Customization of public transport stops."
-msgstr "Налада прыпынкаў грамадскага транспарта."
+msgid "Customization of public public transport stops."
+msgstr ""
msgid ""
"Creating and handling address nodes and buildings within Czech Republic."
@@ -17576,7 +17878,7 @@ msgid "Downloads OSM data along a way"
msgstr "Загрузка дадзеных OSM ўздоўж лініі"
msgid "Dxf Import"
-msgstr ""
+msgstr "Імпарт dxf"
msgid ""
"Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -17656,6 +17958,9 @@ msgstr "Просты інструмент для нумарацыі дамоў"
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "Стварыць межы выявы ў фармаце XML з мультыпалігону"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr "Экспартуе квадраты з кэша пласта падкладкі ў файлавую сістэму."
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -17727,7 +18032,7 @@ msgstr ""
"развязкамі, або шукае ў падмноствах каналаў развязкі"
msgid "Tools to help import Kartverket N50"
-msgstr ""
+msgstr "Прылады, што дапамагаюць у імпарце Kartverket N50"
msgid "Helps vectorizing WMS images."
msgstr "Дапамагае вектарызаваць выявы WMS."
@@ -17983,6 +18288,7 @@ msgid ""
"Adds a todo list dialog that makes it easy to go through large lists of "
"objects"
msgstr ""
+"Дадае дыялог спіса заданняў, што спрашчае апрацоўку вялікіх спісаў аб''ектаў"
msgid ""
"Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
@@ -18017,7 +18323,7 @@ msgid "Plugin to digital sign OSM-Data"
msgstr "Модуль для лічбавага подпісу дадзеных OSM"
msgid "Editor to add turn lanes tags in highways"
-msgstr ""
+msgstr "Рэдактар тэгаў руху па палосах на дарогах"
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -18190,7 +18496,7 @@ msgstr "Непраходна ні для якой колавай тэхнікі"
msgctxt "riding"
msgid "horse_riding"
-msgstr ""
+msgstr "верхавая язда"
msgctxt "riding"
msgid "pitch"
@@ -19522,7 +19828,7 @@ msgid "Ford"
msgstr "Брод"
msgid "stepping_stones"
-msgstr ""
+msgstr "пераход па камянях"
msgid "Ways"
msgstr "Лініі"
@@ -20173,6 +20479,9 @@ msgstr "Раўчук"
msgid "River"
msgstr "Рака"
+msgid "Lock"
+msgstr "Шлюз"
+
msgid "Canal"
msgstr "Канал"
@@ -20207,13 +20516,13 @@ msgid "Basin"
msgstr "Сцёкавы басейн"
msgid "retention"
-msgstr ""
+msgstr "акумулюе паводкі"
msgid "infiltration"
msgstr "інфільтрацыйны"
msgid "detention"
-msgstr ""
+msgstr "акумулюе паводкі (сухі)"
msgid "Reservoir"
msgstr "Рэзервуар"
@@ -21167,7 +21476,7 @@ msgid "Taxiway"
msgstr "Рулёжная дарожка"
msgid "Holding Position"
-msgstr ""
+msgstr "Папярэдні старт"
msgid "Helipad"
msgstr "Верталётная пляцоўка"
@@ -21226,6 +21535,12 @@ msgstr "Матэль"
msgid "Guest House/Bed & Breakfast"
msgstr "Гасцявы дом/Ложак+сняданак"
+msgid "Apartment"
+msgstr "Мэбляваныя кватэры"
+
+msgid "Number of apartments"
+msgstr "Лік кватэр"
+
msgid "Chalet"
msgstr "Шале"
@@ -21292,6 +21607,12 @@ msgstr "Столікі на вуліцы"
msgid "Takeaway"
msgstr "Стравы на вынас"
+msgid "Delivery"
+msgstr "Дастаўка"
+
+msgid "Mo-Su 12:00-22:00"
+msgstr "Mo-Su 12:00-22:00"
+
msgid "Fast Food"
msgstr "Фаст-фуд"
@@ -21858,7 +22179,7 @@ msgid "Automated Defibrillator"
msgstr "Аўтаматызаваны дэфібрылятар"
msgid "Location description"
-msgstr ""
+msgstr "Апісанне месцазнаходжання"
msgid "Phone Number"
msgstr "Нумар тэлефона"
@@ -22235,31 +22556,19 @@ msgstr "хованка_ад_пажару"
msgid "Hunting Stand"
msgstr "Паляўнічая вышка"
-msgid "Height"
-msgstr "Вышыня"
-
-msgctxt "height"
-msgid "low"
-msgstr "нізкая"
-
-msgctxt "height"
-msgid "half"
-msgstr "палавінная"
-
-msgctxt "height"
-msgid "full"
-msgstr "поўная"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr "Хованка"
-msgid "Lock"
-msgstr "Замыкаецца"
+msgid "Lockable"
+msgstr "Замыкаецца на замок"
msgid "Water Point"
msgstr "Пункт набору вады"
+msgid "Animal watering place"
+msgstr "Вадапой"
+
msgid "Compressed Air"
msgstr "Кампрэсар для шын"
@@ -22733,7 +23042,7 @@ msgstr "універсітэт"
msgctxt "building"
msgid "college"
-msgstr ""
+msgstr "каледж"
msgctxt "building"
msgid "hospital"
@@ -22851,6 +23160,10 @@ msgid "hut"
msgstr "халупа"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr "інтэрнат"
@@ -24146,6 +24459,9 @@ msgstr "Мясная крама"
msgid "Seafood"
msgstr "Морапрадукты"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Дэлікатэсы"
@@ -24962,9 +25278,6 @@ msgstr "Лінія дрэў"
msgid "A line of trees."
msgstr "Шэраг дрэў."
-msgid "Wood"
-msgstr "Лес"
-
msgid "Woodland where timber production does not dominate use."
msgstr "Лес, асноўным прызначэннем якога не з’яўляецца нарыхтоўка драўніны."
@@ -25724,10 +26037,10 @@ msgid "Bicycle Route"
msgstr "Веласіпедны маршрут"
msgid "national"
-msgstr ""
+msgstr "нацыянальная"
msgid "local"
-msgstr ""
+msgstr "лакальная"
msgid "Mountain Biking Route"
msgstr "Маршрут горных ровараў"
@@ -25943,6 +26256,8 @@ msgid ""
"Object has no {0}, however, it has {1} and {2} whose value looks like a "
"housenumber."
msgstr ""
+"Аб''ект не мае {0}, але ў яго ёсць {1} і {2}, значэнне якіх падобна на нумар "
+"дома."
msgid "Same value of {0} and {1}"
msgstr "Аднолькавае значэнне {0} і {1}"
@@ -25951,7 +26266,7 @@ msgid "{0} without {1}"
msgstr "{0} без {1}"
msgid "missing tag"
-msgstr ""
+msgstr "адсутны тэг"
msgid "{0} without {1} or {2}"
msgstr "{0} без {1} ці {2}"
@@ -25963,10 +26278,10 @@ msgid "{0} together with {1}"
msgstr "{0} разам з {1}"
msgid "suspicious tag combination"
-msgstr ""
+msgstr "падазроная камбінацыя тэгаў"
msgid "two objects, one with {0} and one with {1} + {2} + {3}"
-msgstr ""
+msgstr "два аб''екта, адзін з {0}, а другі з {1} + {2} + {3}"
msgid "incomplete object: only {0}"
msgstr "няпоўны аб`ект: толькі {0}"
@@ -26029,13 +26344,16 @@ msgid "Different number of lanes in the keys {0} and {1}"
msgstr "Розны лік палос руху ў ключах {0} і {1}"
msgid "possibly missing {0} tag"
+msgstr "магчыма, прапушчаны тэг {0}"
+
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
msgstr ""
msgid "{0} is deprecated"
msgstr "{0} састарэлы"
msgid "deprecated tagging"
-msgstr ""
+msgstr "нерэкамендаваныя тэгі"
msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
msgstr ""
@@ -26109,7 +26427,7 @@ msgid "Definition of {0} is unclear"
msgstr "Недакладнае вызначэнне {0}"
msgid "{0} + {1} + {2}"
-msgstr ""
+msgstr "{0} + {1} + {2}"
msgid ""
"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
@@ -26118,7 +26436,7 @@ msgstr ""
"«Прылады»."
msgid "{0}"
-msgstr ""
+msgstr "{0}"
msgid "key with uncommon character"
msgstr "ключ з незвычайным знакам"
@@ -26136,11 +26454,17 @@ msgid "{0} is deprecated. Use the {1}: key prefix instead."
msgstr "{0} ужываць не рэкамендуецца. Выкарыстоўвайце наўзамен прэфікс {1}:"
msgid "questionable key (ending with a number)"
-msgstr ""
+msgstr "ключ, што выклікае сумневы (сканчаецца лікам)"
msgid "The key {0} has an uncommon value."
msgstr "Ключ {0} мае незвычайнае значэнне."
+msgid "misspelled value"
+msgstr "значэнне, напісанае з памылкай"
+
+msgid "wrong value: {0}"
+msgstr "няправільнае значэнне: {0}"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} на кропцы. Павінен выкарыстоўвацца на лініі."
@@ -26181,7 +26505,7 @@ msgid "Overlapping Identical Landuses"
msgstr "Перакрыцце ідэнтычных участкаў землекарыстання"
msgid "isolated node which must be connected to a way"
-msgstr ""
+msgstr "асобны пункт, які павінен быць злучаны з лініяй"
msgid "node connects waterway and bridge"
msgstr "пункт злучае водны шлях і мост"
@@ -26221,6 +26545,13 @@ msgstr "Берагавая лінія ўнутры {1}"
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} павінен быць пунктам скрыжавання {1} і {2}"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+"{0} – тэг для лінейных водных аб''ектаў. Для пазначэння вулічных вадаёмаў "
+"скарыстайце {1} + {2}."
+
msgid "abbreviated street name"
msgstr "скарочанае пазначэнне вуліцы"
@@ -26245,6 +26576,9 @@ msgstr "{0} скарыстаны з {1}"
msgid "street name contains ss"
msgstr "назва вуліцы ўтрымоўвае ss"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -26341,13 +26675,13 @@ msgid "{0} is unnecessary"
msgstr "{0} не патрэбен"
msgid "unnecessary tag"
-msgstr ""
+msgstr "непатрэбны тэг"
msgid "{0} is unnecessary for {1}"
msgstr "{0} не трэба для {1}"
msgid "{0} makes no sense"
-msgstr ""
+msgstr "{0} не мае сэнсу"
msgid "Nodes duplicating parent way tags"
msgstr "Кропкі з тэгамі як у бацькоўскай лініі"
@@ -26613,13 +26947,13 @@ msgid "Importing..."
msgstr "Імпартаванне..."
msgid "DXF files [ImportDxf plugin] (*.dxf)"
-msgstr ""
+msgstr "Файлы DXF [модуль ImportDxf] (*.dxf)"
msgid "Please open or create data layer before importing"
msgstr "Адкрыйце ці стварыце пласт дадзеных перад імпартам"
msgid "Import dxf"
-msgstr ""
+msgstr "Імпарт dxf"
msgid "Scale:"
msgstr "Маштаб:"
@@ -27059,6 +27393,22 @@ msgstr "Перадаць бягучы пакет правак"
msgid "Submit the current changeset to Mapillary"
msgstr "Перадаць бягучы пакет правак у Mapillary"
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+"Не атрымалася адправіць пакет правак па версіі пратакола {0} з абмылай: "
+"''{1} {2}''!"
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+"Адбылася абмыла пры спробе адправіць пакет правак на сервер. Калі яна "
+"ўзнікае перыядычна, можаце адправіць справаздачу пра памылку праз меню "
+"Даведка. Калі гэта паведамленне з''явілася ўпершыню, проста паспрабуйце яшчэ "
+"раз: магчыма гэта была праблема з падлучэннем да Інтэрнэту."
+
msgid "Upload pictures"
msgstr "Адаслаць выявы"
@@ -27101,8 +27451,8 @@ msgstr "Адкрыць дыялог набору змен Mapillary"
msgid "Mapillary changeset"
msgstr "Пакет правак Mapillary"
-msgid "Submit"
-msgstr "Адправіць"
+msgid "Submitting changeset to server…"
+msgstr "Адпраўка пакета правак на сервер…"
msgid "Export all images"
msgstr "Экспартаваць ўсе здымкі"
@@ -27362,7 +27712,7 @@ msgid "No images found"
msgstr "Выявы не знойдзеныя"
msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr ""
+msgstr "Вы паспяхова загрузілі {0} выяў на mapillary.com"
msgid "Finished upload"
msgstr "Адсылка скончана"
@@ -28019,6 +28369,9 @@ msgstr ""
msgid "Area Selector"
msgstr "Вылучэнне ўчастка"
+msgid "Trying to detect an area at:"
+msgstr "Спроба распазнаць вобласць у пункце:"
+
msgid "Created area"
msgstr "Створана вобласць"
@@ -28066,11 +28419,11 @@ msgid "Algorithm"
msgstr "Алгарытм"
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
-"Максімальная адлегласць пункта ад лініі (пікселяў), пры якім пункт ўсё яшчэ "
-"лічыцца часткай гэтай лініі (Тыпова: {0})"
+"Максімальная адлегласць у метрах паміж пунктам і лініяй, калі варта "
+"разглядаць яго ў якасці члена гэтай лініі (па змаўчанні: {0})."
msgid "Distance Tolerance"
msgstr "Дапушчальнае адхіленне адлегласці"
@@ -29795,6 +30148,66 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Адкрыць XML файл здымкаў"
+msgid "Export tiles"
+msgstr "Экспартаваць квадраты"
+
+msgid "Export cached tiles to file system."
+msgstr "Экспарт кэшаваных квадратаў падкладкі ў файлавую сістэму."
+
+msgid "Exporting cached tiles"
+msgstr "Экспарт кэшаваных квадратаў"
+
+msgid "Failed to write image file {0}: {1}"
+msgstr "Не атрымалася запісаць файл выявы {0}: {1}"
+
+msgid "Failed to write image file {0}."
+msgstr "Не атрымалася запісаць файл выявы {0}."
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] "Экспартаваны {0} квадрат з пласта {1}."
+msgstr[1] "Экспартаваны {0} квадраты з пласта {1}."
+msgstr[2] "Экспартаваны {0} квадратаў з пласта {1}."
+
+msgid "Export file system path already exists but is not a directory."
+msgstr "Шлях экспарту ў файлавую сістэму ўжо існуе, але гэта не каталог."
+
+msgid "Failed to create export directory: {0}"
+msgstr "Не атрымалася стварыць каталог для экспарту: {0}"
+
+msgid "Failed to create export directory."
+msgstr "Не атрымалася стварыць каталог для экспарту."
+
+msgid "Append cache name"
+msgstr "Дадаць імя кэша"
+
+msgid "Export Tiles"
+msgstr "Экспартаваць квадраты"
+
+msgid "Cache name:"
+msgstr "Імя кэша:"
+
+msgid "Object count:"
+msgstr "Колькасць аб''ектаў:"
+
+msgid "file system path"
+msgstr "шлях файлавай сістэмы"
+
+msgid "File system path the tiles are exported to."
+msgstr "Шлях файлавай сістэмы, па якім будуць экспартавацца квадраты."
+
+msgid "Export directory:"
+msgstr "Каталог экспарту:"
+
+msgid "Append cache name to export directory."
+msgstr "Дадаць імя кэша да каталога экспарту."
+
+msgid "Tiles will be exported to directory {0}"
+msgstr "Квадраты будуць экспартаваны ў каталог {0}"
+
+msgid "No export directory set."
+msgstr "Не зададзены каталог для экспарту."
+
msgid "Calibration Layer"
msgstr "Калібравальны пласт"
@@ -30268,51 +30681,53 @@ msgid "generate all combinations from entrie/exit candidates"
msgstr "стварыць усе камбінацыі з кандыдатаў уваходу/выхаду"
msgid "Check the direction"
-msgstr ""
+msgstr "Праверце кірунак"
msgid ""
"Check the direction of the selected stream/river. Is it correct?\n"
" Progress: "
msgstr ""
+"Праверце кірунак вылучанага ручая ці ракі. Ён слушны?\n"
+"Выканана: "
msgid "Correct"
-msgstr ""
+msgstr "Правільны"
msgid "Wrong"
-msgstr ""
+msgstr "Няправільнае"
msgid "<HTML><U>C</U>orrect direction</HTML>"
-msgstr ""
+msgstr "<HTML><U>П</U>равільны кірунак<HTML>"
msgid "Direction of river is correct."
-msgstr ""
+msgstr "Кірунак ракі правільны."
msgid "<HTML><U>W</U>rong dirrection</HTML>"
-msgstr ""
+msgstr "<HTML><U>Н</U>яправільны кірунак<HTML>"
msgid "Direction of river is wrong."
-msgstr ""
+msgstr "Кірунак ракі няправільны."
msgid "<HTML><U>I</U>gnore this way</HTML>"
-msgstr ""
+msgstr "<HTML><U>І</U>гнараваць гэту лінію<HTML>"
msgid "Ignore direction of this way."
-msgstr ""
+msgstr "Ігнараваць кірунак гэтай лініі."
msgid "Check direction of streams"
-msgstr ""
+msgstr "Праверце кірунак ручаёў"
msgid "Check direction of streams and rivers"
-msgstr ""
+msgstr "Праверыць кірунак ручаёў і рэк"
msgid "No more directions to check!"
-msgstr ""
+msgstr "Больш няма аб''ектаў для праверкі кірункаў!"
msgid "Replace way"
-msgstr ""
+msgstr "Замяніць лінію"
msgid "Replace way of selected way with a new way"
-msgstr ""
+msgstr "Замяніць абраную лінію новай лініяй"
msgid "Replace Geometry"
msgstr "Замяніць геаметрыю"
@@ -30321,6 +30736,8 @@ msgid ""
"This tool replaces coastline of one way with another, and so requires "
"exactly two coatline ways to be selected."
msgstr ""
+"Гэта прылада замяняе адну берагавую лінію іншай, таму трэба каб былі абраны "
+"дзве берагавыя лініі."
msgid "Direction index ''{0}'' not found"
msgstr "Індэкс кірункаў ''{0}'' не знойдзены"
@@ -32089,9 +32506,6 @@ msgstr "ГТ: Маршрут павінен пачынацца і сканчац
msgid "PT: First or last way needs to be split"
msgstr "ГТ: Першую ці апошнюю лінію патрабуецца падзяліць"
-msgid "PT: Problem in the route segment"
-msgstr "ГТ: Праблема ў сегменце маршруту"
-
msgid "PT: Stop not served"
msgstr "ГТ: Прыпынак не абслугоўваецца."
@@ -32119,6 +32533,8 @@ msgid ""
"PT: Route relations of stop position(s) and platform(s) of stop area members "
"diverge"
msgstr ""
+"ГТ: Удзельнікі маршрутаў месцаў(а) прыпынку і платформаў(ы), якія ўваходзяць "
+"у зону прыпынку, адрозніваюцца"
msgid "PT: Route type does not match the type of the road it passes on"
msgstr "ГТ: Тып маршруту не адпавядае тыпу дарогі, па якой ён праходзіць"
@@ -32254,9 +32670,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr "[прамежак]"
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "Шаблоны маршрутаў …"
@@ -32314,6 +32727,9 @@ msgstr "Левы бок"
msgid "Maximum distance from route"
msgstr "Максімальная дыстанцыя ад маршруту"
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "Грамадскі транспарт: Змена выгляду прыпынку"
@@ -32515,10 +32931,6 @@ msgstr "Ператварыць у палігон"
msgid "Multipolygon must consist only of ways"
msgstr "Мультыпалігон павінен складацца толькі з ліній"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-"Рэканструкцыя палігонаў можа быць ажыццёўлена толькі для знешніх ліній"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Аднавіць палігон з дачынення {0}"
@@ -33281,64 +33693,66 @@ msgid "Terrace"
msgstr "Шэраг хат уздоўж вуліцы"
msgid "Pass over element without marking it"
-msgstr ""
+msgstr "Прапусціць элемент, не адзначаючы яго"
msgid "Mark element done"
-msgstr ""
+msgstr "Адзначыць элемент як выкананы"
msgid "Todo list"
-msgstr ""
+msgstr "Спіс задач"
msgid "Open the todo list."
-msgstr ""
+msgstr "Адкрыць спіс задач."
msgid "Zoom to the selected item in the todo list."
-msgstr ""
+msgstr "Маштабаваць да вылучанага элемента ў спісе задач."
msgid "Select all Unmarked and Zoom"
-msgstr ""
+msgstr "Вылучыць усе не адзначаныя і маштабаваць"
msgid "Select and zoom to all of the unmarked items in the todo list."
-msgstr ""
+msgstr "Вылучыць і маштабаваць да ўсіх не адзначаных элементаў спіса задач."
msgid "Pass"
-msgstr ""
+msgstr "Прапусціць"
msgid "Moves on to the next item but leaves this item in the todo list. ([)."
msgstr ""
+"Перайсці да наступнага элемента, пакінуўшы гэты элемент у спісе задач. ([)."
msgid "Add the selected items to the todo list."
-msgstr ""
+msgstr "Дадаць вылучаныя аб''екты ў спіс задач."
msgid "Mark selected"
-msgstr ""
+msgstr "Адзначыць вылучаныя"
msgid "Mark the selected items (on the map) as done in the todo list."
-msgstr ""
+msgstr "Адзначыць вылучаныя (на карце) аб\"екты як выкананыя ў спісе задач."
msgid "Mark the selected item in the todo list as done. (])."
-msgstr ""
+msgstr "Адзначыць вылучаныя аб''екты як выкананыя ў спісе задач. (])."
msgid "Mark all"
-msgstr ""
+msgstr "Пазначыць усё"
msgid "Mark all items in the todo list as done."
-msgstr ""
+msgstr "Пазначыць усе аб''екты ў спісе задач як выкананыя."
msgid "Unmark all"
-msgstr ""
+msgstr "Зняць адзнаку з усіх"
msgid "Unmark all items in the todo list that have been marked as done."
msgstr ""
+"Зняць адзнаку з усіх элементаў спіса задач, раней адзначаных як выкананыя."
msgid "Clear the todo list"
-msgstr ""
+msgstr "Ачысціць спіс задач"
msgid "Remove all items (marked and unmarked) from the todo list."
-msgstr ""
+msgstr "Прыбраць усе элементы (адзначаныя і неадзначаныя) са спіса задач."
msgid "Todo list {0}/{1} ({2}%)"
-msgstr ""
+msgstr "Спіс задач {0}/{1} ({2}%)"
msgid "To-fix"
msgstr "To-fix"
@@ -33816,82 +34230,85 @@ msgid "Create a new signing key"
msgstr "Стварыць новы ключ подпісу"
msgid "Turn lanes tagging - editor"
-msgstr ""
+msgstr "Рэдактар палос руху"
msgid "Turn lanes tagging - Editor"
-msgstr ""
+msgstr "Рэдактар палос руху"
msgid "turn lanes tagging - editor"
-msgstr ""
+msgstr "рэдактар палос руху"
msgid "Turn Lanes Editor"
-msgstr ""
+msgstr "Рэдактар палос руху"
msgid " The number of lanes has fixed according number of turns"
-msgstr ""
+msgstr " Колькасць палос выпраўлена ў адпаведнасці з колькасцю паваротаў"
msgid " The number of lanes:forward has fixed according number of turns"
msgstr ""
+" Колькасць lanes:forward выпраўлена ў адпаведнасці з колькасцю паваротаў"
msgid " The number of lanes:both_ways has fixed according number of turns"
msgstr ""
+" Колькасць lanes:both_ways выпраўлена ў адпаведнасці з колькасцю паваротаў"
msgid " The number of lanes:backward has fixed according number of turns"
msgstr ""
+" Колькасць lanes:backward выпраўлена ў адпаведнасці з колькасцю паваротаў"
msgid "check the right direction of the way"
-msgstr ""
+msgstr "праверце правільнасць кірунку дарогі"
msgid "Unidirectional road"
-msgstr ""
+msgstr "Аднабаковы рух"
msgid "Build unidirectional road"
-msgstr ""
+msgstr "Стварыць дарогу з аднабаковым рухам"
msgid "Bidirectional road"
-msgstr ""
+msgstr "Двухбаковы рух"
msgid "Build bidirectional road"
-msgstr ""
+msgstr "Стварыць дарогу з двухбаковым рухам"
msgid "Use \"none\""
-msgstr ""
+msgstr "Выкарыстоўваць \"none\""
msgid "use \"none\" instead of empty values"
-msgstr ""
+msgstr "выкарыстоўваць \"none\" замест пустых значэнняў"
msgid "Preset turn lanes"
-msgstr ""
+msgstr "Нарыхтоўкі палос"
msgid "Recently turn lanes edits"
-msgstr ""
+msgstr "Нядаўнія праўкі палос"
msgid "Forward"
msgstr "Наперад"
msgid "Both way lane"
-msgstr ""
+msgstr "Двухбаковая паласа"
msgid "Backward"
msgstr "Назад"
msgid "Number of backward lanes"
-msgstr ""
+msgstr "Лік палос lanes:backward"
msgid "Number of forward lanes"
-msgstr ""
+msgstr "Лік палос lanes:forward"
msgid "Both way"
-msgstr ""
+msgstr "У абодва бакі"
msgid "Number of lanes"
-msgstr ""
+msgstr "Колькасць палос"
msgid "Directional"
-msgstr ""
+msgstr "Накіраванасць"
msgid "Turn lanes"
-msgstr ""
+msgstr "Палосы для павароту"
msgid "No such lane."
msgstr "Няма такой паласы."
diff --git a/i18n/po/bg.po b/i18n/po/bg.po
index f25e7c6..fa44221 100644
--- a/i18n/po/bg.po
+++ b/i18n/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
"PO-Revision-Date: 2016-08-05 14:02+0000\n"
"Last-Translator: pl <Unknown>\n"
"Language-Team: Bulgarian <bg 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: 2016-11-07 04:38+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:41+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: bg\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -65,9 +65,15 @@ msgstr "Изчертаване на главното меню"
msgid "Help"
msgstr "Помощ"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Инициализиране на OSM API"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Инициализиране на програмата за проверки"
@@ -205,6 +211,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr "Изберете на картата всички обекти, избрани в списъка по-горе."
+msgid "Select WMS layers"
+msgstr "Изберете WMS слоеве"
+
+msgid "Add layers"
+msgstr "Добавете слоеве"
+
msgid "Add imagery layer {0}"
msgstr "Добавете слой с изображения {0}"
@@ -226,12 +238,6 @@ msgstr "Грешка"
msgid "Select image format for WMS layer"
msgstr "Изберете формат на изображение за WMS слоя"
-msgid "Select WMS layers"
-msgstr "Изберете WMS слоеве"
-
-msgid "Add layers"
-msgstr "Добавете слоеве"
-
msgid "Add Node..."
msgstr "Добавяне на точка..."
@@ -736,6 +742,9 @@ msgstr "Прескачане на позиция"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Отваряне на диалог, който позволява прескачена до определена позиция"
+msgid "Jump to Position"
+msgstr "Прескачане на позиция"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Въвеждане Шир/Дълж за прескачане до позиция."
@@ -757,9 +766,6 @@ msgstr "Адрес (URL)"
msgid "Jump there"
msgstr "Прескочи там"
-msgid "Jump to Position"
-msgstr "Прескачане на позиция"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Не може да бъде прочетена Широчината, Дължината или Мащаба. Моля проверете."
@@ -811,6 +817,9 @@ msgstr "Обединение на слоя"
msgid "Merge the current layer into another layer"
msgstr "Обединява текущия слой в друг слой"
+msgid "{0} completed in {1}"
+msgstr "{0} завършени в {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Обединяване на слоеве с различна политика на качване"
@@ -974,24 +983,30 @@ msgstr[1] "Отваряне на {0} файла..."
msgid "Opening file ''{0}'' ..."
msgstr "Отваряне на файла ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr "Кои действия да се изпълнят?"
+
+msgid "Ok"
+msgstr "ОК"
+
msgid "Open Location..."
msgstr "Отваряне на местоположение…"
msgid "Open an URL."
msgstr "Отваряне на хипервръзка."
-msgid "Separate Layer"
-msgstr "На отделен слой"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Изберете дали данните да бъдат свалени в нов слой"
-
msgid "Enter URL to download:"
msgstr "Въведете URL за сваляне:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Въведете URL откъдето да се свалят данните"
+msgid "Separate Layer"
+msgstr "На отделен слой"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Изберете дали данните да бъдат свалени в нов слой"
+
msgid "Download Location"
msgstr "Местоположение на изтеглянето"
@@ -1007,12 +1022,6 @@ msgstr "Затвори и прекрати свалянето"
msgid "Download Data"
msgstr "Сваляне на данни"
-msgid "Which tasks to perform?"
-msgstr "Кои действия да се изпълнят?"
-
-msgid "Ok"
-msgstr "ОК"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1844,9 +1853,6 @@ msgstr ""
msgid "Errors during download"
msgstr "Грешки при сваляне"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr "Сваляне GPS"
@@ -4089,9 +4095,6 @@ msgstr "Незатворена площ (area)"
msgid "No outer way for multipolygon"
msgstr "Мултиполигонът няма външен път."
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -4121,12 +4124,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr "Мултиполигонът не е затворен."
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "Кръстосване на пътища в мултиполигон."
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4831,12 +4849,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/PATH/TO/JOSM/PREF "
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/PATH/TO/JOSM/USERDATA"
@@ -4853,8 +4877,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/PATH/TO/JOSM/HOMEDIR "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5175,9 +5199,6 @@ msgstr ""
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} завършени в {1}"
-
msgid "Enlarge"
msgstr ""
@@ -5316,82 +5337,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr "Моя с Тяхния"
-
-msgid "My with Merged"
-msgstr "Моята версия с Обединената"
-
-msgid "Their with Merged"
-msgstr "Тяхната версия с Обединената"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "роля {0} не участва в двойката за сравнение {1}"
-
-msgid "Properties"
-msgstr "Настройки"
-
-msgid "Tags"
-msgstr "Маркери"
-
-msgid "Nodes"
-msgstr "Възли"
-
-msgid "Members"
-msgstr "Членове"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Няма чакащи tag конфликти за разрешаване"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr "Възли(решени)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr "Възли(с конфликт)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr "Членове (разрешени)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr "Членове (с конфликти)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr "Няма чакащи конфликти на характеристиките"
-
-msgid "Properties(with conflicts)"
-msgstr "Характеристики (с конфликти)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Чакащи за разрешаване конфликти на характеристики"
-
-msgid "Conflict Resolution"
-msgstr "Разрешение на конфликт"
-
msgid "{0} more..."
msgstr "{0} още..."
@@ -5558,6 +5503,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr "Моя с Тяхния"
+
+msgid "My with Merged"
+msgstr "Моята версия с Обединената"
+
+msgid "Their with Merged"
+msgstr "Тяхната версия с Обединената"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "роля {0} не участва в двойката за сравнение {1}"
+
+msgid "Properties"
+msgstr "Настройки"
+
+msgid "Tags"
+msgstr "Маркери"
+
+msgid "Nodes"
+msgstr "Възли"
+
+msgid "Members"
+msgstr "Членове"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Няма чакащи tag конфликти за разрешаване"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr "Възли(решени)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr "Възли(с конфликт)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr "Членове (разрешени)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr "Членове (с конфликти)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr "Няма чакащи конфликти на характеристиките"
+
+msgid "Properties(with conflicts)"
+msgstr "Характеристики (с конфликти)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Чакащи за разрешаване конфликти на характеристики"
+
+msgid "Conflict Resolution"
+msgstr "Разрешение на конфликт"
+
msgid "Node"
msgstr "Възел"
@@ -5617,7 +5638,7 @@ msgstr "Роля"
msgid "Primitive"
msgstr "Примитив"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6979,125 +7000,39 @@ msgstr "Отворен"
msgid "closed"
msgstr "Затворен"
-msgid "Download content"
-msgstr "Сваляне на съдържание"
-
-msgid "Download the changeset content from the OSM server"
-msgstr ""
-
-msgid "Update content"
-msgstr ""
-
-msgid "Update the changeset content from the OSM server"
-msgstr ""
-
-msgid "Changeset ID: "
-msgstr "Списък с промени ID: "
-
-msgid "Enter a changeset id"
-msgstr ""
-
-msgid ""
-"Download the changeset with the specified id, including the changeset content"
-msgstr ""
-
-msgid "Select changesets owned by specific users"
-msgstr ""
-
-msgid "Select changesets depending on whether they are open or closed"
-msgstr ""
-
-msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr ""
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr ""
-
-msgid "Query open changesets only"
-msgstr ""
-
-msgid "Query closed changesets only"
-msgstr ""
-
-msgid "Query both open and closed changesets"
-msgstr ""
-
-msgid "Only changesets owned by myself"
-msgstr ""
-
-msgid "User ID:"
-msgstr "ID на потребител:"
-
-msgid "User name:"
-msgstr "Име на потребител:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr ""
+msgid "Download content"
+msgstr "Сваляне на съдържание"
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid "Download the changeset content from the OSM server"
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Update content"
msgstr ""
-msgid "Invalid user ID"
-msgstr "Невалидно потребителско ID"
-
-msgid "Please enter a non-empty user name"
+msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Invalid user name"
-msgstr "Невалидно име на потребител"
-
-msgid "Date: "
-msgstr "Дата: "
-
-msgid "Time:"
-msgstr "Час:"
+msgid "Changeset ID: "
+msgstr "Списък с промени ID: "
-msgid "Closed after - "
+msgid "Enter a changeset id"
msgstr ""
-msgid "Date:"
-msgstr "Дата:"
-
-msgid "Created before - "
-msgstr "Създаден преди - "
-
-msgid "Only changesets closed after the following date/time"
+msgid ""
+"Download the changeset with the specified id, including the changeset content"
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Select changesets owned by specific users"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Select changesets depending on whether they are open or closed"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Select changesets based on the date/time they have been created or closed"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Select only changesets related to a specific bounding box"
msgstr ""
msgid ""
@@ -7113,23 +7048,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Невалиден район"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-
-msgid "Please enter an integer value > 0"
-msgstr "Въведете цяло число по-голямо от нула"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-
msgid "Download my changesets only"
msgstr ""
@@ -7205,6 +7123,66 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid "Query open changesets only"
+msgstr ""
+
+msgid "Query closed changesets only"
+msgstr ""
+
+msgid "Query both open and closed changesets"
+msgstr ""
+
+msgid "Date: "
+msgstr "Дата: "
+
+msgid "Time:"
+msgstr "Час:"
+
+msgid "Closed after - "
+msgstr ""
+
+msgid "Date:"
+msgstr "Дата:"
+
+msgid "Created before - "
+msgstr "Създаден преди - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr ""
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+
+msgid "Invalid date/time values"
+msgstr ""
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+
+msgid "Please enter an integer value > 0"
+msgstr "Въведете цяло число по-голямо от нула"
+
msgid "URL: "
msgstr "URL: "
@@ -7222,6 +7200,49 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Only changesets owned by myself"
+msgstr ""
+
+msgid "User ID:"
+msgstr "ID на потребител:"
+
+msgid "User name:"
+msgstr "Име на потребител:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr ""
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr ""
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+
+msgid "Please enter a valid user ID"
+msgstr ""
+
+msgid "Invalid user ID"
+msgstr "Невалидно потребителско ID"
+
+msgid "Please enter a non-empty user name"
+msgstr ""
+
+msgid "Invalid user name"
+msgstr "Невалидно име на потребител"
+
msgid "Activate"
msgstr "Активиране"
@@ -8329,6 +8350,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9861,6 +9885,9 @@ msgstr "Посока"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave аудио файлове (*.wav)"
+
msgid "Import Audio"
msgstr "Импорт Аудио"
@@ -9873,9 +9900,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave аудио файлове (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Аудио маркери от {0}"
@@ -9985,14 +10009,6 @@ msgstr "(URL беше: "
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -10005,6 +10021,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -11011,6 +11030,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Единствен цвят (може да се настройва за наименувани слоеве)"
@@ -11023,6 +11045,18 @@ msgstr "Вело"
msgid "Foot"
msgstr "Пеш"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Гора"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -11035,6 +11069,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11103,6 +11140,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11123,11 +11165,18 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
"Позволяване да се настрои оцветяването на следата при различни средни "
"скорости."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Оцветяване на следата"
@@ -12325,6 +12374,12 @@ msgstr "Проверка за грешки на религиозни обект
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr "Ненужни тагове"
@@ -13369,6 +13424,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Съхрани потребителското име и паролата (нешифрирано)"
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13390,12 +13451,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14367,6 +14422,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14859,14 +14917,17 @@ msgstr "Mapbox Satellite"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, без етикети)"
@@ -14889,8 +14950,11 @@ msgstr "Hike & Bike"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
@@ -14940,8 +15004,8 @@ msgstr "OSM Inspector: Places"
msgid "OSM Inspector: Highways"
msgstr "OSM Inspector: Highways"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
+msgstr ""
msgid "OSM Inspector: Routing"
msgstr "OSM Inspector: Routing"
@@ -14949,10 +15013,22 @@ msgstr "OSM Inspector: Routing"
msgid "OSM Inspector: Addresses"
msgstr "OSM Inspector: Addresses"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14988,6 +15064,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -15033,10 +15115,16 @@ msgstr "VoGIS: Flächenwidmungsplan"
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -15072,14 +15160,32 @@ msgstr ""
msgid "TEC bus lines (2014)"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
msgstr ""
msgid "IBGE Mapa de Setores Urbanos"
msgstr "IBGE Mapa de Setores Urbanos"
-msgid "IBGE Mapa de Setores Rurais"
-msgstr "IBGE Mapa de Setores Rurais"
+msgid "IBGE Mapa de Setores Rurais"
+msgstr "IBGE Mapa de Setores Rurais"
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
msgid "Geobase Hydrography"
msgstr "Geobase Hydrography"
@@ -15093,12 +15199,34 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "British Columbia Mosaic"
+msgid "Latest southwest British Columbia Landsat"
+msgstr ""
+
msgid "Kelowna 2012"
msgstr "Kelowna 2012"
msgid "Kelowna Roads overlay"
msgstr "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr ""
+
msgid "Czech CUZK:KM"
msgstr "Czech CUZK:KM"
@@ -15135,6 +15263,12 @@ msgstr "Stevns (Denmark)"
msgid "Vejmidte (Denmark)"
msgstr "Vejmidte (Denmark)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Estonia Basemap (Maaamet)"
@@ -15168,9 +15302,6 @@ msgstr "Кадастър"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "GrandNancy Orthophotographie 2012"
@@ -15229,9 +15360,6 @@ msgstr ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
"- 1 m"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Sorbian Language)"
-
msgid "Hamburg (40 cm)"
msgstr "Hamburg (40 cm)"
@@ -15259,9 +15387,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15295,9 +15420,54 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Drone Imagery (Haiti)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone Imagery 2014 (Haiti)"
@@ -15334,19 +15504,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15409,9 +15588,21 @@ msgstr "PCN 2012 - Italy"
msgid "South Tyrol Orthofoto 2011"
msgstr "South Tyrol Orthofoto 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr "South Tyrol Topomap"
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "USSR - Latvia"
@@ -15445,12 +15636,34 @@ msgstr "Niger Delta Oct 2012 Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Gaza Strip - Pléiades - 2014/07/06"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
@@ -15577,9 +15790,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Zabrze: Ortofotomapa 2011 (aerial image)"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Szlaki (paths)"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15589,6 +15799,20 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Car"
@@ -15610,12 +15834,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr "South Africa CD:NGI Aerial"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr "Catastro Spain"
@@ -15637,6 +15879,9 @@ msgstr "IDEIB - Balearic Islands"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Canary Islands"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Kanton Aargau 25cm (AGIS 2011)"
@@ -15679,6 +15924,9 @@ msgstr "Canton de Fribourg 50cm (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Stadt Bern 10cm/25cm (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -15700,6 +15948,12 @@ msgstr "Bonvillars Orthophoto 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Fiez Orthophoto 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15715,6 +15969,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "MSR Maps Topo"
@@ -15742,9 +15999,54 @@ msgstr "NC Latest Orthoimagery"
msgid "U.S. Forest Service roads"
msgstr "U.S. Forest Service roads"
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ukraine - Orthophotomaps 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15766,9 +16068,6 @@ msgstr "Surrey Air Survey"
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Scotland 1842-82"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -15778,9 +16077,6 @@ msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25k historic (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "OS 1:25k historic (OSM-Limited)"
@@ -16092,7 +16388,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr "Създаване мрежа от пътища"
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -16182,6 +16478,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18591,6 +18890,9 @@ msgstr "Поток"
msgid "River"
msgstr "Река"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Канал"
@@ -19639,6 +19941,12 @@ msgstr "Мотел"
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Бунгало"
@@ -19705,6 +20013,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Заведение за бързо хранене"
@@ -20648,31 +20962,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr "Ловно скривалище"
-msgid "Height"
-msgstr "Височина"
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
-msgstr "Заключване"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -21264,6 +21566,10 @@ msgid "hut"
msgstr "колиба"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr "oбщежитие"
@@ -22557,6 +22863,9 @@ msgstr "Месарница"
msgid "Seafood"
msgstr "Морски деликатеси"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Деликатесен магазин"
@@ -23370,9 +23679,6 @@ msgstr "Редица дървета"
msgid "A line of trees."
msgstr "Ред дървета"
-msgid "Wood"
-msgstr "Гора"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24419,6 +24725,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0} е остаряло"
@@ -24510,6 +24819,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} за точка. Трябва да се ползва за път."
@@ -24586,6 +24901,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "съкратено име на улица"
@@ -24610,6 +24930,9 @@ msgstr "{0} се използва с {1}"
msgid "street name contains ss"
msgstr "името на улица съдържа \"ss\""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25385,6 +25708,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25427,7 +25760,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -26230,6 +26563,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26271,8 +26607,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27896,6 +28232,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -30079,9 +30474,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -30239,9 +30631,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr ""
@@ -30299,6 +30688,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30496,9 +30888,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/bn.po b/i18n/po/bn.po
index 9c9487c..f1c4f6e 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:36+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:39+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: bn\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr "সহায়িকা"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -202,6 +208,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr "স্তর যোগ করুন"
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -223,12 +235,6 @@ msgstr "ত্রুটি"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr "স্তর যোগ করুন"
-
msgid "Add Node..."
msgstr "নোড যোগ করুন।"
@@ -711,6 +717,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -732,9 +741,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -785,6 +791,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -934,22 +943,28 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "ঠিক আছে"
+
msgid "Open Location..."
msgstr ""
msgid "Open an URL."
msgstr ""
-msgid "Separate Layer"
+msgid "Enter URL to download:"
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Enter an URL from where data should be downloaded"
msgstr ""
-msgid "Enter URL to download:"
+msgid "Separate Layer"
msgstr ""
-msgid "Enter an URL from where data should be downloaded"
+msgid "Select if the data should be downloaded into a new layer"
msgstr ""
msgid "Download Location"
@@ -967,12 +982,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr "ঠিক আছে"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1765,9 +1774,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3953,9 +3959,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3985,12 +3988,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4683,12 +4701,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4705,8 +4729,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5027,9 +5051,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5168,82 +5189,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5409,6 +5354,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5468,7 +5489,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6860,212 +6881,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8171,6 +8192,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9657,6 +9681,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9669,9 +9696,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9768,14 +9792,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9788,6 +9804,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10776,6 +10795,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10788,6 +10810,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10800,6 +10834,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10859,6 +10896,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10877,9 +10919,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12074,6 +12123,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13109,6 +13164,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13130,12 +13191,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14095,6 +14150,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14583,13 +14641,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14613,7 +14674,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14664,7 +14728,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14673,10 +14737,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14712,6 +14788,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14757,10 +14839,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14793,34 +14881,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14859,6 +14987,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14892,9 +15026,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14951,9 +15082,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14981,9 +15109,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15017,9 +15142,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15056,19 +15226,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15131,9 +15310,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15167,12 +15358,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15299,9 +15512,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15311,6 +15521,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15332,12 +15556,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15359,6 +15601,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15401,6 +15646,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15422,6 +15670,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15437,6 +15691,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15464,9 +15721,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15488,9 +15790,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15500,9 +15799,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15814,7 +16110,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15902,6 +16198,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18298,6 +18597,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19346,6 +19648,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19412,6 +19720,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20355,31 +20669,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20971,6 +21273,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22264,6 +22570,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23077,9 +23386,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24124,6 +24430,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24215,6 +24524,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24291,6 +24606,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24315,6 +24635,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25088,6 +25411,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25130,7 +25463,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25933,6 +26266,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25974,8 +26310,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27573,6 +27909,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29734,9 +30129,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29894,9 +30286,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29954,6 +30343,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30151,9 +30543,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/br.po b/i18n/po/br.po
index 15b7683..f0ec3db 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:37+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:41+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: br\n"
msgid "License"
@@ -67,9 +67,15 @@ msgstr ""
msgid "Help"
msgstr "Skoazell"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr "Fazi"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr "Ouzhpennañ un notenn..."
@@ -708,6 +714,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -729,9 +738,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -782,6 +788,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -931,16 +940,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -949,6 +958,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -964,12 +979,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1762,9 +1771,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3950,9 +3956,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3982,12 +3985,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4680,12 +4698,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4702,8 +4726,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5024,9 +5048,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5165,82 +5186,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5406,6 +5351,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5465,7 +5486,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6857,212 +6878,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8168,6 +8189,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9654,6 +9678,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9666,9 +9693,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9765,14 +9789,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9785,6 +9801,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10773,6 +10792,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10785,6 +10807,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10797,6 +10831,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10856,6 +10893,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10874,9 +10916,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12071,6 +12120,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13106,6 +13161,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13127,12 +13188,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14092,6 +14147,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14580,13 +14638,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14610,7 +14671,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14661,7 +14725,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14670,10 +14734,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14709,6 +14785,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14754,10 +14836,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14790,34 +14878,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14856,6 +14984,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14889,9 +15023,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14948,9 +15079,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14978,9 +15106,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15014,9 +15139,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15053,19 +15223,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15128,9 +15307,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15164,12 +15355,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15296,9 +15509,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15308,6 +15518,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15329,12 +15553,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15356,6 +15598,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15398,6 +15643,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15419,6 +15667,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15434,6 +15688,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15461,9 +15718,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15485,9 +15787,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15497,9 +15796,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15811,7 +16107,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15899,6 +16195,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18295,6 +18594,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19343,6 +19645,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19409,6 +19717,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20352,31 +20666,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20968,6 +21270,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22261,6 +22567,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23074,9 +23383,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24121,6 +24427,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24212,6 +24521,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24288,6 +24603,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24312,6 +24632,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25085,6 +25408,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25127,7 +25460,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25930,6 +26263,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25971,8 +26307,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27570,6 +27906,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29731,9 +30126,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29891,9 +30283,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29951,6 +30340,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30148,9 +30540,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/bs.po b/i18n/po/bs.po
index 56a5f31..f04b10f 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:37+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:40+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: bs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -65,9 +65,15 @@ msgstr "Sastavljanje glavnog menija"
msgid "Help"
msgstr "Pomoć"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Inicijalizacija OSM API-a"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Pokretanje validatora"
@@ -202,6 +208,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -223,12 +235,6 @@ msgstr "Greška"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -711,6 +717,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -732,9 +741,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -785,6 +791,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -934,16 +943,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -952,6 +961,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -967,12 +982,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1765,9 +1774,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3953,9 +3959,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3985,12 +3988,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4683,12 +4701,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4705,8 +4729,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5027,9 +5051,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5168,82 +5189,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5409,6 +5354,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5468,7 +5489,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6860,212 +6881,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8171,6 +8192,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9657,6 +9681,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9669,9 +9696,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9768,14 +9792,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9788,6 +9804,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10776,6 +10795,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10788,6 +10810,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10800,6 +10834,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10859,6 +10896,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10877,9 +10919,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12074,6 +12123,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13109,6 +13164,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13130,12 +13191,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14095,6 +14150,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14583,13 +14641,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14613,7 +14674,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14664,7 +14728,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14673,10 +14737,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14712,6 +14788,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14757,10 +14839,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14793,34 +14881,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14859,6 +14987,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14892,9 +15026,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14951,9 +15082,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14981,9 +15109,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15017,9 +15142,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15056,19 +15226,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15131,9 +15310,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15167,12 +15358,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15299,9 +15512,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15311,6 +15521,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15332,12 +15556,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15359,6 +15601,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15401,6 +15646,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15422,6 +15670,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15437,6 +15691,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15464,9 +15721,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15488,9 +15790,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15500,9 +15799,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15814,7 +16110,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15902,6 +16198,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18298,6 +18597,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19346,6 +19648,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19412,6 +19720,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20355,31 +20669,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20971,6 +21273,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22264,6 +22570,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23077,9 +23386,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24124,6 +24430,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24215,6 +24524,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24291,6 +24606,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24315,6 +24635,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25088,6 +25411,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25130,7 +25463,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25933,6 +26266,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25974,8 +26310,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27573,6 +27909,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29734,9 +30129,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29894,9 +30286,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29954,6 +30343,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30151,9 +30543,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/ca.po b/i18n/po/ca.po
index 1342b6d..2800a67 100644
--- a/i18n/po/ca.po
+++ b/i18n/po/ca.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-06 22:51+0100\n"
-"PO-Revision-Date: 2016-04-05 12:55+0000\n"
-"Last-Translator: pitort <pitort at eclipso.eu>\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
+"PO-Revision-Date: 2016-11-15 23:48+0000\n"
+"Last-Translator: Don-vip <Unknown>\n"
"Language-Team: el_libre - - www.catmidia.cat\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: 2016-11-07 04:39+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:42+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: ca\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr "S''està construïnt el menú principal"
msgid "Help"
msgstr "Ajuda"
+msgid "Initializing internal boundaries data"
+msgstr "S''estan inicialitzant les dades de de fronteres internes"
+
msgid "Initializing OSM API"
msgstr "S''està inicialitzant l''API de l''OSM"
+msgid "Initializing internal traffic data"
+msgstr "S''estan inicialitzant les dades de trànsit internes"
+
msgid "Initializing validator"
msgstr "S''està inicialitzant el validador"
@@ -210,6 +216,12 @@ msgid ""
msgstr ""
"Selecciona sobre el mapa els elements seleccionats a la llista de sobre."
+msgid "Select WMS layers"
+msgstr "Selecciona capes WMS"
+
+msgid "Add layers"
+msgstr "Afegeix capes"
+
msgid "Add imagery layer {0}"
msgstr "Afegeix la capa d''imatge {0}"
@@ -231,12 +243,6 @@ msgstr "S''ha produït un error"
msgid "Select image format for WMS layer"
msgstr "Seleccioneu el format d''imatge de la capa WMS"
-msgid "Select WMS layers"
-msgstr "Selecciona capes WMS"
-
-msgid "Add layers"
-msgstr "Afegeix capes"
-
msgid "Add Node..."
msgstr "Afegeix un node..."
@@ -491,7 +497,7 @@ msgid "Download notes in current view"
msgstr "Baixa les notes de la vista actual"
msgid "Download in current view"
-msgstr ""
+msgstr "Baixa en la visualització actual"
msgid "Download map data from the OSM server in current view"
msgstr ""
@@ -512,7 +518,7 @@ msgid "Duplicate"
msgstr "Duplica"
msgid "Duplicate selection."
-msgstr ""
+msgstr "Duplica la selecció"
msgid "Exit"
msgstr "Surt"
@@ -755,6 +761,9 @@ msgstr "Salta a la posició"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Obre una finestra que permet saltar a una posició específica"
+msgid "Jump to Position"
+msgstr "Salta a la posició"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Introduïu la latitud/ongitud per saltar a la posició"
@@ -776,9 +785,6 @@ msgstr "Adreça URL"
msgid "Jump there"
msgstr "Salta allà"
-msgid "Jump to Position"
-msgstr "Salta a la posició"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"No és possible analitzar la latitud, la longitud o l''apropament. Verifiqueu "
@@ -834,6 +840,9 @@ msgstr "Combina capa"
msgid "Merge the current layer into another layer"
msgstr "Combina la capa actual amb una altra capa"
+msgid "{0} completed in {1}"
+msgstr "{0} completat en {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Fusionant capes amb diferents polítiques de pujada"
@@ -1005,24 +1014,30 @@ msgstr[1] "S''estan obrint els fitxers {0} ..."
msgid "Opening file ''{0}'' ..."
msgstr "S''està obrint el fitxer ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr "Quines tasques s’han de fer?"
+
+msgid "Ok"
+msgstr "D''acord"
+
msgid "Open Location..."
msgstr "Obre una ubicació..."
msgid "Open an URL."
msgstr "Obre una adreça URL"
-msgid "Separate Layer"
-msgstr "Capa separada"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Seleccioneu si les dades haurien de baixar-se en una capa nova"
-
msgid "Enter URL to download:"
msgstr "Entreu URL per a baixar"
msgid "Enter an URL from where data should be downloaded"
msgstr "Introduïu una URL des d''on les dades han de ser baixades"
+msgid "Separate Layer"
+msgstr "Capa separada"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Seleccioneu si les dades haurien de baixar-se en una capa nova"
+
msgid "Download Location"
msgstr "Ubicació de baixada"
@@ -1038,12 +1053,6 @@ msgstr "Tanca el diàleg i cancel·la la baixada"
msgid "Download Data"
msgstr "Baixa dades"
-msgid "Which tasks to perform?"
-msgstr "Quines tasques s’han de fer?"
-
-msgid "Ok"
-msgstr "D''acord"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1142,13 +1151,14 @@ msgid "Paste"
msgstr "Enganxa"
msgid "Paste contents of clipboard."
-msgstr ""
+msgstr "Enganxa el contingut del porta-retalls"
msgid "Paste at source position"
-msgstr ""
+msgstr "Enganxa en la posició original"
msgid "Paste contents of clipboard at the position they were copied from."
msgstr ""
+"Enganxa el contingut del porta-retalls en la posició on es van copiar."
msgid "Paste Tags"
msgstr "Enganxa les etiquetes"
@@ -1573,10 +1583,10 @@ msgid "Unglue"
msgstr "Separa"
msgid "Where should the tags of the node be put?"
-msgstr ""
+msgstr "On s''haurien de posar les etiquetes del node?"
msgid "Where should the memberships of this node be put?"
-msgstr ""
+msgstr "On s''haurien de posar els membres d''aquest node?"
msgid "Unglued Node"
msgstr "Node separat"
@@ -1917,9 +1927,6 @@ msgstr "Consultar i baixar conjunts de canvis ..."
msgid "Errors during download"
msgstr "Errors durant la baixada"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr "Baixa del GPS"
@@ -3043,7 +3050,7 @@ msgid "Change relation {0}"
msgstr "Canvia relació {0}"
msgid "Change nodes of {0}"
-msgstr ""
+msgstr "Canvia els nodes de {0}"
msgid "Remove \"{0}\" for node ''{1}''"
msgstr "Suprimir \"{0}\" del node ''{1}''"
@@ -3556,7 +3563,7 @@ msgid "E"
msgstr "E"
msgid "Update default entries"
-msgstr ""
+msgstr "Actualitza les entrades predeterminades"
msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable"
msgstr ""
@@ -4096,7 +4103,7 @@ msgid "Reversed coastline"
msgstr "Línia de costa invertida"
msgid "invalid coastline"
-msgstr ""
+msgstr "Línia de costa no vàlida"
msgid "Conditional Keys"
msgstr "Claus condicionals"
@@ -4330,9 +4337,6 @@ msgstr "La via que delimita l''àrea no està tancada"
msgid "No outer way for multipolygon"
msgstr "No hi ha via exterior al multipolígon"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "El rol per ''{0}'' hauria de ser ''{1}''"
-
msgid "No area style for multipolygon"
msgstr "Manca l''estil d''àrea pel multipolígon."
@@ -4368,12 +4372,27 @@ msgstr "Estil d''àrea a la via externa"
msgid "Multipolygon is not closed"
msgstr "El multipolígon no està tancat"
-msgid "Multipolygon inner way is outside"
-msgstr "La via interior del multipolígon és a l''exterior"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "Intersecció entre multiplolígons"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "El rol per ''{0}'' hauria de ser ''{1}''"
+
+msgid "Multipolygon inner way is outside"
+msgstr "La via interior del multipolígon és a l''exterior"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "Rol no adequat per a un membre del multipolígon"
@@ -5100,12 +5119,18 @@ msgstr "Deshabilita l''accés als recursos indicats, separats per coma"
msgid "options provided as Java system properties"
msgstr "opcions proporcionades com a propietats de sistema de Java"
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/CAMÍ/VERS/JOSM/PREF "
msgid "Set the preferences directory"
msgstr "Estableix el directori de les preferències"
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/CAMÍ/VERS/JOSM/DADESUSUARI"
@@ -5122,11 +5147,9 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/CAMÍ/VERS/JOSM/DIRECTORIINICIAL "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Recol·loca els 3 directoris al directori inicial. El directori de la memòria "
-"cau serà a DirectoriInicial/cache"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5481,9 +5504,6 @@ msgstr "Feu clic per llançar la tasca en segon pla"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} completat en {1}"
-
msgid "Enlarge"
msgstr "Engrandeix"
@@ -5629,86 +5649,6 @@ msgstr "Conflicte al fons: suprimeix el membre"
msgid "Conflict foreground: remove member"
msgstr "Conflicte al primer pla: suprimeix el membre"
-msgid "My with Their"
-msgstr "La meva amb la seva"
-
-msgid "My with Merged"
-msgstr "El meu amb el fusionat"
-
-msgid "Their with Merged"
-msgstr "El seu amb el fusionat"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "El Rol {0} no participa a la parella de comparació {1}."
-
-msgid "Properties"
-msgstr "Propietats"
-
-msgid "Tags"
-msgstr "Etiquetes"
-
-msgid "Nodes"
-msgstr "Nodes"
-
-msgid "Members"
-msgstr "Membres"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Cap conflicte d''etiquetes pendents de resolució"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Etiquetes ({0} conflicte)"
-msgstr[1] "Etiquetes ({0} conflictes)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} conflicte d''etiquetes pendents de resoldre"
-msgstr[1] "{0} conflictes d''etiquetes pendents de resoldre"
-
-msgid "Nodes(resolved)"
-msgstr "Nodes(solucionat)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"La llista de nodes fusionats està bloquejada. No hi ha conflictes d''aquesta "
-"via a la llista."
-
-msgid "Nodes(with conflicts)"
-msgstr "Nodes(amb conflictes)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Conflictes pendents de resoldre a la llista de nodes d''aquesta via"
-
-msgid "Members(resolved)"
-msgstr "Membres(solucionat)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"La llista de membres fusuinats està bloquejada.No hi ha conflictes "
-"d''aquesta via a la llista."
-
-msgid "Members(with conflicts)"
-msgstr "Membres(amb conflictes)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Hi ha conflictes pendents a la llista de membres d''aquesta relació"
-
-msgid "No pending property conflicts"
-msgstr "No hi ha conflictes de propietats"
-
-msgid "Properties(with conflicts)"
-msgstr "Propietats(amb conflictes)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Propietats amb conflictes pendents de resolució"
-
-msgid "Conflict Resolution"
-msgstr "Resolució de conflictes"
-
msgid "{0} more..."
msgstr "{0} més..."
@@ -5897,6 +5837,86 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "La seva versió ({0} entrada)"
msgstr[1] "La seva versió ({0} entrades)"
+msgid "My with Their"
+msgstr "La meva amb la seva"
+
+msgid "My with Merged"
+msgstr "El meu amb el fusionat"
+
+msgid "Their with Merged"
+msgstr "El seu amb el fusionat"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "El Rol {0} no participa a la parella de comparació {1}."
+
+msgid "Properties"
+msgstr "Propietats"
+
+msgid "Tags"
+msgstr "Etiquetes"
+
+msgid "Nodes"
+msgstr "Nodes"
+
+msgid "Members"
+msgstr "Membres"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Cap conflicte d''etiquetes pendents de resolució"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Etiquetes ({0} conflicte)"
+msgstr[1] "Etiquetes ({0} conflictes)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} conflicte d''etiquetes pendents de resoldre"
+msgstr[1] "{0} conflictes d''etiquetes pendents de resoldre"
+
+msgid "Nodes(resolved)"
+msgstr "Nodes(solucionat)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"La llista de nodes fusionats està bloquejada. No hi ha conflictes d''aquesta "
+"via a la llista."
+
+msgid "Nodes(with conflicts)"
+msgstr "Nodes(amb conflictes)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Conflictes pendents de resoldre a la llista de nodes d''aquesta via"
+
+msgid "Members(resolved)"
+msgstr "Membres(solucionat)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"La llista de membres fusuinats està bloquejada.No hi ha conflictes "
+"d''aquesta via a la llista."
+
+msgid "Members(with conflicts)"
+msgstr "Membres(amb conflictes)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Hi ha conflictes pendents a la llista de membres d''aquesta relació"
+
+msgid "No pending property conflicts"
+msgstr "No hi ha conflictes de propietats"
+
+msgid "Properties(with conflicts)"
+msgstr "Propietats(amb conflictes)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Propietats amb conflictes pendents de resolució"
+
+msgid "Conflict Resolution"
+msgstr "Resolució de conflictes"
+
msgid "Node"
msgstr "Node"
@@ -5963,10 +5983,8 @@ msgstr "Rol"
msgid "Primitive"
msgstr "Primitiva"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"Els nodes fusionats encara no han estat bloquejats. No és possible de "
-"construir la comanda de resolució."
msgid "<undefined>"
msgstr "<sense definir>"
@@ -7484,116 +7502,19 @@ msgstr ""
"seu contingut"
msgid "Select changesets owned by specific users"
-msgstr "Els conjunts de canvis seleccionats pertanyen a diferents usuaris"
-
-msgid "Select changesets depending on whether they are open or closed"
-msgstr "Selecciona conjunts de canvis en funció de si són oberts o tancats"
-
-msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr ""
-"Seleccionar conjunts de canvis en base a la data i hora de la seva creació o "
-"tancament."
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr "Seleccionar conjunts de canvis relacionats amb una zona delimitada"
-
-msgid "Query open changesets only"
-msgstr "Consultar només els conjunts de canvis oberts"
-
-msgid "Query closed changesets only"
-msgstr "Consultar només els conjunts de canvis tancats"
-
-msgid "Query both open and closed changesets"
-msgstr "Consultar els conjunts de canvis oberts i els tancats"
-
-msgid "Only changesets owned by myself"
-msgstr "Només els meus conjunts de canvis"
-
-msgid "User ID:"
-msgstr "Identificador d''usuari:"
-
-msgid "User name:"
-msgstr "Nom d''usuari:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Només els conjunts de canvis de l''usuari amb el següent ID"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "Només els conjunts de canvis de l''usuari amb el següent nom"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Només els meus conjunts de canvis (deshabilitat. Utilitzeu JOSM amb un "
-"usuari anònim)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"No és possible de restringir la consulta sobre els conjunts de canvis a "
-"l''usuari actual perquè és anònim"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "L''actual valor ''{0}'' d''ID d''usuari no és vàlid"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"No és possible de restringir la consulta sobre el conjunt de canvis al nom "
-"d''usuari ''{0}''"
-
-msgid "Please enter a valid user ID"
-msgstr "Indiqueu un ID d''usuari vàlid"
-
-msgid "Invalid user ID"
-msgstr "L''ID de l''usuari no és vàlid"
-
-msgid "Please enter a non-empty user name"
-msgstr "Indiqueu un nom d''usuari"
-
-msgid "Invalid user name"
-msgstr "Nom d''usuari no vàlid"
-
-msgid "Date: "
-msgstr "Data: "
-
-msgid "Time:"
-msgstr "Temps:"
-
-msgid "Closed after - "
-msgstr "Tancat després - "
-
-msgid "Date:"
-msgstr "Data:"
-
-msgid "Created before - "
-msgstr "Creat abans - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Només els conjunts de canvis tancats després de la següent data/hora"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-"Només els conjunts de canvis tancats i creats abans de la següent data/hora"
+msgstr "Els conjunts de canvis seleccionats pertanyen a diferents usuaris"
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"No és possible de construir una consulta sobre conjunts de canvis basada en "
-"la data i hora. Les dades introduïdes no són vàlides."
+msgid "Select changesets depending on whether they are open or closed"
+msgstr "Selecciona conjunts de canvis en funció de si són oberts o tancats"
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Select changesets based on the date/time they have been created or closed"
msgstr ""
-"<html>Indiqueu una data i hora vàlides per a limitar<br>la consulta a un "
-"interval de temps específic.</html>"
+"Seleccionar conjunts de canvis en base a la data i hora de la seva creació o "
+"tancament."
-msgid "Invalid date/time values"
-msgstr "Els valors de data i hora no són vàlids"
+msgid "Select only changesets related to a specific bounding box"
+msgstr "Seleccionar conjunts de canvis relacionats amb una zona delimitada"
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
@@ -7612,28 +7533,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "El límits no són vàlids"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"El valor actual no és un ID d''usuari vàlid. Introduïu un valor enter > 0"
-
-msgid "Please enter an integer value > 0"
-msgstr "Indiqueu un valor enter més gran que 0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Indiqueu una data en el vostre format local.<br>Exemple: {0}<br>Exemple: "
-"{1}<br>Exemple: {2}<br>Exemple: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Indiqueu una hora en el vostre format local.<br>Exemple: {0}<br>Exemple: "
-"{1}<br>Exemple: {2}<br>Exemple: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Baixar només els meus conjunts de canvis"
@@ -7725,6 +7624,76 @@ msgstr "Consulta de URL de conjunts de canvis incorecta"
msgid "Close the dialog and abort querying of changesets"
msgstr "Tancar la finestra i anular la consulta de conjunts de canvis"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Indiqueu una data en el vostre format local.<br>Exemple: {0}<br>Exemple: "
+"{1}<br>Exemple: {2}<br>Exemple: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Consultar només els conjunts de canvis oberts"
+
+msgid "Query closed changesets only"
+msgstr "Consultar només els conjunts de canvis tancats"
+
+msgid "Query both open and closed changesets"
+msgstr "Consultar els conjunts de canvis oberts i els tancats"
+
+msgid "Date: "
+msgstr "Data: "
+
+msgid "Time:"
+msgstr "Temps:"
+
+msgid "Closed after - "
+msgstr "Tancat després - "
+
+msgid "Date:"
+msgstr "Data:"
+
+msgid "Created before - "
+msgstr "Creat abans - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Només els conjunts de canvis tancats després de la següent data/hora"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+"Només els conjunts de canvis tancats i creats abans de la següent data/hora"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"No és possible de construir una consulta sobre conjunts de canvis basada en "
+"la data i hora. Les dades introduïdes no són vàlides."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Indiqueu una data i hora vàlides per a limitar<br>la consulta a un "
+"interval de temps específic.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Els valors de data i hora no són vàlids"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Indiqueu una hora en el vostre format local.<br>Exemple: {0}<br>Exemple: "
+"{1}<br>Exemple: {2}<br>Exemple: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"El valor actual no és un ID d''usuari vàlid. Introduïu un valor enter > 0"
+
+msgid "Please enter an integer value > 0"
+msgstr "Indiqueu un valor enter més gran que 0"
+
msgid "URL: "
msgstr "Adreça URL: "
@@ -7746,6 +7715,55 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Aquesta URL de consulta de conjunts de canvis no és vàlida"
+msgid "Only changesets owned by myself"
+msgstr "Només els meus conjunts de canvis"
+
+msgid "User ID:"
+msgstr "Identificador d''usuari:"
+
+msgid "User name:"
+msgstr "Nom d''usuari:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Només els conjunts de canvis de l''usuari amb el següent ID"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "Només els conjunts de canvis de l''usuari amb el següent nom"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Només els meus conjunts de canvis (deshabilitat. Utilitzeu JOSM amb un "
+"usuari anònim)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"No és possible de restringir la consulta sobre els conjunts de canvis a "
+"l''usuari actual perquè és anònim"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "L''actual valor ''{0}'' d''ID d''usuari no és vàlid"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"No és possible de restringir la consulta sobre el conjunt de canvis al nom "
+"d''usuari ''{0}''"
+
+msgid "Please enter a valid user ID"
+msgstr "Indiqueu un ID d''usuari vàlid"
+
+msgid "Invalid user ID"
+msgstr "L''ID de l''usuari no és vàlid"
+
+msgid "Please enter a non-empty user name"
+msgstr "Indiqueu un nom d''usuari"
+
+msgid "Invalid user name"
+msgstr "Nom d''usuari no vàlid"
+
msgid "Activate"
msgstr "Activa"
@@ -8949,6 +8967,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10618,6 +10639,9 @@ msgstr "Direcció"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "Fitxers d''àudio wav (*.wav)"
+
msgid "Import Audio"
msgstr "Importar àudio"
@@ -10633,9 +10657,6 @@ msgstr ""
msgid "Import not possible"
msgstr "La importació no és possible"
-msgid "Wave Audio files (*.wav)"
-msgstr "Fitxers d''àudio wav (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Marcadors d''àudio de {0}"
@@ -10746,16 +10767,6 @@ msgstr "(l''URL era: "
msgid "Select the map painting styles"
msgstr "Seleccionar els estils per dibuixar el mapa"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-"Ha fallat la càrrega dels estils de Mappaint de ''{0}''. L''excepció ha "
-"estat: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr "carregant l''estil ''{0}''..."
@@ -10772,6 +10783,11 @@ msgstr[1] ""
"Ha hagut {0} errors en carregar aquest estil. Seleccioneu ''Informació'' al "
"menú que obtindreu amb el botó dret del ratolí per a més detalls."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+"Ha fallat la càrrega dels estils de Mappaint de ''{0}''. L''excepció ha "
+"estat: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
"Ha fallat l''anàlisi dels estils de Mappaint de ''{0}''. L''excepció ha "
@@ -11919,6 +11935,9 @@ msgstr "Dilució de la precisió (vermell = alta, verd = baixa, si disponible)"
msgid "Track date"
msgstr "Dades del recorregut"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Un únic color (personalitzable)"
@@ -11931,6 +11950,18 @@ msgstr "Bicicleta"
msgid "Foot"
msgstr "Peu"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Bosc"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Crear marcadors en llegir un fitxer GPX"
@@ -11943,6 +11974,9 @@ msgstr "Interval dinàmic de colors basat en els límits de les dades"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Millora els gràfics GPX (antialiàsing)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -12013,6 +12047,11 @@ msgstr ""
"visualització"
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -12037,10 +12076,17 @@ msgid "Colors points and track segments by its timestamp."
msgstr ""
"Acoloreix els punts i els segments del track segons la seva data i hora."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
"Permet ajustar el color del track per a diferents velocitats mitjanes."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Acoloriment de recorreguts i punts"
@@ -13360,6 +13406,12 @@ msgstr "Comprova si hi ha errors als objectes religiosos"
msgid "Checks for errors on relations"
msgstr "Comprova si hi ha errors a les relacions"
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr "Etiquetes innecessàries"
@@ -14526,6 +14578,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Desar nom d''usuari i contrasenya (sense encriptar)"
+msgid "Assume"
+msgstr "Assumeix"
+
+msgid "Existing values"
+msgstr "Valors existents"
+
msgid "<delete from {0} objects>"
msgstr "<supressió de {0} objectes>"
@@ -14548,12 +14606,6 @@ msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
"Majúscula+Enter: Afegeix totes les etiquetes als objectes seleccionats"
-msgid "Assume"
-msgstr "Assumeix"
-
-msgid "Existing values"
-msgstr "Valors existents"
-
msgid "Enable the checkbox to accept the value"
msgstr "Marqueu la casella de verificació per acceptar el valor"
@@ -15752,6 +15804,9 @@ msgstr "Afegint certificat del JOSM localhost a les claus {0}"
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr "Conflicte de drecera: ''{0}'' ha estat mogut per ''{1}'' a ''{2}''."
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -16268,14 +16323,17 @@ msgstr "Mapbox Satèl·lit"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr "OpenSeaMap"
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik Blanc i negre)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, sense etiquetes)"
@@ -16298,8 +16356,11 @@ msgstr "A peu i en bici"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Cambodja, Laos, Tailàndia, Vietnam (bilingüe)"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (supersposició)"
@@ -16349,8 +16410,8 @@ msgstr "Inspector OSM: llocs"
msgid "OSM Inspector: Highways"
msgstr "Inspector OSM: vies"
-msgid "OSM Inspector: Multipolygon"
-msgstr "Inspector OSM: multipolígons"
+msgid "OSM Inspector: Area"
+msgstr ""
msgid "OSM Inspector: Routing"
msgstr "Inspector OSM: enrutament"
@@ -16358,10 +16419,22 @@ msgstr "Inspector OSM: enrutament"
msgid "OSM Inspector: Addresses"
msgstr "Inspector OSM: adreces"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "Inspector OSM: Fronteres (UE)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -16397,6 +16470,12 @@ msgstr "LPI NSW Administrative Boundaries State Forest"
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr "LPI NSW Administrative Boundaries NPWS Reserve"
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -16442,10 +16521,16 @@ msgstr "VoGIS: Flächenwidmungsplan"
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -16481,14 +16566,32 @@ msgstr "SPW (Valònia) 2009-2010 imatgeria aèria"
msgid "TEC bus lines (2014)"
msgstr "TEC línies d''autobús (2014)"
-msgid "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
msgstr ""
msgid "IBGE Mapa de Setores Urbanos"
msgstr "IBGE Mapa de Sectors Urbans"
-msgid "IBGE Mapa de Setores Rurais"
-msgstr "IBGE Mapa de Sectors Rurals"
+msgid "IBGE Mapa de Setores Rurais"
+msgstr "IBGE Mapa de Sectors Rurals"
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
msgid "Geobase Hydrography"
msgstr "Geobase Hidrografia"
@@ -16502,12 +16605,34 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "Mosaic Columbia Britànica"
+msgid "Latest southwest British Columbia Landsat"
+msgstr ""
+
msgid "Kelowna 2012"
msgstr "Kelowna 2012"
msgid "Kelowna Roads overlay"
msgstr "Kelowna carreteres"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr ""
+
msgid "Czech CUZK:KM"
msgstr "Txèquia CUZK:KM"
@@ -16544,6 +16669,12 @@ msgstr "Stevns (Dinamarca)"
msgid "Vejmidte (Denmark)"
msgstr "Vejmidte (Dinamarca)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Mapa base d''Estònia (Maaamet)"
@@ -16577,9 +16708,6 @@ msgstr "Cadastre"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr "CRAIG - Auvergne 2013 - 25 cm"
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "GrandNancy Ortofotografia 2012"
@@ -16638,9 +16766,6 @@ msgstr ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
"- 1 m"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Llengua sòrab)"
-
msgid "Hamburg (40 cm)"
msgstr "Hamburg (40 cm)"
@@ -16668,9 +16793,6 @@ msgstr "Berlin fotografia aèria 2015"
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr "Stuttgart (imatgeria aèria)"
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16705,9 +16827,54 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metròpoli del Ruhr: imatgeria aèria (10 cm)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Imatgeria de drones (Haiti)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Imatgeria de drones 2014 (Haiti)"
@@ -16744,21 +16911,30 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
-msgstr "Budapest districte XII ortofoto 2013"
-
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Budapest district XI ortophoto 2015"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
-msgstr "Cinc districtes de Budapest: III, IV, XIII, XIV, XV"
-
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Hungria (rutes excursionistes)"
msgid "Hillshade Hungary"
msgstr ""
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -16819,9 +16995,21 @@ msgstr "PCN 2012 - Itàlia"
msgid "South Tyrol Orthofoto 2011"
msgstr "Tirol de Sud Ortofotomapa 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr "Tirol de Sud topogràfic"
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "USSR - Letònia"
@@ -16855,12 +17043,34 @@ msgstr "Delta del Níger Oct 2012 Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Ortofoto Svalbard 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Franja de Gaza - Pléiades - 2014/07/06"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Franja de Gaza - Pléiades - 2014/07/06 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Pangasinán/Bulacan (Filipines alta resolució)"
@@ -16987,9 +17197,6 @@ msgstr "Świętochłowice: Ortofotomapa 2012 (imatgeria aèria)"
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Zabrze: Ortofotomapa 2011 (imatgeria aèria)"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Szlaki camins)"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr "Wrocław: Ortofotogarfia 2015 (imatgeria aèria)"
@@ -16999,6 +17206,20 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Cotxe"
@@ -17020,12 +17241,30 @@ msgstr "RABA-KGZ: Eslovènia usos del sòl"
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr "RABA-KGZ: Eslovènia àrees edificades"
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr "Sud-àfrica CD:NGI Aeri"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr "Cadastre Espanya"
@@ -17047,6 +17286,9 @@ msgstr "IDEIB - Illes Balears"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Illes Canàries"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Kanton Aargau 25cm (AGIS 2011)"
@@ -17089,6 +17331,9 @@ msgstr "Cantó de Friburg 50cm (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Ciutat de Berna 10cm/25cm (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -17110,6 +17355,12 @@ msgstr "Bonvillars Orthofoto 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Fiez Orthofoto 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr "Taiwan e-Map Open Data"
@@ -17125,6 +17376,9 @@ msgstr "Taiwan Land-Section Data"
msgid "NLSC Open Data WMTS"
msgstr "NLSC Open Data WMTS"
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "MSR Mapes Topogràfics"
@@ -17152,9 +17406,54 @@ msgstr "NC darrera Ortoimatgeria"
msgid "U.S. Forest Service roads"
msgstr "Carreteres Servei Forestal USA"
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ucraïna - Ortofotomapes 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -17176,9 +17475,6 @@ msgstr "Surrey Air Survey"
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Scotland 1842-82"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr "NLS - OS 6-inch County Series 1888-1913"
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -17188,9 +17484,6 @@ msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr "NLS - OS 25-inch (Escòcia) 1892-1905"
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25k històric (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "OS 1:25k historic (OSM-Limited)"
@@ -17526,7 +17819,7 @@ msgstr "Baixa noves dades quan amplies o et mous"
msgid "Create a grid of ways."
msgstr "Crea una graella de vies."
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -17635,6 +17928,9 @@ msgstr "Eina simple per posar nombre a les cases"
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "Genera enllaços XML d''imatgeria per a multipolígons"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -20148,6 +20444,9 @@ msgstr "Rierol / Torrent / Riera"
msgid "River"
msgstr "Riu"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Canal"
@@ -21205,6 +21504,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr "Guest House/Bed & Breakfast"
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Cabana / Bungalou"
@@ -21271,6 +21576,12 @@ msgstr "Seients a l''aire lliure"
msgid "Takeaway"
msgstr "Menjar per emportar"
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Menjar ràpid"
@@ -22216,31 +22527,19 @@ msgstr "Aguait"
msgid "Hunting Stand"
msgstr "Torre d''observació"
-msgid "Height"
-msgstr "Alçada"
-
-msgctxt "height"
-msgid "low"
-msgstr "baix"
-
-msgctxt "height"
-msgid "half"
-msgstr "mitja"
-
-msgctxt "height"
-msgid "full"
-msgstr "alta"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr "Amagatall"
-msgid "Lock"
-msgstr "Bloca"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr "Punt d''aigua"
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr "Aire comprimit"
@@ -22832,6 +23131,10 @@ msgid "hut"
msgstr "refugi"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr "dormitori"
@@ -24127,6 +24430,9 @@ msgstr "Carnisseria"
msgid "Seafood"
msgstr "Peixateria"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Delicatessen (al detall)"
@@ -24944,9 +25250,6 @@ msgstr "Arbreda"
msgid "A line of trees."
msgstr "Filera d''arbres"
-msgid "Wood"
-msgstr "Bosc"
-
msgid "Woodland where timber production does not dominate use."
msgstr "Bosc on la producció de fusta no és un ús dominant."
@@ -26008,6 +26311,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0} és obsolet"
@@ -26117,6 +26423,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} a un node. Ha de ser utilitzat a una via."
@@ -26193,6 +26505,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} ha de ser al node on {1} i {2} es creuen"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "nom abreviat del carrer"
@@ -26217,6 +26534,9 @@ msgstr "{0} usat amb {1}"
msgid "street name contains ss"
msgstr "el nom del carrer conté ss"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -27033,6 +27353,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr "Puja fotografies"
@@ -27075,7 +27405,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -27993,6 +28323,9 @@ msgstr "Seleccioneu un àrea (p.ex. un edifici) sobre una imatge subjacent."
msgid "Area Selector"
msgstr "Selector d''àrea"
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr "Àrea creada"
@@ -28040,11 +28373,9 @@ msgid "Algorithm"
msgstr "Algorisme"
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
-"Nombre màxim de píxels que un punt pot estar lluny d''una línia i tot i així "
-"ser considerat com a membre d''aquesta línia (Valor per defecte: {0})."
msgid "Distance Tolerance"
msgstr "Tolerància de distància"
@@ -29784,6 +30115,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Obre fitxer d''imatgeria XML"
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr "Capa de calibratge"
@@ -32119,9 +32509,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -32281,9 +32668,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr "[gap]"
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "Patrons de ruta ..."
@@ -32341,6 +32725,9 @@ msgstr "costat esquerre"
msgid "Maximum distance from route"
msgstr "Distància máxima de la ruta"
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "Transport públic: modificar el tipus de parada"
@@ -32547,9 +32934,6 @@ msgstr "Reconstruir polígon"
msgid "Multipolygon must consist only of ways"
msgstr "Un multipolígon només pot estar format per vies"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr "La reconstrucció de polígons només pot fer-se amb vies exteriors"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Reconstruir polígons a partir de la relació {0}"
diff --git a/i18n/po/ca at valencia.po b/i18n/po/ca at valencia.po
index 9df2780..30921b8 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:19+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:26+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: ca at valencia\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr "S''està construïnt el menú principal"
msgid "Help"
msgstr "Ajuda"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "S''està inicialitzant l''API de l''OSM"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "S''està inicialitzant el validador"
@@ -206,6 +212,12 @@ msgid ""
msgstr ""
"Selecciona sobre el mapa els elements seleccionats a la llista de sobre."
+msgid "Select WMS layers"
+msgstr "Selecciona capes WMS"
+
+msgid "Add layers"
+msgstr "Afig capes"
+
msgid "Add imagery layer {0}"
msgstr "Afig la capa d''imatge {0}"
@@ -227,12 +239,6 @@ msgstr "S''ha produït un error"
msgid "Select image format for WMS layer"
msgstr "Seleccioneu el format d''imatge de la capa WMS"
-msgid "Select WMS layers"
-msgstr "Selecciona capes WMS"
-
-msgid "Add layers"
-msgstr "Afig capes"
-
msgid "Add Node..."
msgstr "Afig un node..."
@@ -746,6 +752,9 @@ msgstr "Salta a la posició"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Obri una finestra que permet saltar a una posició específica"
+msgid "Jump to Position"
+msgstr "Salta a la posició"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Introduïu la latitud/ongitud per saltar a la posició"
@@ -767,9 +776,6 @@ msgstr "Adreça URL"
msgid "Jump there"
msgstr "Salta allà"
-msgid "Jump to Position"
-msgstr "Salta a la posició"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"No és possible analitzar la latitud, la longitud o l''apropament. Verifiqueu "
@@ -825,6 +831,9 @@ msgstr "Combina capa"
msgid "Merge the current layer into another layer"
msgstr "Combina la capa actual amb una altra capa"
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr "Fusionant capes amb diferents polítiques de pujada"
@@ -996,24 +1005,30 @@ msgstr[1] "S''estan obrint els fitxers {0} ..."
msgid "Opening file ''{0}'' ..."
msgstr "S''està obrint el fitxer ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "D''acord"
+
msgid "Open Location..."
msgstr "Obri una ubicació..."
msgid "Open an URL."
msgstr "Obri una adreça URL"
-msgid "Separate Layer"
-msgstr "Capa separada"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Seleccioneu si les dades haurien de baixar-se en una capa nova"
-
msgid "Enter URL to download:"
msgstr "Entreu URL per descarregar"
msgid "Enter an URL from where data should be downloaded"
msgstr "Introduïu una URL des d''on les dades han de ser descarregades"
+msgid "Separate Layer"
+msgstr "Capa separada"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Seleccioneu si les dades haurien de baixar-se en una capa nova"
+
msgid "Download Location"
msgstr "Ubicació de descàrrega"
@@ -1029,12 +1044,6 @@ msgstr "Tanca el diàleg i cancel·la la baixada"
msgid "Download Data"
msgstr "Baixa dades"
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr "D''acord"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1905,9 +1914,6 @@ msgstr "Consultar i descarregar conjunts de canvis ..."
msgid "Errors during download"
msgstr "Errors durant la descàrrega"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr "Descarrega GPS"
@@ -4269,9 +4275,6 @@ msgstr "La via que delimita l''àrea no està tancada"
msgid "No outer way for multipolygon"
msgstr "No hi ha via exterior al multipolígon"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -4301,12 +4304,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr "El multipolígon no està tancat"
-msgid "Multipolygon inner way is outside"
-msgstr "La via interior del multipolígon és a l''exterior"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "Intersecció entre multiplolígons"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr "La via interior del multipolígon és a l''exterior"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "Rol no adequat per a un membre del multipolígon"
@@ -5022,12 +5040,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr "opcions proporcionades com a propietats de sistema de Java"
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -5044,8 +5068,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5378,9 +5402,6 @@ msgstr "Feu clic per llançar la tasca en segon pla"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5522,86 +5543,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr "La meua amb la seua"
-
-msgid "My with Merged"
-msgstr "El meu amb el fusionat"
-
-msgid "Their with Merged"
-msgstr "El seu amb el fusionat"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "El Rol {0} no participa a la parella de comparació {1}."
-
-msgid "Properties"
-msgstr "Propietats"
-
-msgid "Tags"
-msgstr "Etiquetes"
-
-msgid "Nodes"
-msgstr "Nodes"
-
-msgid "Members"
-msgstr "Membres"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Cap conflicte d''etiquetes pendents de resolució"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Etiquetes ({0} conflicte)"
-msgstr[1] "Etiquetes ({0} conflictes)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} conflicte d''etiquetes pendents de resoldre"
-msgstr[1] "{0} conflictes d''etiquetes pendents de resoldre"
-
-msgid "Nodes(resolved)"
-msgstr "Nodes(solucionat)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"La llista de nodes fusionats està bloquejada. No hi ha conflictes d''esta "
-"via a la llista."
-
-msgid "Nodes(with conflicts)"
-msgstr "Nodes(amb conflictes)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Conflictes pendents de resoldre a la llista de nodes d''esta via"
-
-msgid "Members(resolved)"
-msgstr "Membres(solucionat)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"La llista de membres fusuinats està bloquejada.No hi ha conflictes d''esta "
-"via a la llista."
-
-msgid "Members(with conflicts)"
-msgstr "Membres(amb conflictes)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Hi ha conflictes pendents a la llista de membres d''esta relació"
-
-msgid "No pending property conflicts"
-msgstr "No hi ha conflictes de propietats"
-
-msgid "Properties(with conflicts)"
-msgstr "Propietats(amb conflictes)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Propietats amb conflictes pendents de resolució"
-
-msgid "Conflict Resolution"
-msgstr "Resolució de conflictes"
-
msgid "{0} more..."
msgstr "{0} més..."
@@ -5790,6 +5731,86 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "La seua versió ({0} entrada)"
msgstr[1] "La seua versió ({0} entrades)"
+msgid "My with Their"
+msgstr "La meua amb la seua"
+
+msgid "My with Merged"
+msgstr "El meu amb el fusionat"
+
+msgid "Their with Merged"
+msgstr "El seu amb el fusionat"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "El Rol {0} no participa a la parella de comparació {1}."
+
+msgid "Properties"
+msgstr "Propietats"
+
+msgid "Tags"
+msgstr "Etiquetes"
+
+msgid "Nodes"
+msgstr "Nodes"
+
+msgid "Members"
+msgstr "Membres"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Cap conflicte d''etiquetes pendents de resolució"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Etiquetes ({0} conflicte)"
+msgstr[1] "Etiquetes ({0} conflictes)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} conflicte d''etiquetes pendents de resoldre"
+msgstr[1] "{0} conflictes d''etiquetes pendents de resoldre"
+
+msgid "Nodes(resolved)"
+msgstr "Nodes(solucionat)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"La llista de nodes fusionats està bloquejada. No hi ha conflictes d''esta "
+"via a la llista."
+
+msgid "Nodes(with conflicts)"
+msgstr "Nodes(amb conflictes)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Conflictes pendents de resoldre a la llista de nodes d''esta via"
+
+msgid "Members(resolved)"
+msgstr "Membres(solucionat)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"La llista de membres fusuinats està bloquejada.No hi ha conflictes d''esta "
+"via a la llista."
+
+msgid "Members(with conflicts)"
+msgstr "Membres(amb conflictes)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Hi ha conflictes pendents a la llista de membres d''esta relació"
+
+msgid "No pending property conflicts"
+msgstr "No hi ha conflictes de propietats"
+
+msgid "Properties(with conflicts)"
+msgstr "Propietats(amb conflictes)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Propietats amb conflictes pendents de resolució"
+
+msgid "Conflict Resolution"
+msgstr "Resolució de conflictes"
+
msgid "Node"
msgstr "Node"
@@ -5856,10 +5877,8 @@ msgstr "Rol"
msgid "Primitive"
msgstr "Primitiva"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"Els nodes fusionats encara no han estat bloquejats. No és possible de "
-"construir la comanda de resolució."
msgid "<undefined>"
msgstr "<sense definir>"
@@ -7325,105 +7344,8 @@ msgstr ""
"Seleccionar conjunts de canvis en base a la data i hora de la seua creació o "
"tancament."
-msgid "Select only changesets related to a specific bounding box"
-msgstr "Seleccionar conjunts de canvis relacionats amb una zona delimitada"
-
-msgid "Query open changesets only"
-msgstr "Consultar només els conjunts de canvis oberts"
-
-msgid "Query closed changesets only"
-msgstr "Consultar només els conjunts de canvis tancats"
-
-msgid "Query both open and closed changesets"
-msgstr "Consultar els conjunts de canvis oberts i els tancats"
-
-msgid "Only changesets owned by myself"
-msgstr "Només els meus conjunts de canvis"
-
-msgid "User ID:"
-msgstr "Identificador d''usuari:"
-
-msgid "User name:"
-msgstr "Nom d''usuari:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Només els conjunts de canvis de l''usuari amb el següent ID"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "Només els conjunts de canvis de l''usuari amb el següent nom"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Només els meus conjunts de canvis (deshabilitat. Utilitzeu JOSM amb un "
-"usuari anònim)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"No és possible de restringir la consulta sobre els conjunts de canvis a "
-"l''usuari actual perquè és anònim"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "L''actual valor ''{0}'' d''ID d''usuari no és vàlid"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"No és possible de restringir la consulta sobre el conjunt de canvis al nom "
-"d''usuari ''{0}''"
-
-msgid "Please enter a valid user ID"
-msgstr "Per favor, indiqueu un ID d''usuari vàlid"
-
-msgid "Invalid user ID"
-msgstr "L''ID de l''usuari no és vàlid"
-
-msgid "Please enter a non-empty user name"
-msgstr "Per favor, indiqueu un nom d''usuari"
-
-msgid "Invalid user name"
-msgstr "Nom d''usuari no vàlid"
-
-msgid "Date: "
-msgstr "Data: "
-
-msgid "Time:"
-msgstr "Temps:"
-
-msgid "Closed after - "
-msgstr "Tancat després - "
-
-msgid "Date:"
-msgstr "Data:"
-
-msgid "Created before - "
-msgstr "Creat abans - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Només els conjunts de canvis tancats després de la següent data/hora"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-"Només els conjunts de canvis tancats i creats abans de la següent data/hora"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"No és possible de construir una consulta sobre conjunts de canvis basada en "
-"la data i hora. Les dades introduïdes no són vàlides."
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr ""
-"<html>Per favor, indiqueu una data i hora vàlides per a limitar<br>la "
-"consulta a un interval de temps específic.</html>"
-
-msgid "Invalid date/time values"
-msgstr "Els valors de data i hora no són vàlids"
+msgid "Select only changesets related to a specific bounding box"
+msgstr "Seleccionar conjunts de canvis relacionats amb una zona delimitada"
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
@@ -7442,29 +7364,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "El límits no són vàlids"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"El valor actual no és un ID d''usuari vàlid. Per favor, introduïu un valor "
-"enter > 0"
-
-msgid "Please enter an integer value > 0"
-msgstr "Per favor, indiqueu un valor enter més gran que 0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Per favor, indiqueu una data en el vostre format local.<br>Exemple: "
-"{0}<br>Exemple: {1}<br>Exemple: {2}<br>Exemple: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Per favor, indiqueu una hora en el vostre format local.<br>Exemple: "
-"{0}<br>Exemple: {1}<br>Exemple: {2}<br>Exemple: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Descarregar només els meus conjunts de canvis"
@@ -7558,6 +7457,77 @@ msgstr "Consulta d’URL de conjunts de canvis incorecta"
msgid "Close the dialog and abort querying of changesets"
msgstr "Tancar la finestra i anular la consulta de conjunts de canvis"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Per favor, indiqueu una data en el vostre format local.<br>Exemple: "
+"{0}<br>Exemple: {1}<br>Exemple: {2}<br>Exemple: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Consultar només els conjunts de canvis oberts"
+
+msgid "Query closed changesets only"
+msgstr "Consultar només els conjunts de canvis tancats"
+
+msgid "Query both open and closed changesets"
+msgstr "Consultar els conjunts de canvis oberts i els tancats"
+
+msgid "Date: "
+msgstr "Data: "
+
+msgid "Time:"
+msgstr "Temps:"
+
+msgid "Closed after - "
+msgstr "Tancat després - "
+
+msgid "Date:"
+msgstr "Data:"
+
+msgid "Created before - "
+msgstr "Creat abans - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Només els conjunts de canvis tancats després de la següent data/hora"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+"Només els conjunts de canvis tancats i creats abans de la següent data/hora"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"No és possible de construir una consulta sobre conjunts de canvis basada en "
+"la data i hora. Les dades introduïdes no són vàlides."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Per favor, indiqueu una data i hora vàlides per a limitar<br>la "
+"consulta a un interval de temps específic.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Els valors de data i hora no són vàlids"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Per favor, indiqueu una hora en el vostre format local.<br>Exemple: "
+"{0}<br>Exemple: {1}<br>Exemple: {2}<br>Exemple: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"El valor actual no és un ID d''usuari vàlid. Per favor, introduïu un valor "
+"enter > 0"
+
+msgid "Please enter an integer value > 0"
+msgstr "Per favor, indiqueu un valor enter més gran que 0"
+
msgid "URL: "
msgstr "Adreça URL: "
@@ -7580,6 +7550,55 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Esta URL de consulta de conjunts de canvis no és vàlida"
+msgid "Only changesets owned by myself"
+msgstr "Només els meus conjunts de canvis"
+
+msgid "User ID:"
+msgstr "Identificador d''usuari:"
+
+msgid "User name:"
+msgstr "Nom d''usuari:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Només els conjunts de canvis de l''usuari amb el següent ID"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "Només els conjunts de canvis de l''usuari amb el següent nom"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Només els meus conjunts de canvis (deshabilitat. Utilitzeu JOSM amb un "
+"usuari anònim)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"No és possible de restringir la consulta sobre els conjunts de canvis a "
+"l''usuari actual perquè és anònim"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "L''actual valor ''{0}'' d''ID d''usuari no és vàlid"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"No és possible de restringir la consulta sobre el conjunt de canvis al nom "
+"d''usuari ''{0}''"
+
+msgid "Please enter a valid user ID"
+msgstr "Per favor, indiqueu un ID d''usuari vàlid"
+
+msgid "Invalid user ID"
+msgstr "L''ID de l''usuari no és vàlid"
+
+msgid "Please enter a non-empty user name"
+msgstr "Per favor, indiqueu un nom d''usuari"
+
+msgid "Invalid user name"
+msgstr "Nom d''usuari no vàlid"
+
msgid "Activate"
msgstr "Activa"
@@ -8775,6 +8794,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10444,6 +10466,9 @@ msgstr "Direcció"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "Fitxers d''àudio wav (*.wav)"
+
msgid "Import Audio"
msgstr "Importar àudio"
@@ -10459,9 +10484,6 @@ msgstr ""
msgid "Import not possible"
msgstr "La importació no és possible"
-msgid "Wave Audio files (*.wav)"
-msgstr "Fitxers d''àudio wav (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Marcadors d''àudio de {0}"
@@ -10572,16 +10594,6 @@ msgstr "(La URL era: "
msgid "Select the map painting styles"
msgstr "Seleccionar els estils per dibuixar el mapa"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-"Ha fallat la càrrega dels estils de Mappaint de ''{0}''. L''excepció ha "
-"estat: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr "carregant l''estil ''{0}''..."
@@ -10598,6 +10610,11 @@ msgstr[1] ""
"Ha hagut {0} errors en carregar este estil. Seleccioneu ''Informació'' al "
"menú que obtindreu amb el botó dret del ratolí per a més detalls."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+"Ha fallat la càrrega dels estils de Mappaint de ''{0}''. L''excepció ha "
+"estat: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
"Ha fallat l''anàlisi dels estils de Mappaint de ''{0}''. L''excepció ha "
@@ -11749,6 +11766,9 @@ msgstr "Dilució de la precisió (roig = alta, verd = baixa, si disponible)"
msgid "Track date"
msgstr "Dades del recorregut"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Un únic color (personalitzable)"
@@ -11761,6 +11781,18 @@ msgstr "Bicicleta"
msgid "Foot"
msgstr "Peu"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Bosc"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Crear marcadors en llegir un fitxer GPX"
@@ -11773,6 +11805,9 @@ msgstr "Interval dinàmic de colors basat en els límits de les dades"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Millora els gràfics GPX (antialiàsing)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11842,6 +11877,11 @@ msgstr ""
"visualització"
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11866,10 +11906,17 @@ msgid "Colors points and track segments by its timestamp."
msgstr ""
"Acoloreix els punts i els segments del track segons la seua data i hora."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
"Permet ajustar el color del track per a diferents velocitats mitjanes."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Acoloriment de recorreguts i punts"
@@ -13172,6 +13219,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -14331,6 +14384,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Guardar nom d''usuari i contrasenya (sense encriptar)"
+msgid "Assume"
+msgstr "Assumeix"
+
+msgid "Existing values"
+msgstr "Valors existents"
+
msgid "<delete from {0} objects>"
msgstr "<supressió de {0} objectes>"
@@ -14352,12 +14411,6 @@ msgstr "Afig les etiquetes verificades als objectes seleccionats"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Majúscula+Enter: Afig totes les etiquetes als objectes seleccionats"
-msgid "Assume"
-msgstr "Assumeix"
-
-msgid "Existing values"
-msgstr "Valors existents"
-
msgid "Enable the checkbox to accept the value"
msgstr "Marqueu la casella de verificació per acceptar el valor"
@@ -15537,6 +15590,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr "Conflicte de drecera: ''{0}'' ha estat mogut per ''{1}'' a ''{2}''."
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -16054,13 +16110,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -16084,7 +16143,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -16135,7 +16197,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -16144,10 +16206,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -16183,6 +16257,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -16228,10 +16308,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -16261,37 +16347,77 @@ msgstr ""
msgid "SPW(allonie) 2012-2013 aerial imagery"
msgstr ""
-msgid "SPW(allonie) 2009-2010 aerial imagery"
+msgid "SPW(allonie) 2009-2010 aerial imagery"
+msgstr ""
+
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -16330,6 +16456,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -16363,9 +16495,6 @@ msgstr "Cadastre"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -16422,9 +16551,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -16452,9 +16578,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16488,9 +16611,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -16527,19 +16695,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -16602,9 +16779,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -16638,12 +16827,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -16770,9 +16981,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -16782,6 +16990,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -16803,12 +17025,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -16830,6 +17070,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -16872,6 +17115,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -16893,6 +17139,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -16908,6 +17160,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -16935,9 +17190,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -16959,9 +17259,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -16971,9 +17268,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -17301,7 +17595,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr "Crea una graella de vies."
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -17402,6 +17696,9 @@ msgstr "Eina simple per posar nombre a les cases"
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "Genera enllaços XML d''imatgeria per a multipolígons"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -19878,6 +20175,9 @@ msgstr "Riera / Torrent"
msgid "River"
msgstr "Riu"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Canal"
@@ -20928,6 +21228,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Cabana / Bungalou"
@@ -20994,6 +21300,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Menjar ràpid"
@@ -21937,31 +22249,19 @@ msgstr "Aguait"
msgid "Hunting Stand"
msgstr "Base de caça"
-msgid "Height"
-msgstr "Alçada"
-
-msgctxt "height"
-msgid "low"
-msgstr "baix"
-
-msgctxt "height"
-msgid "half"
-msgstr "mitja"
-
-msgctxt "height"
-msgid "full"
-msgstr "alta"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
-msgstr "Bloca"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -22553,6 +22853,10 @@ msgid "hut"
msgstr "refugi"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -23846,6 +24150,9 @@ msgstr "Carnisseria"
msgid "Seafood"
msgstr "Peixateria"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Delicatessen (al detall)"
@@ -24659,9 +24966,6 @@ msgstr "Filera d''arbres"
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr "Bosc"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -25706,6 +26010,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0} és obsolet"
@@ -25797,6 +26104,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -25873,6 +26186,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "nom abreviat del carrer"
@@ -25897,6 +26215,9 @@ msgstr ""
msgid "street name contains ss"
msgstr "el nom del carrer conté ss"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -26699,6 +27020,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -26741,7 +27072,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -27657,6 +27988,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -27698,8 +28032,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -29415,6 +29749,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Obri fitxer d''imatgeria XML"
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr "Capa de calibratge"
@@ -31745,9 +32138,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -31907,9 +32297,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr "[gap]"
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "Patrons de ruta ..."
@@ -31967,6 +32354,9 @@ msgstr "costat esquerre"
msgid "Maximum distance from route"
msgstr "Distància máxima de la ruta"
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "Transport públic: modificar el tipus de parada"
@@ -32171,9 +32561,6 @@ msgstr "Reconstruir polígon"
msgid "Multipolygon must consist only of ways"
msgstr "Un multipolígon només pot estar format per vies"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr "La reconstrucció de polígons només pot fer-se amb vies exteriors"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Reconstruir polígons a partir de la relació {0}"
diff --git a/i18n/po/cs.po b/i18n/po/cs.po
index 2cbcdf6..afa6c84 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: 2016-11-06 22:51+0100\n"
-"PO-Revision-Date: 2016-10-26 12:26+0000\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
+"PO-Revision-Date: 2017-01-03 08:58+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: 2016-11-07 04:39+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:43+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: cs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -65,9 +65,15 @@ msgstr "Sestavování hlavního menu"
msgid "Help"
msgstr "Nápověda"
+msgid "Initializing internal boundaries data"
+msgstr "Inicializuji interní data hranic"
+
msgid "Initializing OSM API"
msgstr "Inicializace API OSM"
+msgid "Initializing internal traffic data"
+msgstr "Inicializuji interní data o dopravě"
+
msgid "Initializing validator"
msgstr "Inicializace validátoru"
@@ -212,6 +218,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr "Přidá vybrané prvky na mapě do výběru výše."
+msgid "Select WMS layers"
+msgstr "Vybrat WMS vrstvy"
+
+msgid "Add layers"
+msgstr "Přidat vrstvy"
+
msgid "Add imagery layer {0}"
msgstr "Přidat vrstvu podkladových map {0}"
@@ -233,12 +245,6 @@ msgstr "Chyba"
msgid "Select image format for WMS layer"
msgstr "Zvolit formát obrazu vrstvy WMS"
-msgid "Select WMS layers"
-msgstr "Vybrat WMS vrstvy"
-
-msgid "Add layers"
-msgstr "Přidat vrstvy"
-
msgid "Add Node..."
msgstr "Přidat uzel..."
@@ -752,6 +758,9 @@ msgstr "Skok na pozici"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Otevřít dialog umožňující skočit na zadané místo"
+msgid "Jump to Position"
+msgstr "Skok na místo"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Zadejte šířku/délku místa kam skočit."
@@ -773,9 +782,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Skočit tam"
-msgid "Jump to Position"
-msgstr "Skok na místo"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr "Nelze rozpoznat šířku, délku nebo zvětšení. Prosím, zkontrolujte to."
@@ -829,6 +835,9 @@ msgstr "Sloučit vrstvu"
msgid "Merge the current layer into another layer"
msgstr "Sloučit aktuální vrstvu do jiné vrstvy"
+msgid "{0} completed in {1}"
+msgstr "{0} dokončeno v {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Slučování vrstev s odlišnými pravidly nahrávání"
@@ -1003,24 +1012,30 @@ msgstr[2] "Otevírám {0} souborů..."
msgid "Opening file ''{0}'' ..."
msgstr "Otevírání souboru ''{0}'' …"
+msgid "Which tasks to perform?"
+msgstr "Jakou akci provést?"
+
+msgid "Ok"
+msgstr "Ok"
+
msgid "Open Location..."
msgstr "Otevřít z URL..."
msgid "Open an URL."
msgstr "Stáhnout data z OSM podle zadaného URL."
-msgid "Separate Layer"
-msgstr "Do samostatné vrstvy"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Zvolte, pokud mají být data stažena do nové vrstvy"
-
msgid "Enter URL to download:"
msgstr "Zadejte URL ke stažení:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Vložte URL, ze kterého mají být stažena data"
+msgid "Separate Layer"
+msgstr "Do samostatné vrstvy"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Zvolte, pokud mají být data stažena do nové vrstvy"
+
msgid "Download Location"
msgstr "Stáhnout data z URL"
@@ -1036,12 +1051,6 @@ msgstr "Zavřít dialog a ukončit stahování"
msgid "Download Data"
msgstr "Stáhnout data"
-msgid "Which tasks to perform?"
-msgstr "Jakou akci provést?"
-
-msgid "Ok"
-msgstr "Ok"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1900,9 +1909,6 @@ msgstr "Dotaz a stažení sad změn ..."
msgid "Errors during download"
msgstr "Chyby během stahování"
-msgid "Download Geo URL"
-msgstr "Stáhnout Geo URL"
-
msgid "Download GPS"
msgstr "Stáhnout GPS"
@@ -4302,9 +4308,6 @@ msgstr "Cesta typu plochy není uzavřená"
msgid "No outer way for multipolygon"
msgstr "Multipolygon nemá vnější cestu"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "Role u ''{0}'' by měla být ''{1}''"
-
msgid "No area style for multipolygon"
msgstr "Multipolygon nemá žádný styl plochy"
@@ -4344,12 +4347,27 @@ msgstr "Styl plochy na vnější cestě"
msgid "Multipolygon is not closed"
msgstr "Multipolygon není uzavřený"
-msgid "Multipolygon inner way is outside"
-msgstr "Vnitřní cesta multipolygonu je venku"
+msgid "Multipolygon rings share node(s)"
+msgstr "Kruhy multipolygonu sdílejí uzel/uzly"
msgid "Intersection between multipolygon ways"
msgstr "Křížení mezi cestami v multipolygonu"
+msgid "Multipolygon rings are equal"
+msgstr "Kruhy multipolygonu jsou shodné"
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "Role u ''{0}'' by měla být ''{1}''"
+
+msgid "Multipolygon inner way is outside"
+msgstr "Vnitřní cesta multipolygonu je venku"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr "Kruhy multipolygonu obsahují segmenty dvakrát"
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr "Vnější cesty multipolygonu sdílejí segment(y) s jinými kruhy"
+
msgid "No useful role for multipolygon member"
msgstr "Žádná použitelná role členu multipolygonu"
@@ -5066,12 +5084,18 @@ msgstr "Zakázat přístup k uvedeným zdrojům, odděleným čárkou"
msgid "options provided as Java system properties"
msgstr "Volby poskytované jako systémové vlastnosti Java"
+msgid "Change the JOSM directory name"
+msgstr "Změnit název adresáře JOSM"
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/CESTA/K/JOSM/PREF "
msgid "Set the preferences directory"
msgstr "Nastavit adresář předvoleb"
+msgid "Default: {0}"
+msgstr "Výchozí: {0}"
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/CESTA/K/JOSM/USERDATA"
@@ -5088,10 +5112,10 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/CESTA/K/JOSM/HOMEDIR "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Přesunout všechny tři adresáře do homedir. Adresář keše bude v homedir/cache"
+"Nastavit adresář předvoleb+dat+keše (adresář keše bude josm.home/cache)"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5438,9 +5462,6 @@ msgstr "Kliknutím přesunete úlohu na pozadí"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} dokončeno v {1}"
-
msgid "Enlarge"
msgstr "Zvětšit"
@@ -5585,88 +5606,6 @@ msgstr "Pozadí konfliktu: odebrat člen"
msgid "Conflict foreground: remove member"
msgstr "Popředí konfliktu: odebrat člen"
-msgid "My with Their"
-msgstr "Můj s cizím"
-
-msgid "My with Merged"
-msgstr "Můj se sloučeným"
-
-msgid "Their with Merged"
-msgstr "Cizí se sloučeným"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "Role {0} není součástí srovnávané dvojice {1}."
-
-msgid "Properties"
-msgstr "Vlastnosti"
-
-msgid "Tags"
-msgstr "Značky"
-
-msgid "Nodes"
-msgstr "Body"
-
-msgid "Members"
-msgstr "Členové"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Nezbývají žádné další konflikty značek k vyřešení"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Značky ({0} konflikt)"
-msgstr[1] "Značky ({0} konflikty)"
-msgstr[2] "Značky ({0} konfliktů)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} zbývající konflikt značek k vyřešení"
-msgstr[1] "{0} zbývající konflikty značek k vyřešení"
-msgstr[2] "{0} zbývajících konfliktů značek k vyřešení"
-
-msgid "Nodes(resolved)"
-msgstr "Body(vyřešeno)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Seznam sloučených uzlů zablokován. Již nezbývají žádné konflikty v seznamu "
-"uzlů této cesty."
-
-msgid "Nodes(with conflicts)"
-msgstr "Body(s konflikty)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Nevyřešené konflikty v seznamu uzlů této cesty"
-
-msgid "Members(resolved)"
-msgstr "Členové(vyřešeno)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Seznam slučovaných členů zablokován. Již nezbývají žádné konflikty v seznamu "
-"členů této relace."
-
-msgid "Members(with conflicts)"
-msgstr "Členy (s konflikty)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Nevyřešené konflikty v seznamu členů této relace"
-
-msgid "No pending property conflicts"
-msgstr "Nezbývají žádné konflikty ve vlastnostech"
-
-msgid "Properties(with conflicts)"
-msgstr "Vlastnosti (s konflikty)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Zbývající konflikty k vyřešení ve vlastnostech"
-
-msgid "Conflict Resolution"
-msgstr "Řešení konfliktů"
-
msgid "{0} more..."
msgstr "{0} více..."
@@ -5852,6 +5791,88 @@ msgstr[0] "Cizí verze ({0} položka)"
msgstr[1] "Cizí verze ({0} položky)"
msgstr[2] "Cizí verze ({0} položek)"
+msgid "My with Their"
+msgstr "Můj s cizím"
+
+msgid "My with Merged"
+msgstr "Můj se sloučeným"
+
+msgid "Their with Merged"
+msgstr "Cizí se sloučeným"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "Role {0} není součástí srovnávané dvojice {1}."
+
+msgid "Properties"
+msgstr "Vlastnosti"
+
+msgid "Tags"
+msgstr "Značky"
+
+msgid "Nodes"
+msgstr "Body"
+
+msgid "Members"
+msgstr "Členové"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Nezbývají žádné další konflikty značek k vyřešení"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Značky ({0} konflikt)"
+msgstr[1] "Značky ({0} konflikty)"
+msgstr[2] "Značky ({0} konfliktů)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} zbývající konflikt značek k vyřešení"
+msgstr[1] "{0} zbývající konflikty značek k vyřešení"
+msgstr[2] "{0} zbývajících konfliktů značek k vyřešení"
+
+msgid "Nodes(resolved)"
+msgstr "Body(vyřešeno)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Seznam sloučených uzlů zablokován. Již nezbývají žádné konflikty v seznamu "
+"uzlů této cesty."
+
+msgid "Nodes(with conflicts)"
+msgstr "Body(s konflikty)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Nevyřešené konflikty v seznamu uzlů této cesty"
+
+msgid "Members(resolved)"
+msgstr "Členové(vyřešeno)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Seznam slučovaných členů zablokován. Již nezbývají žádné konflikty v seznamu "
+"členů této relace."
+
+msgid "Members(with conflicts)"
+msgstr "Členy (s konflikty)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Nevyřešené konflikty v seznamu členů této relace"
+
+msgid "No pending property conflicts"
+msgstr "Nezbývají žádné konflikty ve vlastnostech"
+
+msgid "Properties(with conflicts)"
+msgstr "Vlastnosti (s konflikty)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Zbývající konflikty k vyřešení ve vlastnostech"
+
+msgid "Conflict Resolution"
+msgstr "Řešení konfliktů"
+
msgid "Node"
msgstr "Uzel"
@@ -5914,9 +5935,9 @@ msgstr "Role"
msgid "Primitive"
msgstr "Prvek"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"Slučované uzly nejsou dosud zablokované. Příkaz pro řešení nelze vytvořit."
+"Sloučené členy nebyly ještě zmrazeny. Nelze sestavit příkaz pro vyřešení"
msgid "<undefined>"
msgstr "<nedefinováno>"
@@ -7430,99 +7451,6 @@ msgid "Select only changesets related to a specific bounding box"
msgstr ""
"Vybrat pouze sady změn vztahující se k určenému ohraničujícímu rámečku"
-msgid "Query open changesets only"
-msgstr "Dotazovat se pouze na otevřené sady změn"
-
-msgid "Query closed changesets only"
-msgstr "Dotazovat se pouze na uzavřené sady změn"
-
-msgid "Query both open and closed changesets"
-msgstr "Dotazovat se na otevřené i uzavřené sady změn"
-
-msgid "Only changesets owned by myself"
-msgstr "Pouze sady změn patřící mě"
-
-msgid "User ID:"
-msgstr "id uživatele:"
-
-msgid "User name:"
-msgstr "Uživatelské jméno:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Pouze sady změn od uživatele s následujícím id"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "Pouze sady změn patřící uživateli s následujícím jménem"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Pouze mé sady změn (neaktivní. JOSM aktuálně běží v anonymním režimu)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Nemohu vybrat sady změn pro konkrétního uživatele, protože uživatel je "
-"anonymní."
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "Současná hodnota ''{0}'' pro id uživatele není platná"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr "Dotaz na datové změny nelze omezit na uživatelské jméno ''{0}''"
-
-msgid "Please enter a valid user ID"
-msgstr "Prosím, zadejte platné id uživatele"
-
-msgid "Invalid user ID"
-msgstr "Neplatné id uživatele"
-
-msgid "Please enter a non-empty user name"
-msgstr "Zadejte neprázdné jméno uživatele"
-
-msgid "Invalid user name"
-msgstr "Neplatné jméno uživatele"
-
-msgid "Date: "
-msgstr "Datum: "
-
-msgid "Time:"
-msgstr "Čas:"
-
-msgid "Closed after - "
-msgstr "Zavřené po - "
-
-msgid "Date:"
-msgstr "Datum:"
-
-msgid "Created before - "
-msgstr "Vytvořeno před - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Pouze sady změn uzavřené po následujícím datu/čase"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr "Pouze sady změn uzavřené po a vytvořené před zadaným datem/časem"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"Nelze sestavit dotaz na datové změny s časovým omezením. Neplatná vstupní "
-"data."
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr ""
-"<html>Pokud chcete dotaz omezit na specifický časový rozsah,<br>zadejte "
-"prosím platná vstupní data.</html>"
-
-msgid "Invalid date/time values"
-msgstr "Neplatné hodnoty data/času"
-
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
"invalid."
@@ -7540,27 +7468,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Neplatný ohraničující rámeček"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr "Aktuální hodnota není platné id uživatele. Zadejte celé číslo > 0"
-
-msgid "Please enter an integer value > 0"
-msgstr "Prosím, zadejte celé číslo > 0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Zadávejte prosím datum ve vašem obvyklém lokálním formátu.<br>Příklad: "
-"{0}<br>Příklad: {1}<br>Příklad: {2}<br>Příklad: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Zadávejte prosím čas ve vašem obvyklém lokálním formátu.<br>Příklad: "
-"{0}<br>Příklad: {1}<br>Příklad: {2}<br>Příklad: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Stáhnout pouze mé sady změn"
@@ -7648,24 +7555,138 @@ msgstr "Neplatné URL dotazu na sadu změn."
msgid "Close the dialog and abort querying of changesets"
msgstr "Uzavřít dialog a ukončit dotazování na sady změn"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Zadávejte prosím datum ve vašem obvyklém lokálním formátu.<br>Příklad: "
+"{0}<br>Příklad: {1}<br>Příklad: {2}<br>Příklad: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Dotazovat se pouze na otevřené sady změn"
+
+msgid "Query closed changesets only"
+msgstr "Dotazovat se pouze na uzavřené sady změn"
+
+msgid "Query both open and closed changesets"
+msgstr "Dotazovat se na otevřené i uzavřené sady změn"
+
+msgid "Date: "
+msgstr "Datum: "
+
+msgid "Time:"
+msgstr "Čas:"
+
+msgid "Closed after - "
+msgstr "Zavřené po - "
+
+msgid "Date:"
+msgstr "Datum:"
+
+msgid "Created before - "
+msgstr "Vytvořeno před - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Pouze sady změn uzavřené po následujícím datu/čase"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr "Pouze sady změn uzavřené po a vytvořené před zadaným datem/časem"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Nelze sestavit dotaz na datové změny s časovým omezením. Neplatná vstupní "
+"data."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Pokud chcete dotaz omezit na specifický časový rozsah,<br>zadejte "
+"prosím platná vstupní data.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Neplatné hodnoty data/času"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Zadávejte prosím čas ve vašem obvyklém lokálním formátu.<br>Příklad: "
+"{0}<br>Příklad: {1}<br>Příklad: {2}<br>Příklad: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr "Aktuální hodnota není platné id uživatele. Zadejte celé číslo > 0"
+
+msgid "Please enter an integer value > 0"
+msgstr "Prosím, zadejte celé číslo > 0"
+
msgid "URL: "
msgstr "URL: "
msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr "Prosím zadejte nebo vložte URL pro získání sad změn z API OSM."
-msgid "Examples"
-msgstr "Příklady"
+msgid "Examples"
+msgstr "Příklady"
+
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+"Povšimněte si si, že požadavky na sady změn jsou vždy zaslané na ''{0}'', "
+"bez ohledu na hostitele, port a cestu URL zadanou níže."
+
+msgid "This changeset query URL is invalid"
+msgstr "Toto URL dotazu na sadu změn není platné"
+
+msgid "Only changesets owned by myself"
+msgstr "Pouze sady změn patřící mě"
+
+msgid "User ID:"
+msgstr "id uživatele:"
+
+msgid "User name:"
+msgstr "Uživatelské jméno:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Pouze sady změn od uživatele s následujícím id"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "Pouze sady změn patřící uživateli s následujícím jménem"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Pouze mé sady změn (neaktivní. JOSM aktuálně běží v anonymním režimu)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Nemohu vybrat sady změn pro konkrétního uživatele, protože uživatel je "
+"anonymní."
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "Současná hodnota ''{0}'' pro id uživatele není platná"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr "Dotaz na datové změny nelze omezit na uživatelské jméno ''{0}''"
+
+msgid "Please enter a valid user ID"
+msgstr "Prosím, zadejte platné id uživatele"
+
+msgid "Invalid user ID"
+msgstr "Neplatné id uživatele"
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
-msgstr ""
-"Povšimněte si si, že požadavky na sady změn jsou vždy zaslané na ''{0}'', "
-"bez ohledu na hostitele, port a cestu URL zadanou níže."
+msgid "Please enter a non-empty user name"
+msgstr "Zadejte neprázdné jméno uživatele"
-msgid "This changeset query URL is invalid"
-msgstr "Toto URL dotazu na sadu změn není platné"
+msgid "Invalid user name"
+msgstr "Neplatné jméno uživatele"
msgid "Activate"
msgstr "Aktivovat"
@@ -8854,6 +8875,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr "Editor"
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10545,6 +10569,9 @@ msgstr "Směr"
msgid "Velocity, {0}"
msgstr "Rychlost, {0}"
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave zvukové soubory (*.wav)"
+
msgid "Import Audio"
msgstr "Importovat zvuk"
@@ -10559,9 +10586,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Import není možný"
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave zvukové soubory (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Audio značky z {0}"
@@ -10674,16 +10698,6 @@ msgstr "(URL bylo: "
msgid "Select the map painting styles"
msgstr "Vybrat styl kreslení mapy"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "Selhalo nahrání stylů kreslení mapy z ''{0}''. Došlo k výjimce: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-"JOSM již nepodporuje styly mappaint zapsané v starém formátu XML.\n"
-"Aktualizujte, prosím, ''{0}'' na MapCSS"
-
msgid "loading style ''{0}''..."
msgstr "nahrávám styl ''{0}''..."
@@ -10703,6 +10717,9 @@ msgstr[2] ""
"Došlo k {0} chybám při načítání tohoto stylu. Vyberete ''Info'' z "
"kontextového menu pokud chcete znát detaily."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "Selhalo nahrání stylů kreslení mapy z ''{0}''. Došlo k výjimce: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Selhalo zpracování stylů kreslení mapy z ''{0}''. Došlo k chybě: {1}"
@@ -11807,6 +11824,9 @@ msgstr ""
msgid "Track date"
msgstr "Datum záznamu"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Jedna barva (může být nastavena pro pojmenované vrstvy)"
@@ -11819,6 +11839,18 @@ msgstr "Cyklisté"
msgid "Foot"
msgstr "Pěší"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Prales"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Vytvořit časové značky v průběhu čtení GPX"
@@ -11831,6 +11863,9 @@ msgstr "Dynamické barvy závisle na hodnotách dat"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Vyhladit GPX grafiku (antialiasing)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11898,6 +11933,11 @@ msgstr ""
"Aplikovat vyhlazování (antialiasing) na čáry GPX pro jemnější zobrazení."
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11920,9 +11960,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "Obarvovat body a části trasy podle časových značek."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr "Umožní ladit barvy cesty podle různých průměrných rychlostí."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Barvy tras a bodů"
@@ -13220,6 +13267,12 @@ msgstr "Kontroluje chyby v náboženských objektech"
msgid "Checks for errors on relations"
msgstr "Kontroluje chyby v relacích"
+msgid "Territories"
+msgstr "Území"
+
+msgid "Checks for territories-specific features"
+msgstr "Kontroluje prvky území"
+
msgid "Unnecessary tags"
msgstr "Zbytečné značky"
@@ -14349,6 +14402,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Uložit uživatelské jméno a heslo (nezašifrované)"
+msgid "Assume"
+msgstr "Převzít"
+
+msgid "Existing values"
+msgstr "Současné hodnoty"
+
msgid "<delete from {0} objects>"
msgstr "<vymazat z {0} objektů>"
@@ -14370,12 +14429,6 @@ msgstr "Přidat zatrhnuté značky do vybraných objektů"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Enter: Přidat všechny značky do vybraných objektů"
-msgid "Assume"
-msgstr "Převzít"
-
-msgid "Existing values"
-msgstr "Současné hodnoty"
-
msgid "Enable the checkbox to accept the value"
msgstr "Hodnotu přijmete zatržením políčka"
@@ -15588,6 +15641,9 @@ msgstr ""
"Tichý konflikt klávesových zkratek: ''{0}'' posunuto vedle ''{1}'' na "
"''{2}''."
+msgid "Unknown territory id: {0}"
+msgstr "Neznámé ID teritoria: {0}"
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "V zásobníku byla nalezena {0} značka, je to podivné!"
@@ -16112,14 +16168,17 @@ msgstr "Mapbox Satellite"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr "Thunderforest Landscape"
+
msgid "OpenSeaMap"
msgstr "OpenSeaMap"
-msgid "OpenStreetMap Carto (Standard layer)"
-msgstr "OpenStreetMap Carto (Standardní vrstva)"
+msgid "OpenStreetMap Carto (Standard)"
+msgstr "OpenStreetMap Carto (Standard)"
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik, černobíle)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr "OpenStreetMap (standardní černobílá)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, bez popisek)"
@@ -16142,8 +16201,11 @@ msgstr "Hike & Bike"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Cambodia, Laos, Thailand, Vietnam dvojjazyčně"
+msgid "Stamen Terrain"
+msgstr "Stamen Terrain"
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (překryv)"
@@ -16193,8 +16255,8 @@ msgstr "OSM Inspector: Místa"
msgid "OSM Inspector: Highways"
msgstr "OSM Inspector: Silnice"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
+msgstr "OSM Inspector: Area"
msgid "OSM Inspector: Routing"
msgstr "OSM Inspector: Navigace"
@@ -16202,11 +16264,23 @@ msgstr "OSM Inspector: Navigace"
msgid "OSM Inspector: Addresses"
msgstr "OSM Inspector: Adresy"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM Inspector: Hranice (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr "OSM Inspector: Coastline (EU)"
-msgid "IGN Argentina (WMTS)"
-msgstr "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr "imagico.de OSM images for mapping: Prokletije Mountains"
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr "imagico.de OSM images for mapping: Pensacola Mountains"
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+
+msgid "IGN Argentina (TMS)"
+msgstr "IGN Argentina (TMS)"
msgid "IGN Argentina (WMS)"
msgstr "IGN Argentina (WMS)"
@@ -16241,6 +16315,12 @@ msgstr "LPI NSW Administrative Boundaries State Forest"
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr "LPI NSW Administrative Boundaries NPWS Reserve"
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr "imagico.de OSM images for mapping: Northwest Heard Island"
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr "imagico.de OSM images for mapping: Heard Island coast"
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -16286,11 +16366,17 @@ msgstr "VoGIS: Flächenwidmungsplan"
msgid "VoGIS: Höhen und Gelände"
msgstr "VoGIS: Höhen und Gelände"
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
-msgstr "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr "AGIV Flanders most recent aerial imagery"
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
+msgstr "AGIV Flanders 2013-2015 aerial imagery 10cm"
-msgid "AGIV aerial imagery 10cm 2013-15"
-msgstr "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
+msgstr "AGIV Flanders GRB"
msgid "URBISfr numerical imagery (2013)"
msgstr "URBISfr numerical imagery (2013)"
@@ -16325,8 +16411,17 @@ msgstr "SPW(allonie) 2009-2010 aerial imagery"
msgid "TEC bus lines (2014)"
msgstr "TEC bus lines (2014)"
-msgid "Benin:cotonou_pleiade_2016"
-msgstr "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr "TEC bus stops (2014)"
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr "Benin: Cotonou Pleiade 2016"
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr "imagico.de OSM images for mapping: Cotonou"
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr "imagico.de OSM images for mapping: Bouvet Island"
msgid "IBGE Mapa de Setores Urbanos"
msgstr "IBGE Mapa de Setores Urbanos"
@@ -16334,6 +16429,15 @@ msgstr "IBGE Mapa de Setores Urbanos"
msgid "IBGE Mapa de Setores Rurais"
msgstr "IBGE Mapa de Setores Rurais"
+msgid "IBGE Distrito Federal"
+msgstr "IBGE Distrito Federal"
+
+msgid "Rio Mosaic 2013"
+msgstr "Rio Mosaic 2013"
+
+msgid "Rio Mosaic 2015"
+msgstr "Rio Mosaic 2015"
+
msgid "Geobase Hydrography"
msgstr "Geobase Hydrography"
@@ -16346,12 +16450,34 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "British Columbia Mosaic"
+msgid "Latest southwest British Columbia Landsat"
+msgstr "Latest southwest British Columbia Landsat"
+
msgid "Kelowna 2012"
msgstr "Kelowna 2012"
msgid "Kelowna Roads overlay"
msgstr "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr "imagico.de OSM images for mapping: Eastern Devon Island coast"
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr "imagico.de OSM images for mapping: Northern Ellesmere Island"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr "imagico.de OSM images for mapping: Fogo, Cape Verde"
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr "imagico.de OSM images for mapping: Isla Londonderry"
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr "imagico.de OSM images for mapping: Volcán Calbuco"
+
msgid "Czech CUZK:KM"
msgstr "Český CUZK:KM"
@@ -16388,6 +16514,12 @@ msgstr "Stevns (Dánsko)"
msgid "Vejmidte (Denmark)"
msgstr "Vejmidte (Dánsko)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr "imagico.de OSM images for mapping: El Altar"
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Estonsko základní (Maaamet)"
@@ -16421,9 +16553,6 @@ msgstr "Katastr"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr "CRAIG - Auvergne 2013 - 25 cm"
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "GrandNancy Orthophotographie 2012"
@@ -16482,9 +16611,6 @@ msgstr ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
"- 1 m"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Sorbian Language)"
-
msgid "Hamburg (40 cm)"
msgstr "Hamburg (40 cm)"
@@ -16512,9 +16638,6 @@ msgstr "Berlin aerial photograph 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Berlin aerial photograph 2016"
-msgid "Stuttgart (aerial imagery)"
-msgstr "Stuttgart (aerial imagery"
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Erlangen aerial imagery (2016 5.0 cm)"
@@ -16548,9 +16671,57 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr "imagico.de OSM images for mapping: Qasigiannguit"
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr "imagico.de OSM images for mapping: Thule Air Base"
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr "imagico.de OSM images for mapping: Greenland mosaic"
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr "imagico.de OSM images for mapping: Northern Greenland ASTER"
+
msgid "Drone Imagery (Haiti)"
msgstr "Drone Imagery (Haiti)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr "Dočasně nedostupné asi do ledna 2017 kvůli změně serveru."
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone Imagery 2014 (Haiti)"
@@ -16558,7 +16729,7 @@ msgid "Drone Imagery Canaan(Haiti) November 2015"
msgstr "Drone Imagery Canaan(Haiti) November 2015"
msgid "Drone Imagery Matthew(Haiti) October 2016"
-msgstr ""
+msgstr "Drone Imagery Matthew(Haiti) October 2016"
msgid "FÖMI ortophoto 2000"
msgstr "FÖMI ortophoto 2000"
@@ -16587,14 +16758,8 @@ msgstr "Danube flood ortophoto 2013"
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
-msgid "Budapest district XII ortophoto 2013"
-msgstr "Budapest district XII ortophoto 2013"
-
-msgid "Interspect Budapest ortophoto 2014"
-msgstr "Interspect Budapest ortophoto 2014"
-
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
-msgstr "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "Budapest district XI ortophoto 2015"
+msgstr "Budapest district XI ortophoto 2015"
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Hungary (hiking routes)"
@@ -16602,6 +16767,21 @@ msgstr "OpenStreetMap Hungary (hiking routes)"
msgid "Hillshade Hungary"
msgstr "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgstr "imagico.de OSM images for mapping: Eastern Iceland"
+
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr "imagico.de OSM images for mapping: Rann of Kutch"
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr "imagico.de OSM images for mapping: Southeastern Sulawesi"
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr "imagico.de OSM images for mapping: Bakun Reservoir"
+
+msgid "imagico.de OSM images for mapping: Batam"
+msgstr "imagico.de OSM images for mapping: Batam"
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -16662,9 +16842,21 @@ msgstr "PCN 2012 - Italy"
msgid "South Tyrol Orthofoto 2011"
msgstr "South Tyrol Orthofoto 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr "South Tyrol Orthofoto 2011 (highres)"
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr "South Tyrol Orthofoto 2014"
+
msgid "South Tyrol Topomap"
msgstr "South Tyrol Topomap"
+msgid "Japan GSI ortho Imagery"
+msgstr "Japan GSI ortho Imagery"
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "USSR - Latvia"
@@ -16698,12 +16890,35 @@ msgstr "Niger Delta Oct 2012 Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard -Orthophoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr "imagico.de OSM images for mapping: Western Karakoram"
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Gaza Strip - Pléiades - 2014/07/06"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr "imagico.de OSM images for mapping: Panama Canal"
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr "imagico.de OSM images for mapping: Vanatinai"
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr "imagico.de OSM images for mapping: New Ireland"
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
@@ -16830,9 +17045,6 @@ msgstr "Świętochłowice: Ortofotomapa 2012 (aerial image)"
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Zabrze: Ortofotomapa 2011 (letecké snímky)"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Szlaki (stezky)"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr "Wrocław: Ortofotomapa 2015 (aerial image)"
@@ -16842,6 +17054,20 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Auto"
@@ -16863,12 +17089,30 @@ msgstr "RABA-KGZ: Slovenia farmland use"
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr "RABA-KGZ: Slovenia built-up areas"
+msgid "City of Cape Town 2013 Aerial"
+msgstr "City of Cape Town 2013 Aerial"
+
msgid "City of Cape Town 2015 Aerial"
msgstr "City of Cape Town 2015 Aerial"
msgid "South Africa CD:NGI Aerial"
msgstr "Jižní Afrika CD:NGI Letecká"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr "imagico.de OSM images for mapping: Leskov Island ASTER"
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr "imagico.de OSM images for mapping: Scott Island"
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr "imagico.de OSM images for mapping: Leskov Island Landsat"
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr "imagico.de OSM images for mapping: Clerke Rocks"
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr "imagico.de OSM images for mapping: Shag Rocks"
+
msgid "Catastro Spain"
msgstr "Catastro Španělsko"
@@ -16890,6 +17134,9 @@ msgstr "IDEIB - Baleáry"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Kanárské ostrovy"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Kanton Aargau 25cm (AGIS 2011)"
@@ -16932,6 +17179,9 @@ msgstr "Canton de Fribourg 50cm (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Stadt Bern 10cm/25cm (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr "Stadt Bern 10cm (2016"
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -16953,6 +17203,12 @@ msgstr "Bonvillars Orthophoto 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Fiez Orthophoto 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr "Kanton Basel-Stadt 2015"
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr "Taiwan e-Map Open Data"
@@ -16968,6 +17224,9 @@ msgstr "Taiwan Land-Section Data"
msgid "NLSC Open Data WMTS"
msgstr "NLSC Open Data WMTS"
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "MSR Maps Topo"
@@ -16995,9 +17254,54 @@ msgstr "NC Latest Orthoimagery"
msgid "U.S. Forest Service roads"
msgstr "U.S. Forest Service roads"
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr "imagico.de OSM images for mapping: Alaska Range"
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr "NJ 2015 Aerial Imagery (Infrared)"
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr "NJ 2015 Aerial Imagery (Natural Color)"
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr "San Juan Metro Area: 2013 USACE Orthophotos"
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr "WA 2013 aerial imagery for San Juan County"
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr "WA Vector Streetmap for San Juan County"
+
+msgid "Texas Orthophoto"
+msgstr "Texas Orthophoto"
+
+msgid "Philadelphia 2015 Imagery"
+msgstr "Philadelphia 2015 Imagery"
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr "MD 2014 6 Inch Aerial Imagery"
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr "MD Three Inch Aerial Imagery"
+
+msgid "MD Transportation Basemap"
+msgstr "MD Transportation Basemap"
+
+msgid "Delaware 2012 Orthophotography"
+msgstr "Delaware 2012 Orthophotography"
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr "imagico.de OSM images for mapping: Rwenzori Mountains"
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ukraine - Orthophotomaps 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr "Pracuje pouze na Ukrajině nebo přes ukrajinský proxy server."
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr "Ukraine - Kyiv 2014 (DZK)"
@@ -17019,9 +17323,6 @@ msgstr "Surrey Air Survey"
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Scotland 1842-82"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr "NLS - OS 6-inch County Series 1888-1913"
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -17031,9 +17332,6 @@ msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr "NLS - OS 25-inch (Scotland) 1892-1905"
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25k historic (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "OS 1:25k historic (OSM-Limited)"
@@ -17369,8 +17667,8 @@ msgstr "Stáhne nová data, když posouváte nebo zvětšujete"
msgid "Create a grid of ways."
msgstr "Vytváření pravidelné mřížky cest."
-msgid "Customization of public transport stops."
-msgstr "Přizpůsobení zastávek veřejné dopravy."
+msgid "Customization of public public transport stops."
+msgstr "Úpravy zastávek veřejné dopravy."
msgid ""
"Creating and handling address nodes and buildings within Czech Republic."
@@ -17474,6 +17772,9 @@ msgstr "Jednoduchý nástroj na značení čísel domů."
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "Generuje ohraničení XML mapových podkladů podle multipolygonu"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr "Exportovat dlaždice z keše vrstvy obrázků do souborového systému."
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -19980,6 +20281,9 @@ msgstr "Potok"
msgid "River"
msgstr "Řeka"
+msgid "Lock"
+msgstr "Zdymadlo"
+
msgid "Canal"
msgstr "Plavební kanál"
@@ -21031,6 +21335,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr "Penzion/Bed & Breakfast"
+msgid "Apartment"
+msgstr "Byt"
+
+msgid "Number of apartments"
+msgstr "Počet bytů"
+
msgid "Chalet"
msgstr "Chata"
@@ -21097,6 +21407,12 @@ msgstr "Venkovní sezení"
msgid "Takeaway"
msgstr "Jídlo s sebou"
+msgid "Delivery"
+msgstr "Rozvoz"
+
+msgid "Mo-Su 12:00-22:00"
+msgstr "Mo-Su 12:00-22:00"
+
msgid "Fast Food"
msgstr "Rychlé občerstvení"
@@ -22040,31 +22356,19 @@ msgstr "Pozorovatelna divoké zvěře"
msgid "Hunting Stand"
msgstr "Posed"
-msgid "Height"
-msgstr "Výška"
-
-msgctxt "height"
-msgid "low"
-msgstr "nízká"
-
-msgctxt "height"
-msgid "half"
-msgstr "poloviční"
-
-msgctxt "height"
-msgid "full"
-msgstr "vysoká"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr "Úkryt"
-msgid "Lock"
+msgid "Lockable"
msgstr "Uzamykatelný"
msgid "Water Point"
msgstr "Zdroj vody"
+msgid "Animal watering place"
+msgstr "Napajedlo pro zvířata"
+
msgid "Compressed Air"
msgstr "Stlačený vzduch"
@@ -22656,6 +22960,10 @@ msgid "hut"
msgstr "bouda"
msgctxt "building"
+msgid "bungalow"
+msgstr "bungalov"
+
+msgctxt "building"
msgid "dormitory"
msgstr "kolej/internát"
@@ -23951,6 +24259,9 @@ msgstr "Řeznictví"
msgid "Seafood"
msgstr "Mořské plody"
+msgid "Dairy"
+msgstr "Mléčné výrobky"
+
msgid "Deli (Fine Food)"
msgstr "Delikatesy"
@@ -24767,9 +25078,6 @@ msgstr "Stromořadí"
msgid "A line of trees."
msgstr "Stromořadí."
-msgid "Wood"
-msgstr "Prales"
-
msgid "Woodland where timber production does not dominate use."
msgstr "Lesní porost, kde hlavním účelem není těžba dřeva."
@@ -25837,6 +26145,9 @@ msgstr "Rozdílný počet jízdních pruhů v klíčích {0} a {1}"
msgid "possibly missing {0} tag"
msgstr "možná chybějící značka {0}"
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr "ulice se zvláštním číslem {0}, ale bez {1} a {2} nebo {3}"
+
msgid "{0} is deprecated"
msgstr "{0} je zavržen"
@@ -25941,6 +26252,12 @@ msgstr "pochybný klíč (končící číslem)"
msgid "The key {0} has an uncommon value."
msgstr "Klíč {0} má neobvyklou hodnotu."
+msgid "misspelled value"
+msgstr "hodnota s chybou"
+
+msgid "wrong value: {0}"
+msgstr "špatná hodnota: {0}"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} na uzlu. Mělo by být použito na cestě."
@@ -26021,6 +26338,13 @@ msgstr "Linie pobřeží uvnitř {1}"
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} by měl být na uzlu, kde se protínají {1} a {2}"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+"{0} je značka používaná pro vodní toky. Pro označení plochy použijte spíše "
+"{1} + {2}."
+
msgid "abbreviated street name"
msgstr "zkrácený název ulice"
@@ -26045,6 +26369,11 @@ msgstr "{0} použito s {1}"
msgid "street name contains ss"
msgstr "název ulice obsahuje ss"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+"{0} je zastaralé, použijte spíše {1}. Také se podívejte na podobné značky "
+"jako {2}"
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -26859,6 +27188,20 @@ msgstr "Odeslat aktuální sadu změn"
msgid "Submit the current changeset to Mapillary"
msgstr "Odeslat aktuální sadu změn na Mapillary"
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr "Nahrání sady změn na server selhalo s {0} chybou ''{1} {2}''!"
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+"Při pokusu o odeslání sady změn na server došlo k výjimce. Pokud k tomu "
+"dojde opakovaně, zvažte zaslání hlášení o chybě pomocí menu Nápověda. Pokud "
+"tuto zprávu vidíte poprvé, tak to prostě zkuste udělat znovu. Může se jednat "
+"o problém s připojením k Internetu."
+
msgid "Upload pictures"
msgstr "Nahrát obrázky na server"
@@ -26901,8 +27244,8 @@ msgstr "Otevřít dialog sady změn Mapillary"
msgid "Mapillary changeset"
msgstr "Sada změn Mapillary"
-msgid "Submit"
-msgstr "Odeslat"
+msgid "Submitting changeset to server…"
+msgstr "Odesílám sadu změn na server…"
msgid "Export all images"
msgstr "Exportovat všechny obrázky"
@@ -27814,6 +28157,9 @@ msgstr "Zvolte oblast (např. budovu) podkladového obrázku."
msgid "Area Selector"
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"
@@ -27859,11 +28205,11 @@ msgid "Algorithm"
msgstr "Algoritmus"
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
-"Maximální počet pixelů, o které může být bod vzdálen od čáry a stále být "
-"považován za součást čáry (výchozí: {0})."
+"Maximální vzdálenost v metrech mezi bodem a linií, aby byl považován za část "
+"této linie (Výchozí: {0})."
msgid "Distance Tolerance"
msgstr "Tolerance vzdálenosti"
@@ -29584,6 +29930,67 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Otevřít XML soubor mapového podkladu"
+msgid "Export tiles"
+msgstr "Export dlaždic"
+
+msgid "Export cached tiles to file system."
+msgstr "Exportovat nakešované dlaždice do souborového systému."
+
+msgid "Exporting cached tiles"
+msgstr "Exportuji nakešované dlaždice"
+
+msgid "Failed to write image file {0}: {1}"
+msgstr "Selhal zápis obrázkového souboru {0}: {1}"
+
+msgid "Failed to write image file {0}."
+msgstr "Selhal zápis obrázkového souboru {0}."
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] "Exportována {0} dlaždice z vrstvy {1}."
+msgstr[1] "Exportovány {0} dlaždice z vrstvy {1}."
+msgstr[2] "Exportováno {0} dlaždic z vrstvy {1}."
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+"Cesta pro export již v souborovém systému existujte, ale není to adresář."
+
+msgid "Failed to create export directory: {0}"
+msgstr "Selhalo vytvoření adresáře pro export: {0}"
+
+msgid "Failed to create export directory."
+msgstr "Selhalo vytvoření adresáře pro export."
+
+msgid "Append cache name"
+msgstr "Připojit název keše"
+
+msgid "Export Tiles"
+msgstr "Exportovat dlaždice"
+
+msgid "Cache name:"
+msgstr "Název keše:"
+
+msgid "Object count:"
+msgstr "Počet objektů:"
+
+msgid "file system path"
+msgstr "cesta v souborovém systému"
+
+msgid "File system path the tiles are exported to."
+msgstr "Cesta v souborovém systému, kam se dlaždice exportují."
+
+msgid "Export directory:"
+msgstr "Adresář pro export:"
+
+msgid "Append cache name to export directory."
+msgstr "Připojit k adreáři pro export název keše."
+
+msgid "Tiles will be exported to directory {0}"
+msgstr "Dlaždice budou exportovány do adresáře {0}"
+
+msgid "No export directory set."
+msgstr "Nenastaven žádný adresář pro export."
+
msgid "Calibration Layer"
msgstr "Kalibrační vrstva"
@@ -31892,9 +32299,6 @@ msgstr "VD: Trasa by měla začínat a končit stop_position"
msgid "PT: First or last way needs to be split"
msgstr "VD: První nebo poslední cesta by měla být rozdělena"
-msgid "PT: Problem in the route segment"
-msgstr "VD: Problém v segmentu trasy"
-
msgid "PT: Stop not served"
msgstr "VD: Zastávka není obsluhována"
@@ -32058,9 +32462,6 @@ msgstr "[id] {0}"
msgid "[gap]"
msgstr "[mezera]"
-msgid " [ID] {0}"
-msgstr " [id] {0}"
-
msgid "Route patterns ..."
msgstr "Vzory tras ..."
@@ -32118,6 +32519,9 @@ msgstr "vlevo"
msgid "Maximum distance from route"
msgstr "Maximální vzdálenost od trasy"
+msgid " [ID] {0}"
+msgstr " [id] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "Hromadná doprava: Změnit typ zastávky"
@@ -32317,9 +32721,6 @@ msgstr "Rekonstruovat polygon"
msgid "Multipolygon must consist only of ways"
msgstr "Multipolygon musí obsahovat pouze cesty"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr "Rekonstrukce polygonů je možná pouze z vnějších cest"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Rekonstruovat polygony z relace {0}"
diff --git a/i18n/po/cy.po b/i18n/po/cy.po
index d5906bb..bac9dcc 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:14+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:20+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: cy\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -65,9 +65,15 @@ msgstr ""
msgid "Help"
msgstr "Cymorth"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -202,6 +208,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -223,12 +235,6 @@ msgstr ""
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -709,6 +715,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -730,9 +739,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -783,6 +789,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -932,16 +941,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -950,6 +959,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -965,12 +980,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1763,9 +1772,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3951,9 +3957,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3983,12 +3986,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4681,12 +4699,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4703,8 +4727,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5025,9 +5049,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5166,82 +5187,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5407,6 +5352,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5466,7 +5487,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6858,212 +6879,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8169,6 +8190,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9655,6 +9679,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9667,9 +9694,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9766,14 +9790,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9786,6 +9802,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10774,6 +10793,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10786,6 +10808,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10798,6 +10832,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10857,6 +10894,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10875,9 +10917,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12072,6 +12121,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13107,6 +13162,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13128,12 +13189,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14093,6 +14148,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14581,13 +14639,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14611,7 +14672,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14662,7 +14726,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14671,10 +14735,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14710,6 +14786,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14755,10 +14837,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14791,34 +14879,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14857,6 +14985,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14890,9 +15024,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14949,9 +15080,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14979,9 +15107,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15015,9 +15140,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15054,19 +15224,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15129,9 +15308,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15165,12 +15356,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15297,9 +15510,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15309,6 +15519,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15330,12 +15554,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15357,6 +15599,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15399,6 +15644,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15420,6 +15668,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15435,6 +15689,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15462,9 +15719,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15486,9 +15788,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15498,9 +15797,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15812,7 +16108,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15900,6 +16196,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18296,6 +18595,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19344,6 +19646,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19410,6 +19718,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20353,31 +20667,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20969,6 +21271,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22262,6 +22568,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23075,9 +23384,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24122,6 +24428,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24213,6 +24522,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24289,6 +24604,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24313,6 +24633,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25086,6 +25409,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25128,7 +25461,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25931,6 +26264,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25972,8 +26308,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27571,6 +27907,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29732,9 +30127,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29892,9 +30284,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29952,6 +30341,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30149,9 +30541,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/da.po b/i18n/po/da.po
index 402eb0f..7589dc4 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: 2016-11-06 22:51+0100\n"
-"PO-Revision-Date: 2016-11-01 15:20+0000\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
+"PO-Revision-Date: 2017-01-06 15:02+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: 2016-11-07 04:40+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:43+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: da_DK\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -66,17 +66,23 @@ msgstr "Opbygger hovedmenu"
msgid "Help"
msgstr "Hjælp"
+msgid "Initializing internal boundaries data"
+msgstr "Klargør interne grænsedata"
+
msgid "Initializing OSM API"
-msgstr "Initialiserer OSM API"
+msgstr "Klargør OSM API"
+
+msgid "Initializing internal traffic data"
+msgstr "Klargør interne trafikdata"
msgid "Initializing validator"
-msgstr "Initialiserer validering"
+msgstr "Klargør validering"
msgid "Initializing presets"
-msgstr "Initialiserer prædefinitioner"
+msgstr "Klargør prædefinitioner"
msgid "Initializing map styles"
-msgstr "Initialiserer kort-stile"
+msgstr "Klargør kort-stile"
msgid "Loading imagery preferences"
msgstr "Indlæser billedlags-indstillinger"
@@ -196,7 +202,7 @@ msgid ""
"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
"to.</html>"
msgstr ""
-"<html>Der er ingen lag kildelaget<br>''{0}''br>kunne lægges sammen "
+"<html>Der er ingen lag kildelaget<br>''{0}''<br>kunne lægges sammen "
"med.</html>"
msgid "No target layers"
@@ -211,6 +217,12 @@ msgstr ""
"Sæt de markerede elementer på kortet til de markerede genstande i listen "
"ovenfor."
+msgid "Select WMS layers"
+msgstr "Vælg WMS lag"
+
+msgid "Add layers"
+msgstr "Tilføj lag"
+
msgid "Add imagery layer {0}"
msgstr "Tilføj billedlag {0}"
@@ -232,12 +244,6 @@ msgstr "Fejl"
msgid "Select image format for WMS layer"
msgstr "Vælg billedformat for WMS laget"
-msgid "Select WMS layers"
-msgstr "Vælg WMS lag"
-
-msgid "Add layers"
-msgstr "Tilføj lag"
-
msgid "Add Node..."
msgstr "Tilføj punkt..."
@@ -749,6 +755,9 @@ msgstr "Hop til position"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Åbner en dialog der tillader at hoppe til et bestemt sted"
+msgid "Jump to Position"
+msgstr "Hop til position"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Indtast længde- og breddegrad for at hoppe til position."
@@ -770,9 +779,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Hop dertil"
-msgid "Jump to Position"
-msgstr "Hop til position"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr "Kunne ikke forstå længde, bredde eller zoom. Tjek den."
@@ -826,6 +832,9 @@ msgstr "Forbind lag"
msgid "Merge the current layer into another layer"
msgstr "Forbind det nuværende lag med et andet lag"
+msgid "{0} completed in {1}"
+msgstr "{0} færdig i {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Sammenlægger lag med forskellige upload politikker"
@@ -994,24 +1003,30 @@ msgstr[1] "Åbner {0} filer..."
msgid "Opening file ''{0}'' ..."
msgstr "Åbner fil ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr "Hvilke opgaver skal udføres?"
+
+msgid "Ok"
+msgstr "Ok"
+
msgid "Open Location..."
msgstr "Åbn sted..."
msgid "Open an URL."
msgstr "Åbn en URL."
-msgid "Separate Layer"
-msgstr "Separat lag"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Vælg hvis dataene skal hentes som et nyt lag"
-
msgid "Enter URL to download:"
msgstr "Indtast URL at downloade"
msgid "Enter an URL from where data should be downloaded"
msgstr "Indtast en URL hvor data skal downloades fra"
+msgid "Separate Layer"
+msgstr "Separat lag"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Vælg hvis dataene skal hentes som et nyt lag"
+
msgid "Download Location"
msgstr "Download sted"
@@ -1027,12 +1042,6 @@ msgstr "Luk dialog og annuller download"
msgid "Download Data"
msgstr "Download data"
-msgid "Which tasks to perform?"
-msgstr "Hvilke opgaver skal udføres?"
-
-msgid "Ok"
-msgstr "Ok"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1889,9 +1898,6 @@ msgstr "Forespørg og download rettesæt ..."
msgid "Errors during download"
msgstr "Fejl under download"
-msgid "Download Geo URL"
-msgstr "Download Geo URL"
-
msgid "Download GPS"
msgstr "Download GPS"
@@ -3028,8 +3034,8 @@ msgstr[1] "Fjern \"{0}\" for {1} objekter"
msgid "Set {0}={1} for {2} object"
msgid_plural "Set {0}={1} for {2} objects"
-msgstr[0] "Set {0}={1} for {2} objekt"
-msgstr[1] "Set {0}={1} for {2} objekter"
+msgstr[0] "Sæt {0}={1} for {2} objekt"
+msgstr[1] "Sæt {0}={1} for {2} objekter"
msgid "Deleted {0} tags for {1} object"
msgid_plural "Deleted {0} tags for {1} objects"
@@ -3038,8 +3044,8 @@ msgstr[1] "Slet {0} tags for {1} objekter"
msgid "Set {0} tags for {1} object"
msgid_plural "Set {0} tags for {1} objects"
-msgstr[0] "Set {0} tags for {1} objekt"
-msgstr[1] "Set {0} tags for {1} objekter"
+msgstr[0] "Sæt {0} tags for {1} objekt"
+msgstr[1] "Sæt {0} tags for {1} objekter"
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Erstat \"{0}\" med \"{1}\" for"
@@ -4253,9 +4259,6 @@ msgstr "Område-stil vej er ikke lukket"
msgid "No outer way for multipolygon"
msgstr "Ingen ydre vej for multipolygon"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "Rolle for ''{0}'' bør være ''{1}''"
-
msgid "No area style for multipolygon"
msgstr "Ingen område-stil for multipolygon"
@@ -4291,12 +4294,27 @@ msgstr "Område-stil på ydre vej"
msgid "Multipolygon is not closed"
msgstr "Multipolygon er ikke lukket"
-msgid "Multipolygon inner way is outside"
-msgstr "Multipolygons indre vej er udenvendig"
+msgid "Multipolygon rings share node(s)"
+msgstr "Multipolygon ringe deler node(r)"
msgid "Intersection between multipolygon ways"
msgstr "Overskæring mellem multipolygon-veje"
+msgid "Multipolygon rings are equal"
+msgstr "Multipolygon ringe er ens"
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "Rolle for ''{0}'' bør være ''{1}''"
+
+msgid "Multipolygon inner way is outside"
+msgstr "Multipolygons indre vej er udenvendig"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr "Multipolygon ring indeholder segmenter to gange"
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr "Multipolygon ydre vej deler segment(er) med anden ring"
+
msgid "No useful role for multipolygon member"
msgstr "Ingen brugbar rolle for multipolygon medlem"
@@ -5009,17 +5027,23 @@ msgstr "Hindre adgangen til den givne ressource (er), adskilt af komma"
msgid "options provided as Java system properties"
msgstr "options givet som Java systemegenskaber"
+msgid "Change the JOSM directory name"
+msgstr "Skift JOSM mappe navn"
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/STI/TIL/JOSM/PREF "
msgid "Set the preferences directory"
msgstr "Sæt indstillingsmappen"
+msgid "Default: {0}"
+msgstr "Standard: {0}"
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/STI/TIL/JOSM/USERDATA"
msgid "Set the user data directory"
-msgstr "Set brugerdatamappen"
+msgstr "Sæt brugerdatamappen"
msgid "/PATH/TO/JOSM/CACHE "
msgstr "/STI/TIL/JOSM/CACHE "
@@ -5031,9 +5055,10 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/STI/TIL/JOSM/HOMEDIR "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
-msgstr "Flyt alle 3 mapper til homedir. Cachemappe vil være i homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
+msgstr ""
+"Sæt præferencer+data+cachemappe (cache mappe vil være josm.home/cache)"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5381,9 +5406,6 @@ msgstr "Klik for at afvikle jobbet i baggrunden"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} færdig i {1}"
-
msgid "Enlarge"
msgstr "Forstør"
@@ -5529,86 +5551,6 @@ msgstr "Konflikt baggrund: fjern medlem"
msgid "Conflict foreground: remove member"
msgstr "Konflikt forgrund: fjern medlem"
-msgid "My with Their"
-msgstr "Min med deres"
-
-msgid "My with Merged"
-msgstr "Min med sammenflettet"
-
-msgid "Their with Merged"
-msgstr "Deres med sammenflettet"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "Rolle {0} er ikke involveret i sammenligningspar {1}."
-
-msgid "Properties"
-msgstr "Egenskaber"
-
-msgid "Tags"
-msgstr "Tags"
-
-msgid "Nodes"
-msgstr "Punkter"
-
-msgid "Members"
-msgstr "Medlemmer"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Ingen uafklarede tagkonflikter der skal løses"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Tags({0} konflikt)"
-msgstr[1] "Tags({0} konflikter)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} ventende tag-konflikt der skal løses"
-msgstr[1] "{0} ventende tag-konflikter der skal løses"
-
-msgid "Nodes(resolved)"
-msgstr "Punkter (afklaret)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Sammenlagt punktliste frosset. Ingen uafklarede konflikter i denne vejs "
-"punktliste"
-
-msgid "Nodes(with conflicts)"
-msgstr "Punkter (med konflikter)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Uafklarede konflikter i denne vejs punktliste"
-
-msgid "Members(resolved)"
-msgstr "Medlemmer (afklaret)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Sammenlagt medlemsliste frosset. Ingen uafklarede konflikter i denne "
-"relations medlemsliste"
-
-msgid "Members(with conflicts)"
-msgstr "Medlemmer (med konflikter)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Uafklarede konflikter i denne relations medlemsliste"
-
-msgid "No pending property conflicts"
-msgstr "Ingen uafklarede egenskabskonflikter"
-
-msgid "Properties(with conflicts)"
-msgstr "Egenskaber (med konflikter)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "uafklarede egenskabskonflikter der skal løses"
-
-msgid "Conflict Resolution"
-msgstr "Konflikt-løsning"
-
msgid "{0} more..."
msgstr "{0} mere..."
@@ -5798,12 +5740,92 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Deres version ({0} indlæg)"
msgstr[1] "Deres version ({0} indlæg)"
+msgid "My with Their"
+msgstr "Min med deres"
+
+msgid "My with Merged"
+msgstr "Min med sammenflettet"
+
+msgid "Their with Merged"
+msgstr "Deres med sammenflettet"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "Rolle {0} er ikke involveret i sammenligningspar {1}."
+
+msgid "Properties"
+msgstr "Egenskaber"
+
+msgid "Tags"
+msgstr "Tags"
+
+msgid "Nodes"
+msgstr "Punkter"
+
+msgid "Members"
+msgstr "Medlemmer"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Ingen uafklarede tagkonflikter der skal løses"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Tags({0} konflikt)"
+msgstr[1] "Tags({0} konflikter)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} ventende tag-konflikt der skal løses"
+msgstr[1] "{0} ventende tag-konflikter der skal løses"
+
+msgid "Nodes(resolved)"
+msgstr "Punkter (afklaret)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Sammenlagt punktliste frosset. Ingen uafklarede konflikter i denne vejs "
+"punktliste"
+
+msgid "Nodes(with conflicts)"
+msgstr "Punkter (med konflikter)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Uafklarede konflikter i denne vejs punktliste"
+
+msgid "Members(resolved)"
+msgstr "Medlemmer (afklaret)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Sammenlagt medlemsliste frosset. Ingen uafklarede konflikter i denne "
+"relations medlemsliste"
+
+msgid "Members(with conflicts)"
+msgstr "Medlemmer (med konflikter)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Uafklarede konflikter i denne relations medlemsliste"
+
+msgid "No pending property conflicts"
+msgstr "Ingen uafklarede egenskabskonflikter"
+
+msgid "Properties(with conflicts)"
+msgstr "Egenskaber (med konflikter)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "uafklarede egenskabskonflikter der skal løses"
+
+msgid "Conflict Resolution"
+msgstr "Konflikt-løsning"
+
msgid "Node"
msgstr "Punkt"
msgid "Merged nodes not frozen yet. Cannot build resolution command."
msgstr ""
-"Sammenlagte punkter ikke frosset endnu. Kan ikke opbygge resolutionskommando."
+"Sammenlagte punkter ikke frosset endnu. Kan ikke opbygge løsnings kommando."
msgid "Properties in my dataset, i.e. the local dataset"
msgstr "Egenskaber i mit datasæt, f.eks. det lokale datasæt"
@@ -5860,9 +5882,9 @@ msgstr "Rolle"
msgid "Primitive"
msgstr "Primitiv"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"Sammenlagte punkter ikke frosset endnu. Kan ikke opbygge resolutionskommando"
+"Sammenlagte medlemmer ikke frosset endnu. Kan ikke opbygge løsnings kommando"
msgid "<undefined>"
msgstr "<udefineret>"
@@ -6114,7 +6136,7 @@ msgstr ""
"<html>De kombinerede veje er medlemmer i en eller flere relationer. Beslut "
"om du vil <strong>beholde</strong> disse medlemskaber for den kombinerede "
"vej, eller om du vil <strong>fjerne</strong> dem.<br>Standarden er at "
-"<strong>beholde</ strong> den første vej, og <strong>fjerne</strong>de andre "
+"<strong>beholde</strong> den første vej, og <strong>fjerne</strong>de andre "
"veje, der er medlemmer af den samme relation: den kombinerede vej vil træde "
"i stedet for den oprindelige vej i relationen.</html>"
@@ -7358,100 +7380,6 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr "Vælg kun rettesæt relateret til et specifikt afgrænsningsområde"
-msgid "Query open changesets only"
-msgstr "Forespørg kun åbne rettesæt"
-
-msgid "Query closed changesets only"
-msgstr "Forespørg kun lukkede rettesæt"
-
-msgid "Query both open and closed changesets"
-msgstr "Forespørg både åbne og lukkede rettesæt"
-
-msgid "Only changesets owned by myself"
-msgstr "Kun rettesæt ejet af mig selv"
-
-msgid "User ID:"
-msgstr "Bruger-ID:"
-
-msgid "User name:"
-msgstr "Brugernavn:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Kun rettesæt ejet af brugeren med det følgende brugerID"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "Kun rettesæt ejet af brugeren med det følgende brugernavn"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Kun rettesæt ejet af mig selv (deaktiveret. JOSM kører i øjeblikket som en "
-"anonym bruger)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Kan ikke begrænse rettesætsforespørgsel til den nuværende bruger, fordi den "
-"nuværende bruger er anonym"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "Nuværende værdi ''{0}'' for brugerID er ikke gyldig"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr "Kan ikke begrænse rettesætsforespørgslen til brugernavnet \"{0}\""
-
-msgid "Please enter a valid user ID"
-msgstr "Indtast en gyldig bruger ID"
-
-msgid "Invalid user ID"
-msgstr "Ugyldigt bruger ID"
-
-msgid "Please enter a non-empty user name"
-msgstr "Indtast et ikke-tomt brugernavn"
-
-msgid "Invalid user name"
-msgstr "Ugyldigt brugernavn"
-
-msgid "Date: "
-msgstr "Dato: "
-
-msgid "Time:"
-msgstr "Tid:"
-
-msgid "Closed after - "
-msgstr "Lukket efter - "
-
-msgid "Date:"
-msgstr "Dato:"
-
-msgid "Created before - "
-msgstr "Oprettet før - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Kun rettesæt lukket efter den følgende dato/tid"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr "Kun rettesæt lukket efter og oprettet før en specifik dato/tid"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"Kan ikke forme rettesætsforespørgsel med tidsbaserede begrænsninger. Input "
-"er ikke gyldigt."
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr ""
-"<html>Indtast gyldige dato/tid-værdier for at begrænse<br>forespørgslen til "
-"et specifikt tidsinterval.</html>"
-
-msgid "Invalid date/time values"
-msgstr "Ugyldige dato/tids-værdier"
-
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
"invalid."
@@ -7470,28 +7398,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Ugyldigt afgrænsningsområde"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"Den nuværende værdi er ikke et gyldigt bruger ID. Indtast en heltalsværdi > 0"
-
-msgid "Please enter an integer value > 0"
-msgstr "Indtast en heltalsværdi > 0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Indtast en dato i det normale format for din lokalitet.<br>Eksempel: "
-"{0}<br>Eksempel: {1}<br>Eksempel: {2}<br>Eksempel: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Indtast en gyldig tid i det normale format for din lokalitet.<br>Eksempel: "
-"{0}<br>Eksempel: {1}<br>Eksempel: {2}<br>Eksempel: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Download kun mine rettesæt"
@@ -7580,24 +7486,140 @@ msgstr "Ulovlig rettesætsforespørgselsURL"
msgid "Close the dialog and abort querying of changesets"
msgstr "Luk dialogen og afbryd forespørgsel af rettesæt"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Indtast en dato i det normale format for din lokalitet.<br>Eksempel: "
+"{0}<br>Eksempel: {1}<br>Eksempel: {2}<br>Eksempel: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Forespørg kun åbne rettesæt"
+
+msgid "Query closed changesets only"
+msgstr "Forespørg kun lukkede rettesæt"
+
+msgid "Query both open and closed changesets"
+msgstr "Forespørg både åbne og lukkede rettesæt"
+
+msgid "Date: "
+msgstr "Dato: "
+
+msgid "Time:"
+msgstr "Tid:"
+
+msgid "Closed after - "
+msgstr "Lukket efter - "
+
+msgid "Date:"
+msgstr "Dato:"
+
+msgid "Created before - "
+msgstr "Oprettet før - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Kun rettesæt lukket efter den følgende dato/tid"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr "Kun rettesæt lukket efter og oprettet før en specifik dato/tid"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Kan ikke forme rettesætsforespørgsel med tidsbaserede begrænsninger. Input "
+"er ikke gyldigt."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Indtast gyldige dato/tid-værdier for at begrænse<br>forespørgslen til "
+"et specifikt tidsinterval.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Ugyldige dato/tids-værdier"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Indtast en gyldig tid i det normale format for din lokalitet.<br>Eksempel: "
+"{0}<br>Eksempel: {1}<br>Eksempel: {2}<br>Eksempel: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"Den nuværende værdi er ikke et gyldigt bruger ID. Indtast en heltalsværdi > 0"
+
+msgid "Please enter an integer value > 0"
+msgstr "Indtast en heltalsværdi > 0"
+
msgid "URL: "
msgstr "URL: "
msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr "Indtast eller indsæt en URL for at hente rettesæt fra OSM API’et."
-msgid "Examples"
-msgstr "Eksempler"
+msgid "Examples"
+msgstr "Eksempler"
+
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+"Bemærk at rettesætsforespørgsler for øjeblikket altid indsendes til ''{0}'', "
+"uanset den herunder indtastede URL’s vært, port og sti."
+
+msgid "This changeset query URL is invalid"
+msgstr "Denne rettesætsforespørgselsURL er ugyldig"
+
+msgid "Only changesets owned by myself"
+msgstr "Kun rettesæt ejet af mig selv"
+
+msgid "User ID:"
+msgstr "Bruger-ID:"
+
+msgid "User name:"
+msgstr "Brugernavn:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Kun rettesæt ejet af brugeren med det følgende brugerID"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "Kun rettesæt ejet af brugeren med det følgende brugernavn"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Kun rettesæt ejet af mig selv (deaktiveret. JOSM kører i øjeblikket som en "
+"anonym bruger)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Kan ikke begrænse rettesætsforespørgsel til den nuværende bruger, fordi den "
+"nuværende bruger er anonym"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "Nuværende værdi ''{0}'' for brugerID er ikke gyldig"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr "Kan ikke begrænse rettesætsforespørgslen til brugernavnet \"{0}\""
+
+msgid "Please enter a valid user ID"
+msgstr "Indtast en gyldig bruger ID"
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
-msgstr ""
-"Bemærk at rettesætsforespørgsler for øjeblikket altid indsendes til ''{0}'', "
-"uanset den herunder indtastede URL’s vært, port og sti."
+msgid "Invalid user ID"
+msgstr "Ugyldigt bruger ID"
-msgid "This changeset query URL is invalid"
-msgstr "Denne rettesætsforespørgselsURL er ugyldig"
+msgid "Please enter a non-empty user name"
+msgstr "Indtast et ikke-tomt brugernavn"
+
+msgid "Invalid user name"
+msgstr "Ugyldigt brugernavn"
msgid "Activate"
msgstr "Aktiver"
@@ -8103,7 +8125,7 @@ msgid ""
"Add all objects selected in the current dataset after the last selected "
"member"
msgstr ""
-"Tilføj alle objekter der er markeret i det aktuelle datasæt før det sidste "
+"Tilføj alle objekter der er markeret i det aktuelle datasæt efter det sidste "
"markerede medlem"
msgid ""
@@ -8779,6 +8801,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr "Editor"
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9313,13 +9338,13 @@ msgid "Update objects"
msgstr "Opdater objekter"
msgid "Initializing nodes to update ..."
-msgstr "Initialiserer punkter der skal opdateres ..."
+msgstr "Klargør punkter der skal opdateres ..."
msgid "Initializing ways to update ..."
-msgstr "Initialiserer veje der skal opdateres ..."
+msgstr "Klargør veje der skal opdateres ..."
msgid "Initializing relations to update ..."
-msgstr "Initialiserer relationer der skal opdateres ..."
+msgstr "Klargør relationer der skal opdateres ..."
msgid "Settings"
msgstr "Indstillinger"
@@ -10423,6 +10448,9 @@ msgstr "Retning"
msgid "Velocity, {0}"
msgstr "Hastighed, {0}"
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave-lydfiler (*.wav)"
+
msgid "Import Audio"
msgstr "Importer lyd"
@@ -10438,9 +10466,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Import er ikke mulig"
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave-lydfiler (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Lyd-markører fra {0}"
@@ -10552,18 +10577,6 @@ msgstr "(URL var: "
msgid "Select the map painting styles"
msgstr "Vælg korttegningsstilene"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-"Kunne ikke indlæse korttegningsstile fra ''{0}''. Handlingen var: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-"JOSM understøtter ikke længere korttegningsstile skrevet i det gamle XML-"
-"format.\n"
-"Opdater ''{0}'' til MapCSS"
-
msgid "loading style ''{0}''..."
msgstr "indlæser stilart \"{0}''..."
@@ -10580,6 +10593,10 @@ msgstr[1] ""
"Der opstod {0} fejl ved indlæsning af denne stilart. Vælg \"Info\" fra "
"højrekliks-menuen for detaljer."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+"Kunne ikke indlæse korttegningsstile fra ''{0}''. Handlingen var: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Kunne ikke fortolke korttegningsstile fra ''{0}''. Fejlen var: {1}"
@@ -10873,7 +10890,7 @@ msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
msgstr "Godkender OAuth anmodningsudtryk ''{0}'' på OSM-websiden ..."
msgid "Initializing a session at the OSM website..."
-msgstr "Initialiserer en session på OSM-websiden..."
+msgstr "Klargør en session på OSM-websiden..."
msgid "Authenticating the session for user ''{0}''..."
msgstr "Godkender sessionen for bruger ''{0}''..."
@@ -11686,6 +11703,9 @@ msgstr "Opløsning af position (rød = høj, grøn = lav, hvis tilgængelig)"
msgid "Track date"
msgstr "Spor-dato"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Enkelt farve (kan justeres for navngivne lag)"
@@ -11698,6 +11718,18 @@ msgstr "Cykel"
msgid "Foot"
msgstr "Gående"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Naturskov"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Opret markører ved indlæsning af GPX"
@@ -11710,6 +11742,9 @@ msgstr "Dynamisk farveområde baseret på datagrænser"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Udjævn GPX grafik (linjeudjævning)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11778,6 +11813,11 @@ msgid ""
msgstr "Påfør linjeudjævning til GPX linjer for glattere udseende."
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11799,10 +11839,17 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "Farvelæg punkter og sporsegmenter efter tidsstempel."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
"Tillader at justere sporfarven for forskellige gennemsnitshastigheder."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Farvelægning af spor og punkter"
@@ -13090,6 +13137,12 @@ msgstr "Kontrollerer for fejl på religiøse objekter"
msgid "Checks for errors on relations"
msgstr "Kontrollerer for fejl i relationer"
+msgid "Territories"
+msgstr "Territorier"
+
+msgid "Checks for territories-specific features"
+msgstr "Tjek for territorier specifikke træk"
+
msgid "Unnecessary tags"
msgstr "Unødvendige tags"
@@ -14215,6 +14268,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Gem brugernavn og adgangskode (ukrypteret)"
+msgid "Assume"
+msgstr "Formod"
+
+msgid "Existing values"
+msgstr "Eksisterende værdier"
+
msgid "<delete from {0} objects>"
msgstr "<slet fra {0} objekter>"
@@ -14236,12 +14295,6 @@ msgstr "Tilføj markerede tags til markerede objekter"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Enter: Tilføj alle tags til markerede objekter"
-msgid "Assume"
-msgstr "Formod"
-
-msgid "Existing values"
-msgstr "Eksisterende værdier"
-
msgid "Enable the checkbox to accept the value"
msgstr "Marker afkrydsningboksen for at acceptere værdien"
@@ -15418,6 +15471,9 @@ msgstr "Tilføjer JOSM localhost certifikat til {0} nøglelager"
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr "Tavs genvejskonflikt: ''{0}'' flyttet fra ''{1}'' til ''{2}''."
+msgid "Unknown territory id: {0}"
+msgstr "Ukendt territorie id: {0}"
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "Der blev fundet {0} tag i bufferen, det er mistænkeligt!"
@@ -15942,14 +15998,17 @@ msgstr "Mapbox Satellite"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr "Thunderforest Landscape"
+
msgid "OpenSeaMap"
msgstr "OpenSeaMap"
-msgid "OpenStreetMap Carto (Standard layer)"
-msgstr "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
+msgstr "OpenStreetMap Carto (Standard)"
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr "OpenStreetMap (Standard Black & White)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, no labels)"
@@ -15972,8 +16031,11 @@ msgstr "Hike & Bike"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr "Stamen Terrain"
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
@@ -16023,8 +16085,8 @@ msgstr "OSM Inspector: Places"
msgid "OSM Inspector: Highways"
msgstr "OSM Inspector: Highways"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
+msgstr "OSM Inspector: Area"
msgid "OSM Inspector: Routing"
msgstr "OSM Inspector: Routing"
@@ -16032,11 +16094,23 @@ msgstr "OSM Inspector: Routing"
msgid "OSM Inspector: Addresses"
msgstr "OSM Inspector: Addresses"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr "OSM Inspector: Coastline (EU)"
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr "imagico.de OSM images for mapping: Prokletije Mountains"
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr "imagico.de OSM images for mapping: Pensacola Mountains"
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
-msgid "IGN Argentina (WMTS)"
-msgstr "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
+msgstr "IGN Argentina (TMS)"
msgid "IGN Argentina (WMS)"
msgstr "IGN Argentina (WMS)"
@@ -16071,6 +16145,12 @@ msgstr "LPI NSW Administrative Boundaries State Forest"
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr "LPI NSW Administrative Boundaries NPWS Reserve"
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr "imagico.de OSM images for mapping: Northwest Heard Island"
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr "imagico.de OSM images for mapping: Heard Island coast"
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -16116,11 +16196,17 @@ msgstr "VoGIS: Flächenwidmungsplan"
msgid "VoGIS: Höhen und Gelände"
msgstr "VoGIS: Höhen und Gelände"
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
-msgstr "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr "AGIV Flanders most recent aerial imagery"
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
+msgstr "AGIV Flanders 2013-2015 aerial imagery 10cm"
-msgid "AGIV aerial imagery 10cm 2013-15"
-msgstr "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
+msgstr "AGIV Flanders GRB"
msgid "URBISfr numerical imagery (2013)"
msgstr "URBISfr numerical imagery (2013)"
@@ -16155,8 +16241,17 @@ msgstr "SPW(allonie) 2009-2010 aerial imagery"
msgid "TEC bus lines (2014)"
msgstr "TEC bus lines (2014)"
-msgid "Benin:cotonou_pleiade_2016"
-msgstr "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr "TEC bus stops (2014)"
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr "Benin: Cotonou Pleiade 2016"
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr "imagico.de OSM images for mapping: Cotonou"
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr "imagico.de OSM images for mapping: Bouvet Island"
msgid "IBGE Mapa de Setores Urbanos"
msgstr "IBGE Mapa de Setores Urbanos"
@@ -16164,6 +16259,15 @@ msgstr "IBGE Mapa de Setores Urbanos"
msgid "IBGE Mapa de Setores Rurais"
msgstr "IBGE Mapa de Setores Rurais"
+msgid "IBGE Distrito Federal"
+msgstr "IBGE Distrito Federal"
+
+msgid "Rio Mosaic 2013"
+msgstr "Rio Mosaic 2013"
+
+msgid "Rio Mosaic 2015"
+msgstr "Rio Mosaic 2015"
+
msgid "Geobase Hydrography"
msgstr "Geobase Hydrography"
@@ -16176,12 +16280,35 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "British Columbia Mosaic"
+msgid "Latest southwest British Columbia Landsat"
+msgstr "Latest southwest British Columbia Landsat"
+
msgid "Kelowna 2012"
msgstr "Kelowna 2012"
msgid "Kelowna Roads overlay"
msgstr "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr "imagico.de OSM images for mapping: Eastern Devon Island coast"
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr "imagico.de OSM images for mapping: Northern Ellesmere Island"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr "imagico.de OSM images for mapping: Fogo, Cape Verde"
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr "imagico.de OSM images for mapping: Isla Londonderry"
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr "imagico.de OSM images for mapping: Volcán Calbuco"
+
msgid "Czech CUZK:KM"
msgstr "Czech CUZK:KM"
@@ -16218,6 +16345,12 @@ msgstr "Stevns (Danmark)"
msgid "Vejmidte (Denmark)"
msgstr "Vejmidte (Danmark)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr "imagico.de OSM images for mapping: El Altar"
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Estonia Basemap (Maaamet)"
@@ -16251,9 +16384,6 @@ msgstr "Matrikel"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr "CRAIG - Auvergne 2013 - 25 cm"
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "GrandNancy Orthophotographie 2012"
@@ -16312,9 +16442,6 @@ msgstr ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
"- 1 m"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Sorbian Language)"
-
msgid "Hamburg (40 cm)"
msgstr "Hamburg (40 cm)"
@@ -16342,9 +16469,6 @@ msgstr "Berlin aerial photograph 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Berlin aerial photograph 2016"
-msgid "Stuttgart (aerial imagery)"
-msgstr "Stuttgart (aerial imagery)"
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Erlangen aerial imagery (2016 5.0 cm)"
@@ -16378,9 +16502,64 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr "imagico.de OSM images for mapping: Qasigiannguit"
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr "imagico.de OSM images for mapping: Thule Air Base"
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr "imagico.de OSM images for mapping: Greenland mosaic"
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr "imagico.de OSM images for mapping: Northern Greenland ASTER"
+
msgid "Drone Imagery (Haiti)"
msgstr "Drone Imagery (Haiti)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+"Midlertidig utilgængelig indtil formentlig januar 2017 på grund af server "
+"udskiftning."
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone Imagery 2014 (Haiti)"
@@ -16417,14 +16596,8 @@ msgstr "Danube flood ortophoto 2013"
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
-msgid "Budapest district XII ortophoto 2013"
-msgstr "Budapest district XII ortophoto 2013"
-
-msgid "Interspect Budapest ortophoto 2014"
-msgstr "Interspect Budapest ortophoto 2014"
-
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
-msgstr "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "Budapest district XI ortophoto 2015"
+msgstr "Budapest district XI ortophoto 2015"
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Hungary (hiking routes)"
@@ -16432,6 +16605,21 @@ msgstr "OpenStreetMap Hungary (hiking routes)"
msgid "Hillshade Hungary"
msgstr "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgstr "imagico.de OSM images for mapping: Eastern Iceland"
+
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr "imagico.de OSM images for mapping: Rann of Kutch"
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr "imagico.de OSM images for mapping: Southeastern Sulawesi"
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr "imagico.de OSM images for mapping: Bakun Reservoir"
+
+msgid "imagico.de OSM images for mapping: Batam"
+msgstr "imagico.de OSM images for mapping: Batam"
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -16492,9 +16680,21 @@ msgstr "PCN 2012 - Italy"
msgid "South Tyrol Orthofoto 2011"
msgstr "South Tyrol Orthofoto 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr "South Tyrol Orthofoto 2011 (highres)"
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr "South Tyrol Orthofoto 2014"
+
msgid "South Tyrol Topomap"
msgstr "South Tyrol Topomap"
+msgid "Japan GSI ortho Imagery"
+msgstr "Japan GSI ortho Imagery"
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "USSR - Latvia"
@@ -16528,12 +16728,35 @@ msgstr "Niger Delta Oct 2012 Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard -Orthophoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr "imagico.de OSM images for mapping: Western Karakoram"
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Gaza Strip - Pléiades - 2014/07/06"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr "imagico.de OSM images for mapping: Panama Canal"
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr "imagico.de OSM images for mapping: Vanatinai"
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr "imagico.de OSM images for mapping: New Ireland"
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
@@ -16660,9 +16883,6 @@ msgstr "Świętochłowice: Ortofotomapa 2012 (aerial image)"
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Zabrze: Ortofotomapa 2011 (aerial image)"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Szlaki (paths)"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr "Wrocław: Ortofotomapa 2015 (aerial image)"
@@ -16672,6 +16892,22 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr "imagico.de OSM images for mapping: Kerch Strait"
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr "imagico.de OSM images for mapping: Ushakov Island August 2016"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Car"
@@ -16693,12 +16929,30 @@ msgstr "RABA-KGZ: Slovenia farmland use"
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr "RABA-KGZ: Slovenia built-up areas"
+msgid "City of Cape Town 2013 Aerial"
+msgstr "City of Cape Town 2013 Aerial"
+
msgid "City of Cape Town 2015 Aerial"
msgstr "City of Cape Town 2015 Aerial"
msgid "South Africa CD:NGI Aerial"
msgstr "South Africa CD:NGI Aerial"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr "imagico.de OSM images for mapping: Leskov Island ASTER"
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr "imagico.de OSM images for mapping: Scott Island"
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr "imagico.de OSM images for mapping: Leskov Island Landsat"
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr "imagico.de OSM images for mapping: Clerke Rocks"
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr "imagico.de OSM images for mapping: Shag Rocks"
+
msgid "Catastro Spain"
msgstr "Catastro Spain"
@@ -16720,6 +16974,9 @@ msgstr "IDEIB - Balearic Islands"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Canary Islands"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Kanton Aargau 25cm (AGIS 2011)"
@@ -16762,6 +17019,9 @@ msgstr "Canton de Fribourg 50cm (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Stadt Bern 10cm/25cm (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr "Stadt Bern 10cm (2016)"
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -16783,6 +17043,12 @@ msgstr "Bonvillars Orthophoto 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Fiez Orthophoto 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr "Kanton Basel-Stadt 2015"
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr "Taiwan e-Map Open Data"
@@ -16798,6 +17064,9 @@ msgstr "Taiwan Land-Section Data"
msgid "NLSC Open Data WMTS"
msgstr "NLSC Open Data WMTS"
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "MSR Maps Topo"
@@ -16825,9 +17094,54 @@ msgstr "NC Latest Orthoimagery"
msgid "U.S. Forest Service roads"
msgstr "U.S. Forest Service roads"
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr "imagico.de OSM images for mapping: Alaska Range"
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr "NJ 2015 Aerial Imagery (Infrared)"
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr "NJ 2015 Aerial Imagery (Natural Color)"
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr "San Juan Metro Area: 2013 USACE Orthophotos"
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr "WA 2013 aerial imagery for San Juan County"
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr "WA Vector Streetmap for San Juan County"
+
+msgid "Texas Orthophoto"
+msgstr "Texas Orthophoto"
+
+msgid "Philadelphia 2015 Imagery"
+msgstr "Philadelphia 2015 Imagery"
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr "MD 2014 6 Inch Aerial Imagery"
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr "MD Three Inch Aerial Imagery"
+
+msgid "MD Transportation Basemap"
+msgstr "MD Transportation Basemap"
+
+msgid "Delaware 2012 Orthophotography"
+msgstr "Delaware 2012 Orthophotography"
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr "imagico.de OSM images for mapping: Rwenzori Mountains"
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ukraine - Orthophotomaps 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr "Virker kun indefra Ukraine eller med en ukrainsk proxyserver."
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr "Ukraine - Kyiv 2014 (DZK)"
@@ -16849,9 +17163,6 @@ msgstr "Surrey Air Survey"
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Scotland 1842-82"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr "NLS - OS 6-inch County Series 1888-1913"
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -16861,9 +17172,6 @@ msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr "NLS - OS 25-inch (Scotland) 1892-1905"
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25k historic (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "OS 1:25k historic (OSM-Limited)"
@@ -17202,7 +17510,7 @@ msgstr "Downloader nye data når du panorerer/zoomer"
msgid "Create a grid of ways."
msgstr "Opret et net af veje."
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr "Tilpasning af stoppesteder for offentlig transport."
msgid ""
@@ -17312,6 +17620,9 @@ msgstr "Simpelt værktøj til at tagge husnumre."
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "Opret billed XML grænser fra en multipolygon"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr "Eksporter tern fra billedlags cache til filsystemet."
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -17468,7 +17779,8 @@ msgstr ""
msgid ""
"Launches FireFox to display the current visible screen as a nice SVG image."
msgstr ""
-"Starter Firefox for at vise den nu synlige skærm som et pænt SVG-billede."
+"Starter Firefox for at vise den aktuelle synlige skærm som et pænt SVG-"
+"billede."
msgid ""
"Bring in errors from Osm Inspector and display it on the current JOSM "
@@ -18132,7 +18444,7 @@ msgid "korean"
msgstr "koreansk"
msgid "Internet access"
-msgstr "Internet-adgang"
+msgstr "Internetadgang"
msgid "wlan"
msgstr "wlan"
@@ -18144,7 +18456,7 @@ msgid "terminal"
msgstr "terminal"
msgid "Internet access fee"
-msgstr "Gebyr for Internet-adgang"
+msgstr "Betaling for internetadgang"
msgid "Smoking"
msgstr "Rygning"
@@ -19821,6 +20133,9 @@ msgstr "Bæk"
msgid "River"
msgstr "Flod"
+msgid "Lock"
+msgstr "Sluse"
+
msgid "Canal"
msgstr "Kanal"
@@ -20626,7 +20941,7 @@ msgid "Tools for do-it-yourself repair (may be a bike co-operative)"
msgstr "Værktøj til gør-det-selv reparationer (kan være et cykel fællesskab)"
msgid "Bicycles are washed (for a fee)"
-msgstr "Cykler vaskes (for et beløb)"
+msgstr "Cykler vaskes (mod betaling)"
msgid "Public Bicycle Repair Station"
msgstr "Offentlig cykelreparationssted"
@@ -20875,6 +21190,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr "Pensionat/Bed & Breakfast"
+msgid "Apartment"
+msgstr "Ferielejlighed"
+
+msgid "Number of apartments"
+msgstr "Antal ferielejligheder"
+
msgid "Chalet"
msgstr "Feriehytte"
@@ -20941,6 +21262,12 @@ msgstr "Udendørsservering"
msgid "Takeaway"
msgstr "Tag med"
+msgid "Delivery"
+msgstr "Levering"
+
+msgid "Mo-Su 12:00-22:00"
+msgstr "Mo-Su 12:00-22:00"
+
msgid "Fast Food"
msgstr "Fastfood"
@@ -21886,31 +22213,19 @@ msgstr "dyreskjul"
msgid "Hunting Stand"
msgstr "Jagttårn"
-msgid "Height"
-msgstr "Højde"
-
-msgctxt "height"
-msgid "low"
-msgstr "lav"
-
-msgctxt "height"
-msgid "half"
-msgstr "halv"
-
-msgctxt "height"
-msgid "full"
-msgstr "fuld"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr "Skjult"
-msgid "Lock"
-msgstr "Lås"
+msgid "Lockable"
+msgstr "Låsbar"
msgid "Water Point"
msgstr "Vandpåfyldning"
+msgid "Animal watering place"
+msgstr "Vandingssted for dyr"
+
msgid "Compressed Air"
msgstr "Komprimeret luft"
@@ -22502,6 +22817,10 @@ msgid "hut"
msgstr "hytte"
msgctxt "building"
+msgid "bungalow"
+msgstr "bungalow"
+
+msgctxt "building"
msgid "dormitory"
msgstr "sovesal"
@@ -23797,6 +24116,9 @@ msgstr "Slagter"
msgid "Seafood"
msgstr "Fiskehandel"
+msgid "Dairy"
+msgstr "Mejeriudsalg"
+
msgid "Deli (Fine Food)"
msgstr "Delikatesse"
@@ -24613,9 +24935,6 @@ msgstr "Trærække"
msgid "A line of trees."
msgstr "En linje af træer."
-msgid "Wood"
-msgstr "Naturskov"
-
msgid "Woodland where timber production does not dominate use."
msgstr "Skov hvor træproduktion ikke dominere brug."
@@ -25685,6 +26004,9 @@ msgstr "Forskellige antal baner i nøglerne {0} og {1}"
msgid "possibly missing {0} tag"
msgstr "mangler måske {0} tag"
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr "gade med ulige antal {0}, men uden {1} og {2} eller {3}"
+
msgid "{0} is deprecated"
msgstr "{0} er forældet"
@@ -25787,6 +26109,12 @@ msgstr "tvivlsom nøgle (slutter med et tal)"
msgid "The key {0} has an uncommon value."
msgstr "Nøglen {0} har en usædvanlig værdi."
+msgid "misspelled value"
+msgstr "værdi stavet forkert"
+
+msgid "wrong value: {0}"
+msgstr "forkert værdi: {0}"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} på et punkt. Bør bruges på en vej."
@@ -25867,6 +26195,13 @@ msgstr "Kystlinje inden i {1}"
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} bør være på punktet hvor {1} og {2} krydser"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+"{0} er tagget for det lineære vandløb. Til at tagge vandområdet brug {1} + "
+"{2} i stedet."
+
msgid "abbreviated street name"
msgstr "forkortet gadenavn"
@@ -25891,6 +26226,9 @@ msgstr "{0} bruges med {1}"
msgid "street name contains ss"
msgstr "gadenavn indeholder ss"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr "{0} er forældet, brug {1} i stedet. Tjek også lignende tags som {2}"
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -26701,6 +27039,20 @@ msgstr "Indsend det aktuelle rettesæt"
msgid "Submit the current changeset to Mapillary"
msgstr "Indsend det aktuelle rettesæt til Mapillary"
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr "Rettesæt upload mislykkedes med {0} fejl ''{1} {2}''!"
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+"En handling opstod under forsøget på at indsende et rettesæt. Hvis det sker "
+"gentagne gange, overvej da at rapportere en fejl via menuen Hjælp. Hvis "
+"denne meddelelse vises for første gang, så prøv igen. Der kan have været et "
+"problem med internetforbindelsen."
+
msgid "Upload pictures"
msgstr "Upload billeder"
@@ -26743,8 +27095,8 @@ msgstr "Åben Mapillary rettesæt dialog"
msgid "Mapillary changeset"
msgstr "Mapillary rettesæt"
-msgid "Submit"
-msgstr "Indsend"
+msgid "Submitting changeset to server…"
+msgstr "Indsender rettesæt til server…"
msgid "Export all images"
msgstr "Eksporter alle billeder"
@@ -27651,6 +28003,9 @@ msgstr "Vælg et område (f.eks. bygning) fra et underliggende billede."
msgid "Area Selector"
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"
@@ -27697,11 +28052,11 @@ msgid "Algorithm"
msgstr "Algoritme"
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
-"Maksimale pixels et punkt kan være væk fra en linje og stadig betragtes som "
-"medlem af denne linje (Standard: {0})."
+"Maksimal afstand i meter mellem et punkt og linjen der skal betragtes som et "
+"medlem af denne linie (Standard: {0})."
msgid "Distance Tolerance"
msgstr "Afstand tolerance"
@@ -27801,7 +28156,7 @@ msgid "Create building"
msgstr "Opret bygning"
msgid "Set buildings size"
-msgstr "Indstil størrelse på bygninger"
+msgstr "Sæt størrelse på bygninger"
msgid "Use Address dialog"
msgstr "Brug adresse dialog"
@@ -27831,7 +28186,7 @@ msgid "Point on opposite end of the building"
msgstr "Klik på den modsatte ende af bygningen"
msgid "Set width of the building"
-msgstr "Indstil bredde for bygningen"
+msgstr "Sæt bredde for bygningen"
msgid "Merge address points"
msgstr "Læg adressepunkter sammen"
@@ -28086,7 +28441,7 @@ msgstr "Tillader flere lags stabling"
msgid "Set WMS layers transparency. Right is opaque, left is transparent."
msgstr ""
-"Set WMS lag gennemsigtighed. Højre er uigennemsigtig, venstre er "
+"Sæt WMS lag gennemsigtighed. Højre er uigennemsigtig, venstre er "
"gennemsigtig."
msgid "Draw a rectangle around downloaded data from WMS server."
@@ -29416,6 +29771,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Åbn billedlag XML fil"
+msgid "Export tiles"
+msgstr "Eksporter tern"
+
+msgid "Export cached tiles to file system."
+msgstr "Eksporter cachede tern til fil system."
+
+msgid "Exporting cached tiles"
+msgstr "Eksporter cachede tern"
+
+msgid "Failed to write image file {0}: {1}"
+msgstr "Kunne ikke skrive billedfilen {0}: {1}"
+
+msgid "Failed to write image file {0}."
+msgstr "Kunne ikke skrive billedfilen {0}."
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] "Eksportede {0} tern fra lag {1}."
+msgstr[1] "Eksportede {0} tern fra lag {1}."
+
+msgid "Export file system path already exists but is not a directory."
+msgstr "Eksport filsystem sti findes allerede, men er ikke en mappe."
+
+msgid "Failed to create export directory: {0}"
+msgstr "Kunne ikke oprette eksportmappe: {0}"
+
+msgid "Failed to create export directory."
+msgstr "Kunne ikke oprette eksportmappe."
+
+msgid "Append cache name"
+msgstr "Tilføj cache navn"
+
+msgid "Export Tiles"
+msgstr "Eksporter tern"
+
+msgid "Cache name:"
+msgstr "Cache navn:"
+
+msgid "Object count:"
+msgstr "Objekt tæller:"
+
+msgid "file system path"
+msgstr "filsystem sti"
+
+msgid "File system path the tiles are exported to."
+msgstr "Filsystem sti tern eksporteres til."
+
+msgid "Export directory:"
+msgstr "Eksportmappe:"
+
+msgid "Append cache name to export directory."
+msgstr "Tilføj cache navn til eksportmappe."
+
+msgid "Tiles will be exported to directory {0}"
+msgstr "Tern vil blive eksporteret til mappe {0}"
+
+msgid "No export directory set."
+msgstr "Ingen eksportmappe sat."
+
msgid "Calibration Layer"
msgstr "Kalibreringslag"
@@ -30935,8 +31349,8 @@ msgid ""
"Firefox not found. Please set firefox executable in the Map Settings page of "
"the preferences."
msgstr ""
-"Firefox blev not found. Angiv Firefox-programmet i siden for Kort-opsætning "
-"under indstillingerne."
+"Firefox blev ikke fundet. Angiv Firefox-programmet på siden med "
+"Indstillinger for kort under indstillingerne."
msgid "Firefox executable"
msgstr "Firefox-programfil"
@@ -31694,9 +32108,6 @@ msgstr "OT: Rute skal starte og slutte med en stop_position"
msgid "PT: First or last way needs to be split"
msgstr "OT: første eller sidste vej skal deles"
-msgid "PT: Problem in the route segment"
-msgstr "OT: Problem i rutesegmentet"
-
msgid "PT: Stop not served"
msgstr "OT: Stop ikke serviceret"
@@ -31861,9 +32272,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr "[mellemrum]"
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "Rutemønstre ..."
@@ -31921,6 +32329,9 @@ msgstr "venstre side"
msgid "Maximum distance from route"
msgstr "Maksimal afstand fra ruten"
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "Offentlig Transport: Skift stop type"
@@ -32121,9 +32532,6 @@ msgstr "Genopbyg polygon"
msgid "Multipolygon must consist only of ways"
msgstr "Multipolygon må kun bestå af veje"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr "Genopbygning af polygoner kan kun ske ud fra ydre veje"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Genopbyg polygoner fra relation {0}"
diff --git a/i18n/po/de.po b/i18n/po/de.po
index 78cbda3..54cc4ab 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: 2016-11-06 22:51+0100\n"
-"PO-Revision-Date: 2016-11-02 19:57+0000\n"
-"Last-Translator: Ettore Atalan <atalanttore at googlemail.com>\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
+"PO-Revision-Date: 2016-12-27 11:32+0000\n"
+"Last-Translator: Dieter W. <geozeisig at versanet.de>\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: 2016-11-07 04:45+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:49+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: de\n"
"X-Poedit-SearchPath-0: .\n"
"X-Poedit-Basepath: /home/simon/src/josm.all/i18n\n"
@@ -68,9 +68,15 @@ msgstr "Hauptmenü wird aufgebaut"
msgid "Help"
msgstr "Hilfe"
+msgid "Initializing internal boundaries data"
+msgstr "Interne Grenzdaten werden initialisiert"
+
msgid "Initializing OSM API"
msgstr "OSM-API wird initialisiert"
+msgid "Initializing internal traffic data"
+msgstr "Interne Verkehrsdaten werden initialisiert"
+
msgid "Initializing validator"
msgstr "Prüfer wird initialisiert"
@@ -216,6 +222,12 @@ msgstr ""
"Ausgewählte Elemente auf der Karte auf die obige Liste der ausgewählten "
"Objekte setzen."
+msgid "Select WMS layers"
+msgstr "WMS-Ebenen auswählen"
+
+msgid "Add layers"
+msgstr "Ebenen hinzufügen"
+
msgid "Add imagery layer {0}"
msgstr "Hintergrundbildebene {0} hinzufügen"
@@ -237,12 +249,6 @@ msgstr "Fehler"
msgid "Select image format for WMS layer"
msgstr "Bildformat der WMS-Ebene wählen"
-msgid "Select WMS layers"
-msgstr "WMS-Ebenen auswählen"
-
-msgid "Add layers"
-msgstr "Ebenen hinzufügen"
-
msgid "Add Node..."
msgstr "Punkt hinzufügen …"
@@ -772,6 +778,9 @@ msgstr "Zu Position springen"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Einen Dialog zum Springen an eine spezifische Position öffnen"
+msgid "Jump to Position"
+msgstr "Zu Position springen"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Länge und Breite der Sprungposition angeben."
@@ -793,9 +802,6 @@ msgstr "Adresse"
msgid "Jump there"
msgstr "Dorthin springen"
-msgid "Jump to Position"
-msgstr "Zu Position springen"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Länge, Breite oder Vergrößerung konnten nicht gelesen werden. Bitte prüfen."
@@ -851,6 +857,9 @@ msgstr "Ebene vereinigen"
msgid "Merge the current layer into another layer"
msgstr "Aktuelle Ebene mit einer anderen zusammenführen"
+msgid "{0} completed in {1}"
+msgstr "''{0}'' in {1} beendet"
+
msgid "Merging layers with different upload policies"
msgstr "Ebenen mit unterschiedlichen Hochlade-Richtlinien vereinen"
@@ -1026,19 +1035,18 @@ msgstr[1] "{0} Dateien werden geöffnet …"
msgid "Opening file ''{0}'' ..."
msgstr "Datei »{0}« wird geöffnet …"
+msgid "Which tasks to perform?"
+msgstr "Welche Arbeitsschritte sollen ausgeführt werden?"
+
+msgid "Ok"
+msgstr "Ok"
+
msgid "Open Location..."
msgstr "Adresse öffnen …"
msgid "Open an URL."
msgstr "Eine Adresse öffnen."
-msgid "Separate Layer"
-msgstr "Separate Ebene"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr ""
-"Auswählen, ob die Daten in eine neue Ebene heruntergeladen werden sollen"
-
msgid "Enter URL to download:"
msgstr "Adresse zum Herunterladen eingeben:"
@@ -1046,6 +1054,13 @@ msgid "Enter an URL from where data should be downloaded"
msgstr ""
"Bitte geben Sie eine Adresse ein, von der Daten heruntergeladen werden sollen"
+msgid "Separate Layer"
+msgstr "Separate Ebene"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+"Auswählen, ob die Daten in eine neue Ebene heruntergeladen werden sollen"
+
msgid "Download Location"
msgstr "Ort herunterladen"
@@ -1061,12 +1076,6 @@ msgstr "Fenster schließen und Herunterladen abbrechen"
msgid "Download Data"
msgstr "Daten herunterladen"
-msgid "Which tasks to perform?"
-msgstr "Welche Arbeitsschritte sollen ausgeführt werden?"
-
-msgid "Ok"
-msgstr "Ok"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1949,9 +1958,6 @@ msgstr "Änderungssätze abfragen und herunterladen …"
msgid "Errors during download"
msgstr "Fehler beim Herunterladen"
-msgid "Download Geo URL"
-msgstr "Geo URI herunterladen"
-
msgid "Download GPS"
msgstr "GPS herunterladen"
@@ -4188,7 +4194,7 @@ msgid "Crossing barriers"
msgstr "Überschneidende Barrieren"
msgid "Self crossing"
-msgstr "Selbstüberquerung"
+msgstr "Selbstüberschneidung"
msgid "Self-crossing ways"
msgstr "Selbstüberquerende Wege"
@@ -4377,9 +4383,6 @@ msgstr "Linie mit Flächenzeichenstil nicht geschlossen"
msgid "No outer way for multipolygon"
msgstr "Keine äußere Linie für Multipolygon"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "Rolle für ''{0}'' sollte ''{1}'' sein"
-
msgid "No area style for multipolygon"
msgstr "Kein Flächenstil für Multipolygon"
@@ -4417,12 +4420,27 @@ msgstr "Flächenzeichenstil auf äußerer Linie"
msgid "Multipolygon is not closed"
msgstr "Multipolygon nicht geschlossen"
-msgid "Multipolygon inner way is outside"
-msgstr "Innenlinie im Multipolygon ist außen"
+msgid "Multipolygon rings share node(s)"
+msgstr "Multipolygon-Ringe teilen sich Knoten"
msgid "Intersection between multipolygon ways"
msgstr "Multipolygonlinien schneiden sich"
+msgid "Multipolygon rings are equal"
+msgstr "Multipolygon-Ringe sind gleich"
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "Rolle für ''{0}'' sollte ''{1}'' sein"
+
+msgid "Multipolygon inner way is outside"
+msgstr "Innenlinie im Multipolygon ist außen"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr "Multipolygon-Ring enthält Abschnitte doppelt"
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr "Multipolygon-Außenlinie teilt sich Abschnitt(e) mit anderem Ring"
+
msgid "No useful role for multipolygon member"
msgstr "Keine sinnvolle Rolle für Multipolygon-Element"
@@ -5149,12 +5167,18 @@ msgstr "Zugriff zu folgende/n Ressource/n verweigern (kommagetrennt)"
msgid "options provided as Java system properties"
msgstr "Optionen über die Java-Systemeinstellungen"
+msgid "Change the JOSM directory name"
+msgstr "JOSM-Verzeichnisnamen ändern"
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/PFAD/ZU/JOSM/EINST. "
msgid "Set the preferences directory"
msgstr "Legen Sie das Einstellungsverzeichnis fest"
+msgid "Default: {0}"
+msgstr "Standard: {0}"
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/PFAD/ZU/JOSM/BENUTZERDATEN"
@@ -5171,11 +5195,11 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/PFAD/ZU/JOSM/HOME-VERZEICHNIS "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Verschiebe alle 3 Verzeichnisse in das home-Verzeichnis. Das "
-"Zwischenspeicherverzeichnis ist dann home-Verzeichnis/cache"
+"Legen Sie das Einstellungs-, Daten-, Zwischenspeicherverzeichnis fest "
+"(Zwischenspeicherverzeichnis wird josm.home/cache sein)"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5527,9 +5551,6 @@ msgstr "Klicken, um Arbeit im Hintergrund auszuführen"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "''{0}'' in {1} beendet"
-
msgid "Enlarge"
msgstr "Vergrößern"
@@ -5675,86 +5696,6 @@ msgstr "Konflikthintergrund: Element entfernen"
msgid "Conflict foreground: remove member"
msgstr "Konfliktvordergrund: Element entfernen"
-msgid "My with Their"
-msgstr "Meine mit Deren"
-
-msgid "My with Merged"
-msgstr "Meine mit Vereinigt"
-
-msgid "Their with Merged"
-msgstr "Deren mit Vereinigt"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "Role {0} nimmt nicht an dem Vergleichspaar {1} teil."
-
-msgid "Properties"
-msgstr "Eigenschaften"
-
-msgid "Tags"
-msgstr "Merkmale"
-
-msgid "Nodes"
-msgstr "Punkte"
-
-msgid "Members"
-msgstr "Elemente"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Keine verbleibenden Merkmalskonflikte zu beheben"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Merkmale ({0} Konflikt)"
-msgstr[1] "Merkmale ({0} Konflikte)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} verbleibender Merkmalskonflikt zu beheben"
-msgstr[1] "{0} verbleibende Merkmalskonflikte zu beheben"
-
-msgid "Nodes(resolved)"
-msgstr "Punkte(gelöst)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Vereinigte Punktliste fixiert. Keine verbleibenden Konflikte in der "
-"Punktliste der Linie."
-
-msgid "Nodes(with conflicts)"
-msgstr "Punkte(mit Konflikten)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Verbleibende Konflikte in der Punktliste der Linie"
-
-msgid "Members(resolved)"
-msgstr "Elemente(gelöst)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Vereinigte Elementenliste fixiert. Keine verbleibenden Konflikte in der "
-"Elementenliste der Relation."
-
-msgid "Members(with conflicts)"
-msgstr "Elemente(mit Konflikten)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Verbleibende Konflikte in der Elementenliste der Relation"
-
-msgid "No pending property conflicts"
-msgstr "Keine verbleibenden Eigenschaftskonflikte"
-
-msgid "Properties(with conflicts)"
-msgstr "Eigenschaften(mit Konflikten)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Verbleibende Eigenschaftskonflikte zu beheben"
-
-msgid "Conflict Resolution"
-msgstr "Konfliktlösung"
-
msgid "{0} more..."
msgstr "{0} weitere …"
@@ -5940,6 +5881,86 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Deren Version ({0} Eintrag)"
msgstr[1] "Deren Version ({0} Einträge)"
+msgid "My with Their"
+msgstr "Meine mit Deren"
+
+msgid "My with Merged"
+msgstr "Meine mit Vereinigt"
+
+msgid "Their with Merged"
+msgstr "Deren mit Vereinigt"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "Role {0} nimmt nicht an dem Vergleichspaar {1} teil."
+
+msgid "Properties"
+msgstr "Eigenschaften"
+
+msgid "Tags"
+msgstr "Merkmale"
+
+msgid "Nodes"
+msgstr "Punkte"
+
+msgid "Members"
+msgstr "Elemente"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Keine verbleibenden Merkmalskonflikte zu beheben"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Merkmale ({0} Konflikt)"
+msgstr[1] "Merkmale ({0} Konflikte)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} verbleibender Merkmalskonflikt zu beheben"
+msgstr[1] "{0} verbleibende Merkmalskonflikte zu beheben"
+
+msgid "Nodes(resolved)"
+msgstr "Punkte(gelöst)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Vereinigte Punktliste fixiert. Keine verbleibenden Konflikte in der "
+"Punktliste der Linie."
+
+msgid "Nodes(with conflicts)"
+msgstr "Punkte(mit Konflikten)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Verbleibende Konflikte in der Punktliste der Linie"
+
+msgid "Members(resolved)"
+msgstr "Elemente(gelöst)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Vereinigte Elementenliste fixiert. Keine verbleibenden Konflikte in der "
+"Elementenliste der Relation."
+
+msgid "Members(with conflicts)"
+msgstr "Elemente(mit Konflikten)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Verbleibende Konflikte in der Elementenliste der Relation"
+
+msgid "No pending property conflicts"
+msgstr "Keine verbleibenden Eigenschaftskonflikte"
+
+msgid "Properties(with conflicts)"
+msgstr "Eigenschaften(mit Konflikten)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Verbleibende Eigenschaftskonflikte zu beheben"
+
+msgid "Conflict Resolution"
+msgstr "Konfliktlösung"
+
msgid "Node"
msgstr "Punkt"
@@ -6003,10 +6024,8 @@ msgstr "Rolle"
msgid "Primitive"
msgstr "Objekt"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"Vereinigte Punkte sind noch nicht fixiert. Konfliktlösung kann nicht "
-"ausgeführt werden."
msgid "<undefined>"
msgstr "<undefiniert>"
@@ -7541,102 +7560,6 @@ msgstr "Änderungssätze nach Zeitraum auswählen"
msgid "Select only changesets related to a specific bounding box"
msgstr "Nur Änderungssätze eines bestimmten geografischen Bereichs auswählen"
-msgid "Query open changesets only"
-msgstr "Nur nach offenen Änderungssätzen suchen"
-
-msgid "Query closed changesets only"
-msgstr "Nur nach geschlossenen Änderungssätzen suchen"
-
-msgid "Query both open and closed changesets"
-msgstr "Nach offenen und geschlossenen Änderungssätzen suchen"
-
-msgid "Only changesets owned by myself"
-msgstr "Nur meine eigenen Änderungssätze"
-
-msgid "User ID:"
-msgstr "Benutzerkennung:"
-
-msgid "User name:"
-msgstr "Benutzername:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Nur Änderungssätze vom Nutzer mit der folgenden Benutzerkennung"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "Nur Änderungssätze vom Nutzer mit folgendem Namen"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Nur meine Änderungssätze (deaktiviert. JOSM-Nutzer momentan noch anonym)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Auswahl kann nicht auf eigene Änderungssätze begrenzt werden, weil keine "
-"Benutzerkennung eingegeben wurde."
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "Der Wert ''{0}'' für die Benutzerkennung ist ungültig"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"Auswahl kann nicht auf Änderungssätze des Benutzers ''{0}'' begrenzt werden"
-
-msgid "Please enter a valid user ID"
-msgstr "Bitte eine gültige Benutzerkennung eingeben"
-
-msgid "Invalid user ID"
-msgstr "Ungültige Benutzerkennung"
-
-msgid "Please enter a non-empty user name"
-msgstr "Bitte einen Nutzernamen eingeben"
-
-msgid "Invalid user name"
-msgstr "Ungültiger Benutzername"
-
-msgid "Date: "
-msgstr "Datum: "
-
-msgid "Time:"
-msgstr "Zeit:"
-
-msgid "Closed after - "
-msgstr "Geschlossen nach - "
-
-msgid "Date:"
-msgstr "Datum:"
-
-msgid "Created before - "
-msgstr "Erstellt bevor - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Nur Änderungssätze, die nach diesem Zeitpunkt geschlossen wurden"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-"Nur Änderungssätze, die vor einem bestimmten Zeitraum erstellt und "
-"geschlossen wurden"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"Kann keine Anfrage nach Änderungssätzen formulieren. Eingabe ist nicht "
-"gültig."
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr ""
-"<html>Bitte geben Sie gültige Werte für Datum und Uhrzeit ein,<br />um die "
-"Anfrage auf einen Zeitbereich zu beschränken.</html>"
-
-msgid "Invalid date/time values"
-msgstr "Ungültige Werte für Datum/Uhrzeit"
-
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
"invalid."
@@ -7654,29 +7577,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Ungültiges Koordinatenfenster"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"Der aktuelle Wert ist keine gültige Benutzerkennung. Bitte geben Sie eine "
-"positive Ganzzahl ein."
-
-msgid "Please enter an integer value > 0"
-msgstr "Bitte geben Sie eine positive Ganzzahl ein"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Bitte geben Sie das Datum im ortsüblichen Format an.<br>Beispiel: "
-"{0}<br>Beispiel: {1}<br>Beispiel: {2}<br>Beispiel: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Bitte geben Sie die Uhrzeit im ortsüblichen Format an.<br>Beispiel: "
-"{0}<br>Beispiel: {1}<br>Beispiel: {2}<br>Beispiel: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Nur eigene Änderungssätze herunterladen"
@@ -7768,6 +7668,78 @@ msgstr "Ungültige Adresse für Änderungssatzanfrage"
msgid "Close the dialog and abort querying of changesets"
msgstr "Dialog schließen und Laden der Änderungssätze abbrechen"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Bitte geben Sie das Datum im ortsüblichen Format an.<br>Beispiel: "
+"{0}<br>Beispiel: {1}<br>Beispiel: {2}<br>Beispiel: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Nur nach offenen Änderungssätzen suchen"
+
+msgid "Query closed changesets only"
+msgstr "Nur nach geschlossenen Änderungssätzen suchen"
+
+msgid "Query both open and closed changesets"
+msgstr "Nach offenen und geschlossenen Änderungssätzen suchen"
+
+msgid "Date: "
+msgstr "Datum: "
+
+msgid "Time:"
+msgstr "Zeit:"
+
+msgid "Closed after - "
+msgstr "Geschlossen nach - "
+
+msgid "Date:"
+msgstr "Datum:"
+
+msgid "Created before - "
+msgstr "Erstellt bevor - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Nur Änderungssätze, die nach diesem Zeitpunkt geschlossen wurden"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+"Nur Änderungssätze, die vor einem bestimmten Zeitraum erstellt und "
+"geschlossen wurden"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Kann keine Anfrage nach Änderungssätzen formulieren. Eingabe ist nicht "
+"gültig."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Bitte geben Sie gültige Werte für Datum und Uhrzeit ein,<br />um die "
+"Anfrage auf einen Zeitbereich zu beschränken.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Ungültige Werte für Datum/Uhrzeit"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Bitte geben Sie die Uhrzeit im ortsüblichen Format an.<br>Beispiel: "
+"{0}<br>Beispiel: {1}<br>Beispiel: {2}<br>Beispiel: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"Der aktuelle Wert ist keine gültige Benutzerkennung. Bitte geben Sie eine "
+"positive Ganzzahl ein."
+
+msgid "Please enter an integer value > 0"
+msgstr "Bitte geben Sie eine positive Ganzzahl ein"
+
msgid "URL: "
msgstr "Adresse: "
@@ -7789,6 +7761,53 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Diese Adresse ist keine gültige Änderungssatzanfrage."
+msgid "Only changesets owned by myself"
+msgstr "Nur meine eigenen Änderungssätze"
+
+msgid "User ID:"
+msgstr "Benutzerkennung:"
+
+msgid "User name:"
+msgstr "Benutzername:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Nur Änderungssätze vom Nutzer mit der folgenden Benutzerkennung"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "Nur Änderungssätze vom Nutzer mit folgendem Namen"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Nur meine Änderungssätze (deaktiviert. JOSM-Nutzer momentan noch anonym)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Auswahl kann nicht auf eigene Änderungssätze begrenzt werden, weil keine "
+"Benutzerkennung eingegeben wurde."
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "Der Wert ''{0}'' für die Benutzerkennung ist ungültig"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"Auswahl kann nicht auf Änderungssätze des Benutzers ''{0}'' begrenzt werden"
+
+msgid "Please enter a valid user ID"
+msgstr "Bitte eine gültige Benutzerkennung eingeben"
+
+msgid "Invalid user ID"
+msgstr "Ungültige Benutzerkennung"
+
+msgid "Please enter a non-empty user name"
+msgstr "Bitte einen Nutzernamen eingeben"
+
+msgid "Invalid user name"
+msgstr "Ungültiger Benutzername"
+
msgid "Activate"
msgstr "Aktivieren"
@@ -9017,6 +9036,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10712,6 +10734,9 @@ msgstr "Richtung"
msgid "Velocity, {0}"
msgstr "Geschwindigkeit, {0}"
+msgid "Wave Audio files (*.wav)"
+msgstr "Audio-Dateien im Wave-Format (*.wav)"
+
msgid "Import Audio"
msgstr "Audio importieren"
@@ -10727,9 +10752,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Import nicht möglich"
-msgid "Wave Audio files (*.wav)"
-msgstr "Audio-Dateien im Wave-Format (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Audio-Marken von {0}"
@@ -10845,17 +10867,6 @@ msgstr "(Die Adresse lautet: "
msgid "Select the map painting styles"
msgstr "Wählen Sie den Kartenstil"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-"Kartenstile konnten nicht von ''{0}'' geladen werden. Fehler war: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-"JOSM unterstützt im alten XML-Format geschriebene Kartenstile nicht mehr.\n"
-"Bitte aktualisieren Sie ''{0}'' auf MapCSS"
-
msgid "loading style ''{0}''..."
msgstr "Stil ''{0}'' wird geladen…"
@@ -10872,6 +10883,10 @@ msgstr[1] ""
"Beim Laden dieses Stils traten {0} Fehler auf. Wählen Sie ''Info'' aus dem "
"Rechtsklick-Menü, um weitere Einzelheiten zu erfahren."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+"Kartenstile konnten nicht von ''{0}'' geladen werden. Fehler war: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Kartenstile in ''{0}'' enthalten Fehler: {1}"
@@ -12015,6 +12030,9 @@ msgstr ""
msgid "Track date"
msgstr "Datum der Spur"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Einzelne Farbe (kann für benannte Ebenen angepasst werden)"
@@ -12027,6 +12045,18 @@ msgstr "Fahrrad"
msgid "Foot"
msgstr "Zu Fuß"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Naturwald"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Beim Einlesen von GPX Markierungen erzeugen"
@@ -12039,6 +12069,9 @@ msgstr "Dynamischer Farbbereich basierend auf den Datengrenzwerten"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Glätten der GPX-Darstellung (Anti-Aliasing)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -12111,6 +12144,11 @@ msgstr ""
"erreichen."
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -12133,11 +12171,18 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "Punkte und Spurabschnitte anhand des Zeitstempels einfärben."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
"Erlaubt die Feineinstellung der Spureinfärbung für verschiedene "
"Durchschnittsgeschwindigkeiten."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Färbung von Spuren und Punkten"
@@ -13476,6 +13521,12 @@ msgstr "Prüft auf Fehler auf religiösen Objekten"
msgid "Checks for errors on relations"
msgstr "Prüft auf Fehler auf Relationen"
+msgid "Territories"
+msgstr "Territorien"
+
+msgid "Checks for territories-specific features"
+msgstr "Prüft auf territorialspezifische Eigenschaften"
+
msgid "Unnecessary tags"
msgstr "Unnötige Merkmale"
@@ -14661,6 +14712,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Benutzername und Passwort (unverschlüsselt) speichern"
+msgid "Assume"
+msgstr "Annehmen"
+
+msgid "Existing values"
+msgstr "Existierende Werte"
+
msgid "<delete from {0} objects>"
msgstr "<von {0} Objekten löschen>"
@@ -14683,12 +14740,6 @@ msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
"Umschalt+Eingabe: alle Merkmale zu den ausgewählten Objekten hinzufügen"
-msgid "Assume"
-msgstr "Annehmen"
-
-msgid "Existing values"
-msgstr "Existierende Werte"
-
msgid "Enable the checkbox to accept the value"
msgstr "Feld anhaken, um den Wert zu akzeptieren"
@@ -15914,6 +15965,9 @@ msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
"Tastenkürzelkonflikt: ''{0}'' wurde von ''{1}'' auf ''{2}'' verschoben."
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "Es wurde {0} Merkmal im Puffer gefunden, das ist verdächtig!"
@@ -16447,14 +16501,17 @@ msgstr "Mapbox Satellitenbild"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr "Thunderforest Landschaft"
+
msgid "OpenSeaMap"
msgstr "OpenSeaMap"
-msgid "OpenStreetMap Carto (Standard layer)"
-msgstr "OpenStreetMap Carto (Standardebene)"
+msgid "OpenStreetMap Carto (Standard)"
+msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik Schwarz&Weiß)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr "OpenStreetMap (Standard schwarz-weiß)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, ohne Beschriftungen)"
@@ -16477,8 +16534,11 @@ msgstr "Hike & Bike"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Kambodscha, Laos, Thailand, Vietnam zweisprachig"
+msgid "Stamen Terrain"
+msgstr "Stamen Gelände"
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr "Kambodscha, Laos, Thailand, Vietnam, Myanmar zweisprachig"
msgid "OpenPT Map (overlay)"
msgstr "OpenPT-Karte (Einblendung)"
@@ -16528,8 +16588,8 @@ msgstr "OSM-Inspektor: Orte"
msgid "OSM Inspector: Highways"
msgstr "OSM-Inspektor: Straßen"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM-Inspektor: Multipolygon"
+msgid "OSM Inspector: Area"
+msgstr "OSM-Inspektor: Bereich"
msgid "OSM Inspector: Routing"
msgstr "OSM-Inspektor: Routing"
@@ -16537,11 +16597,27 @@ msgstr "OSM-Inspektor: Routing"
msgid "OSM Inspector: Addresses"
msgstr "OSM-Inspektor: Adressen"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM-Inspektor: Grenzen (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr "OSM-Inspektor: Küstenlinie (EU)"
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+"imagico.de OSM Bilder für die Kartierung: Albanische Alpen (Prokletije)"
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+"imagico.de OSM Bilder für die Kartierung: Südliches Transantarktisches "
+"Gebirge"
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr "imagico.de OSM Bilder für die Kartierung: Pensacola Mountains"
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+"imagico.de OSM Bilder für die Kartierung: Elephant Island/Clarence Island"
-msgid "IGN Argentina (WMTS)"
-msgstr "IGN (Nationales Institut für Geografie) Argentinien (WMTS)"
+msgid "IGN Argentina (TMS)"
+msgstr ""
msgid "IGN Argentina (WMS)"
msgstr "IGN Argentinien (WMS)"
@@ -16576,6 +16652,13 @@ msgstr "LPI NSW Verwaltungsgrenzen Staatsforst"
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr "LPI NSW Verwaltungsgrenzen NPWS-Schutzgebiet"
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+"imagico.de OSM Bilder für die Kartierung: Nordwestlicher Teil der Insel Heard"
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr "imagico.de OSM Bilder für die Kartierung: Küste Insel Heard"
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -16621,11 +16704,17 @@ msgstr "VoGIS: Flächenwidmungsplan"
msgid "VoGIS: Höhen und Gelände"
msgstr "VoGIS: Höhen und Gelände"
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
-msgstr "AGIV (Vlaanderen / Flandern) aktuellstes Luftbild (Winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr "imagico.de OSM Bilder für die Kartierung: Rila- und Pirin-Gebirge"
-msgid "AGIV aerial imagery 10cm 2013-15"
-msgstr "AGIV Luftbilder 10 cm 2013-15"
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr "AGIV Flandern neueste Luftbilder"
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
+msgstr "AGIV Flandern 2013-2015 Luftbilder 10 cm"
+
+msgid "AGIV Flanders GRB"
+msgstr ""
msgid "URBISfr numerical imagery (2013)"
msgstr "URBISfr Zahlenbilder (2013)"
@@ -16660,15 +16749,33 @@ msgstr "SPW(allonie) 2009-2010 Luftaufnahmen"
msgid "TEC bus lines (2014)"
msgstr "TEC-Buslinien (2014)"
-msgid "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
msgstr "Benin: Großraum Cotonou 2016"
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr "imagico.de OSM Bilder für die Kartierung: Cotonou"
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr "imagico.de OSM Bilder für die Kartierung: Bouvetinsel"
+
msgid "IBGE Mapa de Setores Urbanos"
msgstr "IBGE Karte der Stadtgebiete"
msgid "IBGE Mapa de Setores Rurais"
msgstr "IBGE Karte der ländlichen Gebiete"
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Geobasis Hydrografie"
@@ -16681,12 +16788,35 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "Britisch-Kolumbien Luftbildplan"
+msgid "Latest southwest British Columbia Landsat"
+msgstr "Neuestes südwestliches British Columbia Landsat"
+
msgid "Kelowna 2012"
msgstr "Kelowna 2012"
msgid "Kelowna Roads overlay"
msgstr "Kelowna-Straßeneinblendung"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr ""
+"imagico.de OSM Bilder für die Kartierung: Östliche Küste Devon Island"
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr "imagico.de OSM Bilder für die Kartierung: Nördliche Ellesmere-Insel"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr "imagico.de OSM Bilder für die Kartierung: Fogo, Kap Verde"
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr "imagico.de OSM Bilder für die Kartierung: Insel Londonderry"
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr "imagico.de OSM Bilder für die Kartierung: Vulkan Calbuco"
+
msgid "Czech CUZK:KM"
msgstr "Tschechisches CUZK:KM"
@@ -16723,6 +16853,12 @@ msgstr "Stevns (Dänemark)"
msgid "Vejmidte (Denmark)"
msgstr "Vejmidte (Dänemark)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr "imagico.de OSM Bilder für die Kartierung: El Altar"
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Estland Basiskarte (Maaamet)"
@@ -16756,9 +16892,6 @@ msgstr "Kataster"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr "CRAIG - Auvergne 2013 - 25 cm"
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "GroßNancy Orthofoto 2012"
@@ -16816,9 +16949,6 @@ msgid ""
msgstr ""
"Vercors - Naturschutzgebiet Hochland von Vercors - Orthofotos 1999 - 1 m"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Sorbische Sprache)"
-
msgid "Hamburg (40 cm)"
msgstr "Hamburg (40 cm)"
@@ -16846,9 +16976,6 @@ msgstr "Berlin Luftbild 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Berlin Luftaufnahme 2016"
-msgid "Stuttgart (aerial imagery)"
-msgstr "Stuttgart (Luftbild)"
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Erlangen Luftbild (2016 5,0 cm)"
@@ -16883,9 +17010,60 @@ msgstr "NRW-Atlas: Topografische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+"imagico.de OSM Bilder für die Kartierung: Nördliches deutsches Westküsten-"
+"Watt"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+"imagico.de OSM Bilder für die Kartierung: Nördliches deutsches Westküsten-"
+"Watt (Infrarot)"
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr "imagico.de OSM Bilder für die Kartierung: Qasigiannguit"
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr "imagico.de OSM Bilder für die Kartierung: Thule Air Base"
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr "imagico.de OSM Bilder für die Kartierung: Grönland-Mosaik"
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+"imagico.de OSM Bilder für die Kartierung: Mai 2013 seitlich aufgenommen (off-"
+"nadir) Landsat"
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr "imagico.de OSM Bilder für die Kartierung: Nördliches Grönland ASTER"
+
msgid "Drone Imagery (Haiti)"
msgstr "Dronenbilder (Haiti)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Dronenbilder 2014 (Haiti)"
@@ -16922,14 +17100,8 @@ msgstr "Donauhochwasser-Orthofoto 2013"
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Flussufer der Donau in Budapest, Sankt Andrä und Szigetmonostor"
-msgid "Budapest district XII ortophoto 2013"
-msgstr "Budapest Bezirk XII Orthofoto 2013"
-
-msgid "Interspect Budapest ortophoto 2014"
-msgstr "Interspect Budapest Orthofoto 2014"
-
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
-msgstr "Fünf Bezirke von Budapest: III, IV, XIII, XIV, XV"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Hungary (Wanderwege)"
@@ -16937,6 +17109,21 @@ msgstr "OpenStreetMap Hungary (Wanderwege)"
msgid "Hillshade Hungary"
msgstr "Schummerung Ungarn"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgstr "imagico.de OSM Bilder für die Kartierung: Östliches Island"
+
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr "imagico.de OSM Bilder für die Kartierung: Rann von Kachchh"
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr "imagico.de OSM Bilder für die Kartierung: Südöstliches Sulawesi"
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr "imagico.de OSM Bilder für die Kartierung: Bakun-Stausee"
+
+msgid "imagico.de OSM images for mapping: Batam"
+msgstr "imagico.de OSM Bilder für die Kartierung: Batam"
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -16997,9 +17184,21 @@ msgstr "PCN 2012 - Italien"
msgid "South Tyrol Orthofoto 2011"
msgstr "Südtirol Orthofoto 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr "Südtirol Topokarte"
+msgid "Japan GSI ortho Imagery"
+msgstr "Japan GSI Luftbild"
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "UdSSR - Lettland"
@@ -17033,12 +17232,37 @@ msgstr "Nigerdelta Okt 2012 Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Spitzbergen - Orthofoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+"imagico.de OSM Bilder für die Kartierung: Westliches Karakorum-Gebirge"
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Gazastreifen - Pléiades - 2014/07/06"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Gazastreifen - Pléiades - 2014/07/06 (Nahinfrarot)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr "imagico.de OSM Bilder für die Kartierung: Panamakanal"
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr "imagico.de OSM Bilder für die Kartierung: Vanatinai"
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr "imagico.de OSM Bilder für die Kartierung: Neuirland"
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+"imagico.de OSM-Bilder für die Kartierung: Vilcanota-Kordillere und Quelccaya-"
+"Eiskappe"
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Pangasinán/Bulacan (Phillipinen HiRes)"
@@ -17165,9 +17389,6 @@ msgstr "Schwientochlowitz: Luftbild 2012"
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Hindenburg: Luftbild 2011"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Szlaki (Pfade)"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr "Breslau: Luftbild 2015"
@@ -17177,6 +17398,20 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Auto"
@@ -17198,12 +17433,30 @@ msgstr "RABA-KGZ: Slowenien - Ackernutzung"
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr "RABA-KGZ: Slowenien - bebaute Gebiete"
+msgid "City of Cape Town 2013 Aerial"
+msgstr "Stadt Kapstadt 2013 Luftbilder"
+
msgid "City of Cape Town 2015 Aerial"
msgstr "Stadt Kapstadt 2015 Luftbilder"
msgid "South Africa CD:NGI Aerial"
msgstr "South Africa CD:NGI Aerial (Luftbild)"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr "imagico.de OSM Bilder für die Kartierung: Leskov Island ASTER"
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr "imagico.de OSM Bilder für die Kartierung: Scott-Insel"
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr "imagico.de OSM Bilder für die Kartierung: Leskov Island Landsat"
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr "imagico.de OSM Bilder für die Kartierung: Clerke Rocks"
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr "imagico.de OSM Bilder für die Kartierung: Shag Rocks"
+
msgid "Catastro Spain"
msgstr "Catastro Spain"
@@ -17225,6 +17478,9 @@ msgstr "IDEIB - Balearische Inseln"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Kanarische Inseln"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Kanton Aargau 25cm (AGIS 2011)"
@@ -17267,6 +17523,9 @@ msgstr "Kanton Freiburg 50cm (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Stadt Bern 10cm/25cm (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr "Stadt Bern 10cm (2016)"
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -17288,6 +17547,12 @@ msgstr "Bonvillars Orthophoto 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Fiez Orthophoto 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr "Kanton Basel-Stadt 2015"
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr "Taiwan e-Map Open Data"
@@ -17303,6 +17568,9 @@ msgstr "Taiwan Parzellendaten"
msgid "NLSC Open Data WMTS"
msgstr "NLSC Open Data WMTS"
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "MSR Maps Topo"
@@ -17330,9 +17598,54 @@ msgstr "NC Neueste Luftbilder"
msgid "U.S. Forest Service roads"
msgstr "U.S. Waldwege"
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr "imagico.de OSM Bilder für die Kartierung: Alaskakette"
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr "NJ 2015 Luftbilder (Infrarot)"
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr "NJ 2015 Luftbilder (natürliche Farbe)"
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr "Metropolregion San Juan: 2013 USACE Orthofotos"
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr "WA 2013 Luftbilder für San Juan County"
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr "WA Vektor-Straßenkarte für San Juan County"
+
+msgid "Texas Orthophoto"
+msgstr "Texas Orthofoto"
+
+msgid "Philadelphia 2015 Imagery"
+msgstr "Philadelphia 2015 Bilder"
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr "Maryland 2014 6 Zoll Luftbild"
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr "Maryland 3 Zoll Luftbild"
+
+msgid "MD Transportation Basemap"
+msgstr "Maryland Transport-Basiskarte"
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr "imagico.de OSM Bilder für die Kartierung: Ruwenzori-Gebirge"
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ukraine - Orthophotomaps 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr "Ukraine - Kiew 2014 (DZK)"
@@ -17354,9 +17667,6 @@ msgstr "Surrey Air Survey"
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6 Zoll Schottland 1842-82"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr "NLS - OS 6 Zoll Grafschaftenserie 1888-1913"
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1. Serie 1937-61"
@@ -17366,9 +17676,6 @@ msgstr "NLS - OS 1 Zoll 7. Serie 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr "NLS - OS 25 Zoll (Schottland) 1892-1905"
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25k historic (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "OS 1:25k historic (OSM-Limited)"
@@ -17709,8 +18016,8 @@ msgstr "Lädt neue Daten herunter, während Sie verschieben/zoomen"
msgid "Create a grid of ways."
msgstr "Erzeugt ein Liniengitter."
-msgid "Customization of public transport stops."
-msgstr "Anpassung von Haltestellen öffentlicher Verkehrsmittel."
+msgid "Customization of public public transport stops."
+msgstr ""
msgid ""
"Creating and handling address nodes and buildings within Czech Republic."
@@ -17819,6 +18126,11 @@ msgstr "Einfaches Werkzeug zum Erfassen von Hausnummern."
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "XML-Bildgrenzen aus einem Multipolygon generieren"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+"Kacheln von Hintergrundbildebenen-Zwischenspeicher in Dateisystem "
+"exportieren."
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -20352,6 +20664,9 @@ msgstr "Bach"
msgid "River"
msgstr "Fluss"
+msgid "Lock"
+msgstr "Schleuse"
+
msgid "Canal"
msgstr "Kanal"
@@ -20441,7 +20756,7 @@ msgid "river"
msgstr "Fluss"
msgid "lock"
-msgstr "Sperre"
+msgstr "Schleuse"
msgid "wastewater"
msgstr "Abwasser"
@@ -21409,6 +21724,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr "Pension/Übernachtung mit Frühstück"
+msgid "Apartment"
+msgstr "Ferienwohnung"
+
+msgid "Number of apartments"
+msgstr "Anzahl an Ferienwohnungen"
+
msgid "Chalet"
msgstr "Ferienhaus"
@@ -21475,6 +21796,12 @@ msgstr "Sitzgelegenheiten im Freien"
msgid "Takeaway"
msgstr "Zum Mitnehmen"
+msgid "Delivery"
+msgstr "Lieferung"
+
+msgid "Mo-Su 12:00-22:00"
+msgstr "Mo-Su 12:00-22:00"
+
msgid "Fast Food"
msgstr "Imbiss (Fast Food)"
@@ -22419,31 +22746,19 @@ msgstr "Wildtierschutz"
msgid "Hunting Stand"
msgstr "Jagdanstand"
-msgid "Height"
-msgstr "Höhe"
-
-msgctxt "height"
-msgid "low"
-msgstr "niedrig"
-
-msgctxt "height"
-msgid "half"
-msgstr "halb"
-
-msgctxt "height"
-msgid "full"
-msgstr "voll"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr "Versteck"
-msgid "Lock"
-msgstr "Schloss"
+msgid "Lockable"
+msgstr "Verschließbar"
msgid "Water Point"
msgstr "Wasseranschluss"
+msgid "Animal watering place"
+msgstr "Tiertränke"
+
msgid "Compressed Air"
msgstr "Druckluft"
@@ -23035,6 +23350,10 @@ msgid "hut"
msgstr "Hütte"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr "Studentenwohnheim"
@@ -23802,15 +24121,15 @@ msgstr "Typ von Trafostation"
msgctxt "power"
msgid "transmission"
-msgstr "Übertragung"
+msgstr ">100 kV"
msgctxt "power"
msgid "distribution"
-msgstr "Verbreitung"
+msgstr "30-60kV"
msgctxt "power"
msgid "minor_distribution"
-msgstr "Trafostation"
+msgstr "3-30kV"
msgctxt "power"
msgid "converter"
@@ -24330,6 +24649,9 @@ msgstr "Fleischer"
msgid "Seafood"
msgstr "Fischhändler"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Feinkost"
@@ -25147,9 +25469,6 @@ msgstr "Baumreihe"
msgid "A line of trees."
msgstr "Eine Reihe von Bäumen."
-msgid "Wood"
-msgstr "Naturwald"
-
msgid "Woodland where timber production does not dominate use."
msgstr "Waldgebiet, bei dem die Holzproduktion nicht im Vordergrund steht."
@@ -26228,6 +26547,9 @@ msgstr "Unterschiedliche Anzahl an Spuren in den Schlüsseln {0} und {1}"
msgid "possibly missing {0} tag"
msgstr "möglicherweise fehlendes {0}-Merkmal"
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0} ist veraltet"
@@ -26338,6 +26660,12 @@ msgstr "fragwürdiger Schlüssel (endet mit einer Zahl)"
msgid "The key {0} has an uncommon value."
msgstr "Der Schlüssel {0} hat einen ungewöhnlichen Wert."
+msgid "misspelled value"
+msgstr "falsch geschriebener Wert"
+
+msgid "wrong value: {0}"
+msgstr "falscher Wert: {0}"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} auf einem Punkt. Sollte auf einer Linie verwendet werden."
@@ -26418,6 +26746,13 @@ msgstr "Küstenlinie innerhalb {1}"
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} sollte auf einem Punkt liegen, wo sich {1} und {2} schneiden"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+"{0} ist das Merkmal für einen linearen Wasserweg. Um die Wasserfläche zu "
+"erfassen stattdessen {1} + {2} benutzen."
+
msgid "abbreviated street name"
msgstr "Abgekürzter Straßenname"
@@ -26442,6 +26777,9 @@ msgstr "{0} zusammen mit {1}"
msgid "street name contains ss"
msgstr "Straßenname enthält ss"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -27260,6 +27598,22 @@ msgstr "Aktuellen Änderungssatz absenden"
msgid "Submit the current changeset to Mapillary"
msgstr "Aktuellen Änderungssatz zu Mapillary absenden"
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+"Hochladen des Änderungssatzes fehlgeschlagen mit {0} Fehler \"{1} {2}\"!"
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+"Bei der Übertragung eines Änderungssatzes ist ein Fehler aufgetreten. Falls "
+"dies wiederholt auftritt sollte der Fehler mittels Hilfe-Menu gemeldet "
+"werden. Wenn diese Nachricht zum ersten Mal erscheint, kann sie ignoriert "
+"werden. Es kann sich um ein Problem mit der Internetverbindung gehandelt "
+"haben."
+
msgid "Upload pictures"
msgstr "Bilder hochladen"
@@ -27302,8 +27656,8 @@ msgstr "Mapillary-Änderungssatzdialog öffnen"
msgid "Mapillary changeset"
msgstr "Mapillary-Änderungssatz"
-msgid "Submit"
-msgstr "Absenden"
+msgid "Submitting changeset to server…"
+msgstr "Änderungssatz wird an Server gesendet …"
msgid "Export all images"
msgstr "Alle Bilder exportieren"
@@ -28221,6 +28575,9 @@ msgstr "Eine Fläche (z.B. Gebäude) vom unterliegenden Bild auswählen."
msgid "Area Selector"
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"
@@ -28268,11 +28625,11 @@ msgid "Algorithm"
msgstr "Algorithmus"
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
-"Maximalanzahl von Pixeln, die ein Punkt von einer Linie entfernt sein darf, "
-"um noch als Teil der Linie angesehen zu werden (Standard: {0})."
+"Maximaler Abstand in Metern zwischen einem Punkt und der Linie, um noch als "
+"Teil der Linie angesehen zu werden (Standard: {0})."
msgid "Distance Tolerance"
msgstr "Entfernungstoleranz"
@@ -30017,6 +30374,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "XML-Bildmetadatei öffnen"
+msgid "Export tiles"
+msgstr "Kacheln exportieren"
+
+msgid "Export cached tiles to file system."
+msgstr "Zwischengespeicherte Kacheln ins Dateisystem exportieren."
+
+msgid "Exporting cached tiles"
+msgstr "Zwischengespeicherte Kacheln werden exportiert"
+
+msgid "Failed to write image file {0}: {1}"
+msgstr "Schreiben der Bilddatei {0} fehlgeschlagen: {1}"
+
+msgid "Failed to write image file {0}."
+msgstr "Schreiben der Bilddatei {0} fehlgeschlagen."
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] "{0} Kachel von Ebene {1} exportiert."
+msgstr[1] "{0} Kacheln von Ebene {1} exportiert."
+
+msgid "Export file system path already exists but is not a directory."
+msgstr "Export-Dateisystempfad existiert bereits, ist aber kein Verzeichnis."
+
+msgid "Failed to create export directory: {0}"
+msgstr "Exportverzeichnis konnte nicht angelegt werden: {0}"
+
+msgid "Failed to create export directory."
+msgstr "Exportverzeichnis konnte nicht angelegt werden."
+
+msgid "Append cache name"
+msgstr "Zwischenspeichernamen anhängen"
+
+msgid "Export Tiles"
+msgstr "Kacheln exportieren"
+
+msgid "Cache name:"
+msgstr "Zwischenspeichername:"
+
+msgid "Object count:"
+msgstr "Anzahl Objekte:"
+
+msgid "file system path"
+msgstr "Dateisystempfad"
+
+msgid "File system path the tiles are exported to."
+msgstr "Dateisystempfad in den die Kacheln exportiert werden."
+
+msgid "Export directory:"
+msgstr "Exportverzeichnis:"
+
+msgid "Append cache name to export directory."
+msgstr "Zwischenspeichernamen an Exportverzeichnis anhängen."
+
+msgid "Tiles will be exported to directory {0}"
+msgstr "Kacheln werden exportiert in Verzeichnis {0}"
+
+msgid "No export directory set."
+msgstr "Kein Exportverzeichnis gesetzt."
+
msgid "Calibration Layer"
msgstr "Kalibrierebene"
@@ -32345,9 +32761,6 @@ msgstr "ÖV: Route sollte mit einem Halteplatz beginnen und enden"
msgid "PT: First or last way needs to be split"
msgstr "ÖV: Erster oder letzter Weg muss aufgeteilt werden"
-msgid "PT: Problem in the route segment"
-msgstr "ÖV: Problem in dem Routenabschnitt"
-
msgid "PT: Stop not served"
msgstr "ÖV: Haltestelle nicht bedient"
@@ -32513,9 +32926,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr "[Lücke]"
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "Routenmuster …"
@@ -32573,6 +32983,9 @@ msgstr "linken Seite"
msgid "Maximum distance from route"
msgstr "Maximale Entfernung zur Route"
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "Öffentlicher Verkehr: Haltestellenart ändern"
@@ -32778,9 +33191,6 @@ msgstr "Polygon rekonstruieren"
msgid "Multipolygon must consist only of ways"
msgstr "Multipolygon darf nur aus Linien bestehen"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr "Rekonstruktion von Polygonen kann nur mit Außenlinien geschehen"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Polygone aus Relation {0} rekonstruieren"
diff --git a/i18n/po/de_DE.po b/i18n/po/de_DE.po
index 0bae744..c6a00cb 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:17+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:24+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr "Hilfe"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -206,6 +212,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr "Lufbild-Ebene {0} hinzufügen"
@@ -227,12 +239,6 @@ msgstr "Fehler"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr "Knotenpunkt hinzufügen..."
@@ -717,6 +723,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -738,9 +747,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -791,6 +797,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -940,17 +949,17 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
-msgstr "Separate Ebene"
+msgid "Open Location..."
+msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Auswählen, ob die Daten in eine neue Ebene geladen werden sollen"
+msgid "Open an URL."
+msgstr ""
msgid "Enter URL to download:"
msgstr ""
@@ -958,6 +967,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr "Separate Ebene"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Auswählen, ob die Daten in eine neue Ebene geladen werden sollen"
+
msgid "Download Location"
msgstr ""
@@ -973,12 +988,6 @@ msgstr "Fenster schließen und Herunterladen abbrechen"
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1771,9 +1780,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3959,9 +3965,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3991,12 +3994,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4689,12 +4707,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4711,8 +4735,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5033,9 +5057,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5174,82 +5195,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5415,6 +5360,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5474,7 +5495,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6866,212 +6887,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8177,6 +8198,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9663,6 +9687,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9675,9 +9702,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9774,14 +9798,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9794,6 +9810,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10782,6 +10801,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10794,6 +10816,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10806,6 +10840,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10865,6 +10902,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10883,9 +10925,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12080,6 +12129,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13115,6 +13170,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13136,12 +13197,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14101,6 +14156,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14592,13 +14650,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14622,7 +14683,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14673,7 +14737,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14682,10 +14746,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14721,6 +14797,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14766,10 +14848,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14802,34 +14890,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14868,6 +14996,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14901,9 +15035,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14960,9 +15091,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14990,9 +15118,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15026,9 +15151,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15065,19 +15235,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15140,9 +15319,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15176,12 +15367,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15308,9 +15521,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15320,6 +15530,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15341,12 +15565,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15368,6 +15610,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15410,6 +15655,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15431,6 +15679,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15446,6 +15700,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15473,9 +15730,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15497,9 +15799,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15509,9 +15808,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15823,7 +16119,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15911,6 +16207,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18307,6 +18606,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19355,6 +19657,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19421,6 +19729,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20364,31 +20678,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20980,6 +21282,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22273,6 +22579,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23086,9 +23395,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24133,6 +24439,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24224,6 +24533,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24300,6 +24615,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24324,6 +24644,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25097,6 +25420,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25139,7 +25472,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25942,6 +26275,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25983,8 +26319,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27586,6 +27922,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29747,9 +30142,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29907,9 +30299,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29967,6 +30356,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30164,9 +30556,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/el.po b/i18n/po/el.po
index 68be6cc..989f5db 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:47+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:51+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: el\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -65,9 +65,15 @@ msgstr "Δημιουργία κύριου μενού"
msgid "Help"
msgstr "Βοήθεια"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Αρχικοποίηση OSM API"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Αρχικοποίηση Επικυρωτή"
@@ -205,6 +211,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr "Επιλέξτε επίπεδα WMS"
+
+msgid "Add layers"
+msgstr "Προσθήκη επιπέδων WMS"
+
msgid "Add imagery layer {0}"
msgstr "Προσθήκη επιπέδου υπόβαθρου εικόνων {0}"
@@ -226,12 +238,6 @@ msgstr "Σφάλμα"
msgid "Select image format for WMS layer"
msgstr "Επιλέξτε μορφή εικόνας για το επίπεδο WMS"
-msgid "Select WMS layers"
-msgstr "Επιλέξτε επίπεδα WMS"
-
-msgid "Add layers"
-msgstr "Προσθήκη επιπέδων WMS"
-
msgid "Add Node..."
msgstr "Προσθήκη Κόμβου..."
@@ -754,6 +760,9 @@ msgstr "Άλμα Σε Θέση"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Ανοίγει ένα διάλογο που επιτρέπει το άλμα σε συγκεκριμένη θέση"
+msgid "Jump to Position"
+msgstr "Άλμα σε Θέση"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Εισάγετε Γ.Πλάτος/Γ.Μήκος για μεταφορά στη τοποθεσία."
@@ -775,9 +784,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Άλμα εκεί"
-msgid "Jump to Position"
-msgstr "Άλμα σε Θέση"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Δεν μπορεί να αναλυθεί γ. πλάτος, γ. μήκος ή εστίαση, παρακαλώ ελέγξτε."
@@ -833,6 +839,9 @@ msgstr "Συγχώνευση επιπέδου"
msgid "Merge the current layer into another layer"
msgstr "Συγχώνευση τρέχοντος επιπέδου σε άλλο επίπεδο"
+msgid "{0} completed in {1}"
+msgstr "{0} ολοκληρώθηκε σε {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Συγχώνευση επιπέδων με διαφορετικούς κανόνες αποστολής"
@@ -1007,24 +1016,30 @@ msgstr[1] "Άνοιγμα {0} αρχείων..."
msgid "Opening file ''{0}'' ..."
msgstr "Άνοιγμα αρχείου ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Εντάξει"
+
msgid "Open Location..."
msgstr "Άνοιγμα Τοποθεσίας..."
msgid "Open an URL."
msgstr "Άνοιγμα URL"
-msgid "Separate Layer"
-msgstr "Ξεχωριστό Επίπεδο"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Επιλέξτε αν τα δεδομένα πρέπει να ληφθούν σε νέο επίπεδο"
-
msgid "Enter URL to download:"
msgstr "Εισάγετε URL προς λήψη:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Εισάγετε ένα URL από όπου θα πρέπει να ληφθούν τα δεδομένα"
+msgid "Separate Layer"
+msgstr "Ξεχωριστό Επίπεδο"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Επιλέξτε αν τα δεδομένα πρέπει να ληφθούν σε νέο επίπεδο"
+
msgid "Download Location"
msgstr "Προορισμός Λήψης"
@@ -1040,12 +1055,6 @@ msgstr "Κλείσιμο διαλόγου και ακύρωση λήψης"
msgid "Download Data"
msgstr "Λήψη δεδομένων"
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr "Εντάξει"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1890,9 +1899,6 @@ msgstr ""
msgid "Errors during download"
msgstr "Σφάλματα κατα τη διάρκεια της λήψης"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -4136,9 +4142,6 @@ msgstr "Διαδρομή τύπου περιοχής δεν είναι κλει
msgid "No outer way for multipolygon"
msgstr "Πολύ-πολύγωνο χωρίς εξωτερική διαδρομή"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -4168,12 +4171,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr "Το πολύ-πολύγωνο δεν είναι κλειστό"
-msgid "Multipolygon inner way is outside"
-msgstr "Η εσωτερική διαδρομή του πολύ-πολυγώνου είναι εκτός"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "Διασταύρωση μεταξύ διαδρομών του πολύ-πολυγώνου"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr "Η εσωτερική διαδρομή του πολύ-πολυγώνου είναι εκτός"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "Μη χρήσιμος ρόλος για μέλος πολύ-πολυγώνου"
@@ -4884,12 +4902,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4906,8 +4930,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5236,9 +5260,6 @@ msgstr ""
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} ολοκληρώθηκε σε {1}"
-
msgid "Enlarge"
msgstr ""
@@ -5379,82 +5400,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr "Δικό μου με Δικό τους"
-
-msgid "My with Merged"
-msgstr "Δική μου με συγχωνευμένη"
-
-msgid "Their with Merged"
-msgstr "Δική τους με συγχωνευμένη"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "Ο ρόλος {0} δεν παίρνει μέρος στο ζεύγος σύγκρισης {1}."
-
-msgid "Properties"
-msgstr "Ιδιότητες"
-
-msgid "Tags"
-msgstr "Ετικέτες"
-
-msgid "Nodes"
-msgstr "Κόμβοι"
-
-msgid "Members"
-msgstr "Μέλη"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Ετικέτες( {0} διένεξη)"
-msgstr[1] "Ετικέτες( {0} διενέξεις)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr "Κόμβοι(επιλυμένοι)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr "Κόμβοι(με διενέξεις)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr "Μέλη(επιλυμένα)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr "Μέλη(με διενέξεις)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr "Δεν υπάρχουν διενέξεις ιδιοτήτων σε αναμονή"
-
-msgid "Properties(with conflicts)"
-msgstr "Ιδιότητες(με διενέξεις)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Διενέξεις ιδιοτήτων σε αναμονή προς επίλυση"
-
-msgid "Conflict Resolution"
-msgstr "Επίλυση σύγκρουσης"
-
msgid "{0} more..."
msgstr "{0} περισσότερα..."
@@ -5623,6 +5568,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr "Δικό μου με Δικό τους"
+
+msgid "My with Merged"
+msgstr "Δική μου με συγχωνευμένη"
+
+msgid "Their with Merged"
+msgstr "Δική τους με συγχωνευμένη"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "Ο ρόλος {0} δεν παίρνει μέρος στο ζεύγος σύγκρισης {1}."
+
+msgid "Properties"
+msgstr "Ιδιότητες"
+
+msgid "Tags"
+msgstr "Ετικέτες"
+
+msgid "Nodes"
+msgstr "Κόμβοι"
+
+msgid "Members"
+msgstr "Μέλη"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Ετικέτες( {0} διένεξη)"
+msgstr[1] "Ετικέτες( {0} διενέξεις)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr "Κόμβοι(επιλυμένοι)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr "Κόμβοι(με διενέξεις)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr "Μέλη(επιλυμένα)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr "Μέλη(με διενέξεις)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr "Δεν υπάρχουν διενέξεις ιδιοτήτων σε αναμονή"
+
+msgid "Properties(with conflicts)"
+msgstr "Ιδιότητες(με διενέξεις)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Διενέξεις ιδιοτήτων σε αναμονή προς επίλυση"
+
+msgid "Conflict Resolution"
+msgstr "Επίλυση σύγκρουσης"
+
msgid "Node"
msgstr "Κόμβος"
@@ -5682,7 +5703,7 @@ msgstr "Ρόλος"
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -7085,117 +7106,27 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr "Ενημέρωση περιεχομένου ομάδας αλλαγών από τον διακομιστή OSM"
-msgid "Changeset ID: "
-msgstr "Αναγνωριστικό ομάδας Αλλαγών: "
-
-msgid "Enter a changeset id"
-msgstr "Εισαγωγή αναγνωριστικού ομάδας αλλαγών"
-
-msgid ""
-"Download the changeset with the specified id, including the changeset content"
-msgstr ""
-
-msgid "Select changesets owned by specific users"
-msgstr "Επιλογή ομάδων αλλαγών που ανήκουν σε συγκεκριμένους χρήστες"
-
-msgid "Select changesets depending on whether they are open or closed"
-msgstr ""
-
-msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr ""
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr ""
-
-msgid "Query open changesets only"
-msgstr ""
-
-msgid "Query closed changesets only"
-msgstr ""
-
-msgid "Query both open and closed changesets"
-msgstr ""
-
-msgid "Only changesets owned by myself"
-msgstr "Μόνο ομάδες αλλαγών που ανήκουν σε εμένα"
-
-msgid "User ID:"
-msgstr "Αναγνωριστικό χρήστη:"
-
-msgid "User name:"
-msgstr "Όνομα χρήστη:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
-"Μόνο ομάδες αλλαγών που ανήκουν στον χρήστη με το παρακάτω αναγνωριστικό"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-"Μόνο ομάδες αλλαγών που ανήκουν στον χρήστη με το παρακάτω όνομα χρήστη"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Μόνο ομάδες αλλαγών που ανήκουν σε εμένα (ανενεργό. ο JOSM είναι σε χρήση "
-"από ανώνυμο χρήστη)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr ""
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-
-msgid "Please enter a valid user ID"
-msgstr ""
-
-msgid "Invalid user ID"
-msgstr "Μη έγκυρο αναγνωριστικό χρήστη"
-
-msgid "Please enter a non-empty user name"
-msgstr ""
-
-msgid "Invalid user name"
-msgstr "Μη έγκυρο όνομα χρήστη"
-
-msgid "Date: "
-msgstr "Ημ/νία: "
-
-msgid "Time:"
-msgstr "Ώρα:"
-
-msgid "Closed after - "
-msgstr ""
-
-msgid "Date:"
-msgstr "Ημ/νία:"
+msgid "Changeset ID: "
+msgstr "Αναγνωριστικό ομάδας Αλλαγών: "
-msgid "Created before - "
-msgstr ""
+msgid "Enter a changeset id"
+msgstr "Εισαγωγή αναγνωριστικού ομάδας αλλαγών"
-msgid "Only changesets closed after the following date/time"
+msgid ""
+"Download the changeset with the specified id, including the changeset content"
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
+msgid "Select changesets owned by specific users"
+msgstr "Επιλογή ομάδων αλλαγών που ανήκουν σε συγκεκριμένους χρήστες"
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Select changesets depending on whether they are open or closed"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Select changesets based on the date/time they have been created or closed"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Select only changesets related to a specific bounding box"
msgstr ""
msgid ""
@@ -7211,23 +7142,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Μη έγκυρο πλαίσιο οριοθέτησης"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-
-msgid "Please enter an integer value > 0"
-msgstr ""
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-
msgid "Download my changesets only"
msgstr "Λήψη μόνο των δικών μου ομάδων αλλαγών"
@@ -7303,6 +7217,66 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid "Query open changesets only"
+msgstr ""
+
+msgid "Query closed changesets only"
+msgstr ""
+
+msgid "Query both open and closed changesets"
+msgstr ""
+
+msgid "Date: "
+msgstr "Ημ/νία: "
+
+msgid "Time:"
+msgstr "Ώρα:"
+
+msgid "Closed after - "
+msgstr ""
+
+msgid "Date:"
+msgstr "Ημ/νία:"
+
+msgid "Created before - "
+msgstr ""
+
+msgid "Only changesets closed after the following date/time"
+msgstr ""
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+
+msgid "Invalid date/time values"
+msgstr ""
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+
+msgid "Please enter an integer value > 0"
+msgstr ""
+
msgid "URL: "
msgstr "URL: "
@@ -7320,6 +7294,53 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Only changesets owned by myself"
+msgstr "Μόνο ομάδες αλλαγών που ανήκουν σε εμένα"
+
+msgid "User ID:"
+msgstr "Αναγνωριστικό χρήστη:"
+
+msgid "User name:"
+msgstr "Όνομα χρήστη:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr ""
+"Μόνο ομάδες αλλαγών που ανήκουν στον χρήστη με το παρακάτω αναγνωριστικό"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+"Μόνο ομάδες αλλαγών που ανήκουν στον χρήστη με το παρακάτω όνομα χρήστη"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Μόνο ομάδες αλλαγών που ανήκουν σε εμένα (ανενεργό. ο JOSM είναι σε χρήση "
+"από ανώνυμο χρήστη)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr ""
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+
+msgid "Please enter a valid user ID"
+msgstr ""
+
+msgid "Invalid user ID"
+msgstr "Μη έγκυρο αναγνωριστικό χρήστη"
+
+msgid "Please enter a non-empty user name"
+msgstr ""
+
+msgid "Invalid user name"
+msgstr "Μη έγκυρο όνομα χρήστη"
+
msgid "Activate"
msgstr "Ενεργοποίηση"
@@ -8437,6 +8458,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9973,6 +9997,9 @@ msgstr "Κατεύθυνση"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "Αρχεία Κυματομορφής (*.wav)"
+
msgid "Import Audio"
msgstr "Εισαγωγή Ήχου"
@@ -9985,9 +10012,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr "Αρχεία Κυματομορφής (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Σημάδια ήχου από {0}"
@@ -10089,14 +10113,6 @@ msgstr "Το URL ήταν: "
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -10109,6 +10125,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -11104,6 +11123,9 @@ msgstr ""
msgid "Track date"
msgstr "Ημερομηνία ίχνους"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Ένα Χρώμα (can be customized for named layers)"
@@ -11116,6 +11138,18 @@ msgstr "Ποδήλατο"
msgid "Foot"
msgstr "Πεζοί"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Άλσος"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -11128,6 +11162,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11189,6 +11226,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11210,9 +11252,16 @@ msgid "Colors points and track segments by its timestamp."
msgstr ""
"Χρωματισμός σημείων και τμημάτων ιχνών ανάλογα με το χρόνο καταγραφής."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Χρωματισμός Ιχνών και Σημείων"
@@ -12428,6 +12477,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13470,6 +13525,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Αποθήκευση χρήστη και κωδικού (χωρίς κρυπτογράφηση)"
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13491,12 +13552,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14482,6 +14537,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14973,14 +15031,17 @@ msgstr "Δορυφόρος MapBox"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik Μαύρο & Άσπρο)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, χωρίς ετικέτες)"
@@ -15003,8 +15064,11 @@ msgstr "Ορειβασία & ποδήλατο"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Καμπότζη, Λάος, Ταϊλάνδη, δίγλωσσο Βιετνάμ"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "Χάρτης OpenPT (επικάλυψη)"
@@ -15054,7 +15118,7 @@ msgstr "Επιθεωρητής OSM: Τοποθεσίες"
msgid "OSM Inspector: Highways"
msgstr "Επιθεωρητής OSM: Αυτοκινητόδρομοι"
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -15063,10 +15127,22 @@ msgstr "Επιθεωρητής OSM: Δρομολόγηση"
msgid "OSM Inspector: Addresses"
msgstr "Επιθεωρητής OSM: Διευθύνσεις"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "Επιθεωρητής OSM: Σύνορα (ΕΕ)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -15102,6 +15178,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -15147,10 +15229,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -15183,34 +15271,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -15249,6 +15377,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -15282,9 +15416,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -15341,9 +15472,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15371,9 +15499,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15407,9 +15532,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15446,19 +15616,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15521,9 +15700,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15557,12 +15748,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15689,9 +15902,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15701,6 +15911,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15722,12 +15946,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15749,6 +15991,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15791,6 +16036,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15812,6 +16060,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15827,6 +16081,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15854,9 +16111,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15878,9 +16180,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15890,9 +16189,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -16204,7 +16500,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -16292,6 +16588,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18691,6 +18990,9 @@ msgstr "Υδατόρρευμα"
msgid "River"
msgstr "Ποταμός"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Κανάλι"
@@ -19739,6 +20041,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Σαλέ"
@@ -19805,6 +20113,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast Food"
@@ -20748,31 +21062,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr "Ύψος"
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
-msgstr "Κλειδαριά"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -21364,6 +21666,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22657,6 +22963,9 @@ msgstr "Κρεοπωλείο"
msgid "Seafood"
msgstr "Ιχθυοπωλείο"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Ντελικατέσεν (εκλεκτά προϊόντα)"
@@ -23470,9 +23779,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr "Άλσος"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24517,6 +24823,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0} είναι παρωχημένο"
@@ -24608,6 +24917,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24684,6 +24999,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24708,6 +25028,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25483,6 +25806,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25525,7 +25858,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -26330,6 +26663,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26371,8 +26707,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27981,6 +28317,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -30158,9 +30553,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -30320,9 +30712,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -30380,6 +30769,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30577,9 +30969,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr "Το πολύ-πολύγωνο πρέπει να αποτελείται μόνο από διαδρομές"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/en_AU.po b/i18n/po/en_AU.po
index 5268155..4596bb0 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:16+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:22+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr "Building main menu"
msgid "Help"
msgstr "Help"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Initialising OSM API"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Initialising validator"
@@ -208,6 +214,12 @@ msgid ""
msgstr ""
"Set the selected elements on the map to the selected items in the list above."
+msgid "Select WMS layers"
+msgstr "Select WMS layers"
+
+msgid "Add layers"
+msgstr "Add layers"
+
msgid "Add imagery layer {0}"
msgstr "Add imagery layer {0}"
@@ -229,12 +241,6 @@ msgstr "Error"
msgid "Select image format for WMS layer"
msgstr "Select image format for WMS layer"
-msgid "Select WMS layers"
-msgstr "Select WMS layers"
-
-msgid "Add layers"
-msgstr "Add layers"
-
msgid "Add Node..."
msgstr "Add Node..."
@@ -745,6 +751,9 @@ msgstr "Jump To Position"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Opens a dialogue that allows to jump to a specific location"
+msgid "Jump to Position"
+msgstr "Jump to Position"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Enter Lat/Lon to jump to position."
@@ -766,9 +775,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Jump there"
-msgid "Jump to Position"
-msgstr "Jump to Position"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr "Could not parse Latitude, Longitude or Zoom. Please check."
@@ -821,6 +827,9 @@ msgstr "Merge layer"
msgid "Merge the current layer into another layer"
msgstr "Merge the current layer into another layer"
+msgid "{0} completed in {1}"
+msgstr "{0} completed in {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Merging layers with different upload policies"
@@ -988,24 +997,30 @@ msgstr[1] "Opening {0} files..."
msgid "Opening file ''{0}'' ..."
msgstr "Opening file ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr "Which tasks to perform?"
+
+msgid "Ok"
+msgstr "OK"
+
msgid "Open Location..."
msgstr "Open Location..."
msgid "Open an URL."
msgstr "Open an URL."
-msgid "Separate Layer"
-msgstr "Separate Layer"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Select if the data should be downloaded into a new layer"
-
msgid "Enter URL to download:"
msgstr "Enter URL to download:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Enter an URL from where data should be downloaded"
+msgid "Separate Layer"
+msgstr "Separate Layer"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Select if the data should be downloaded into a new layer"
+
msgid "Download Location"
msgstr "Download Location"
@@ -1021,12 +1036,6 @@ msgstr "Close dialogue and cancel downloading"
msgid "Download Data"
msgstr "Download Data"
-msgid "Which tasks to perform?"
-msgstr "Which tasks to perform?"
-
-msgid "Ok"
-msgstr "OK"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1879,9 +1888,6 @@ msgstr "Query and download changesets ..."
msgid "Errors during download"
msgstr "Errors during download"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr "Download GPS"
@@ -4213,9 +4219,6 @@ msgstr "Area style way is not closed"
msgid "No outer way for multipolygon"
msgstr "No outer way for multipolygon"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "Role for ''{0}'' should be ''{1}''"
-
msgid "No area style for multipolygon"
msgstr "No area style for multipolygon"
@@ -4249,12 +4252,27 @@ msgstr "Area style on outer way"
msgid "Multipolygon is not closed"
msgstr "Multipolygon is not closed"
-msgid "Multipolygon inner way is outside"
-msgstr "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "Intersection between multipolygon ways"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "Role for ''{0}'' should be ''{1}''"
+
+msgid "Multipolygon inner way is outside"
+msgstr "Multipolygon inner way is outside"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "No useful role for multipolygon member"
@@ -4961,12 +4979,18 @@ msgstr "Disable access to the given resource(s), separated by comma"
msgid "options provided as Java system properties"
msgstr "options provided as Java system properties"
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/PATH/TO/JOSM/PREF "
msgid "Set the preferences directory"
msgstr "Set the preferences directory"
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/PATH/TO/JOSM/USERDATA"
@@ -4983,11 +5007,9 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/PATH/TO/JOSM/HOMEDIR "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5332,9 +5354,6 @@ msgstr "Click to run job in background"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} completed in {1}"
-
msgid "Enlarge"
msgstr "Enlarge"
@@ -5475,85 +5494,6 @@ msgstr "Conflict background: remove member"
msgid "Conflict foreground: remove member"
msgstr "Conflict foreground: remove member"
-msgid "My with Their"
-msgstr "My with Their"
-
-msgid "My with Merged"
-msgstr "My with Merged"
-
-msgid "Their with Merged"
-msgstr "Their with Merged"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "role {0} is not participating in compare pair {1}"
-
-msgid "Properties"
-msgstr "Properties"
-
-msgid "Tags"
-msgstr "Tags"
-
-msgid "Nodes"
-msgstr "Nodes"
-
-msgid "Members"
-msgstr "Members"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "No pending tag conflicts to be resolved"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Tags({0} conflict)"
-msgstr[1] "Tags({0} conflicts)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} pending tag conflict to be resolved"
-msgstr[1] "{0} pending tag conflicts to be resolved"
-
-msgid "Nodes(resolved)"
-msgstr "Nodes(resolved)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-
-msgid "Nodes(with conflicts)"
-msgstr "Nodes(with conflicts)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Pending conflicts in the node list of this way"
-
-msgid "Members(resolved)"
-msgstr "Members(resolved)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-
-msgid "Members(with conflicts)"
-msgstr "Members(with conflicts)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Pending conflicts in the member list of this relation"
-
-msgid "No pending property conflicts"
-msgstr "No pending property conflicts"
-
-msgid "Properties(with conflicts)"
-msgstr "Properties(with conflicts)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Pending property conflicts to be resolved"
-
-msgid "Conflict Resolution"
-msgstr "Conflict Resolution"
-
msgid "{0} more..."
msgstr "{0} more..."
@@ -5736,6 +5676,85 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Their version ({0} entry)"
msgstr[1] "Their version ({0} entries)"
+msgid "My with Their"
+msgstr "My with Their"
+
+msgid "My with Merged"
+msgstr "My with Merged"
+
+msgid "Their with Merged"
+msgstr "Their with Merged"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "role {0} is not participating in compare pair {1}"
+
+msgid "Properties"
+msgstr "Properties"
+
+msgid "Tags"
+msgstr "Tags"
+
+msgid "Nodes"
+msgstr "Nodes"
+
+msgid "Members"
+msgstr "Members"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "No pending tag conflicts to be resolved"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Tags({0} conflict)"
+msgstr[1] "Tags({0} conflicts)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} pending tag conflict to be resolved"
+msgstr[1] "{0} pending tag conflicts to be resolved"
+
+msgid "Nodes(resolved)"
+msgstr "Nodes(resolved)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+
+msgid "Nodes(with conflicts)"
+msgstr "Nodes(with conflicts)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Pending conflicts in the node list of this way"
+
+msgid "Members(resolved)"
+msgstr "Members(resolved)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+
+msgid "Members(with conflicts)"
+msgstr "Members(with conflicts)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Pending conflicts in the member list of this relation"
+
+msgid "No pending property conflicts"
+msgstr "No pending property conflicts"
+
+msgid "Properties(with conflicts)"
+msgstr "Properties(with conflicts)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Pending property conflicts to be resolved"
+
+msgid "Conflict Resolution"
+msgstr "Conflict Resolution"
+
msgid "Node"
msgstr "Node"
@@ -5797,8 +5816,8 @@ msgstr "Role"
msgid "Primitive"
msgstr "Primitive"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
-msgstr "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
+msgstr ""
msgid "<undefined>"
msgstr "<undefined>"
@@ -7262,109 +7281,15 @@ msgid "Select changesets owned by specific users"
msgstr "Select changesets owned by specific users"
msgid "Select changesets depending on whether they are open or closed"
-msgstr "Select changesets depending on whether they are open or closed"
-
-msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr ""
-"Select changesets based on the date/time they have been created or closed"
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr "Select only changesets related to a specific bounding box"
-
-msgid "Query open changesets only"
-msgstr "Query open changesets only"
-
-msgid "Query closed changesets only"
-msgstr "Query closed changesets only"
-
-msgid "Query both open and closed changesets"
-msgstr "Query both open and closed changesets"
-
-msgid "Only changesets owned by myself"
-msgstr "Only changesets owned by myself"
-
-msgid "User ID:"
-msgstr "User ID:"
-
-msgid "User name:"
-msgstr "User name:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Only changesets owned by the user with the following user ID"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "Only changesets owned by the user with the following user name"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "Current value ''{0}'' for user ID is not valid"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr "Cannot restrict the changeset query to the user name ''{0}''"
-
-msgid "Please enter a valid user ID"
-msgstr "Please enter a valid user ID"
-
-msgid "Invalid user ID"
-msgstr "Invalid user ID"
-
-msgid "Please enter a non-empty user name"
-msgstr "Please enter a non-empty user name"
-
-msgid "Invalid user name"
-msgstr "Invalid user name"
-
-msgid "Date: "
-msgstr "Date: "
-
-msgid "Time:"
-msgstr "Time:"
-
-msgid "Closed after - "
-msgstr "Closed after - "
-
-msgid "Date:"
-msgstr "Date:"
-
-msgid "Created before - "
-msgstr "Created before - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Only changesets closed after the following date/time"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr "Only changesets closed after and created before a specific date/time"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgstr "Select changesets depending on whether they are open or closed"
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Select changesets based on the date/time they have been created or closed"
msgstr ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Select changesets based on the date/time they have been created or closed"
-msgid "Invalid date/time values"
-msgstr "Invalid date/time values"
+msgid "Select only changesets related to a specific bounding box"
+msgstr "Select only changesets related to a specific bounding box"
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
@@ -7383,28 +7308,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Invalid bounding box"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-
-msgid "Please enter an integer value > 0"
-msgstr "Please enter an integer value > 0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Download my changesets only"
@@ -7492,6 +7395,75 @@ msgstr "Illegal changeset query URL"
msgid "Close the dialog and abort querying of changesets"
msgstr "Close the dialogue and abort querying of changesets"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Query open changesets only"
+
+msgid "Query closed changesets only"
+msgstr "Query closed changesets only"
+
+msgid "Query both open and closed changesets"
+msgstr "Query both open and closed changesets"
+
+msgid "Date: "
+msgstr "Date: "
+
+msgid "Time:"
+msgstr "Time:"
+
+msgid "Closed after - "
+msgstr "Closed after - "
+
+msgid "Date:"
+msgstr "Date:"
+
+msgid "Created before - "
+msgstr "Created before - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Only changesets closed after the following date/time"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr "Only changesets closed after and created before a specific date/time"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Invalid date/time values"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+
+msgid "Please enter an integer value > 0"
+msgstr "Please enter an integer value > 0"
+
msgid "URL: "
msgstr "URL: "
@@ -7512,6 +7484,53 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "This changeset query URL is invalid"
+msgid "Only changesets owned by myself"
+msgstr "Only changesets owned by myself"
+
+msgid "User ID:"
+msgstr "User ID:"
+
+msgid "User name:"
+msgstr "User name:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Only changesets owned by the user with the following user ID"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "Only changesets owned by the user with the following user name"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "Current value ''{0}'' for user ID is not valid"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr "Cannot restrict the changeset query to the user name ''{0}''"
+
+msgid "Please enter a valid user ID"
+msgstr "Please enter a valid user ID"
+
+msgid "Invalid user ID"
+msgstr "Invalid user ID"
+
+msgid "Please enter a non-empty user name"
+msgstr "Please enter a non-empty user name"
+
+msgid "Invalid user name"
+msgstr "Invalid user name"
+
msgid "Activate"
msgstr "Activate"
@@ -8681,6 +8700,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10314,6 +10336,9 @@ msgstr "Direction"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audio files (*.wav)"
+
msgid "Import Audio"
msgstr "Import Audio"
@@ -10329,9 +10354,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Import not possible"
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audio files (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Audio markers from {0}"
@@ -10442,14 +10464,6 @@ msgstr "(URL was: "
msgid "Select the map painting styles"
msgstr "Select the map painting styles"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr "loading style ''{0}''..."
@@ -10466,6 +10480,9 @@ msgstr[1] ""
"There were {0} errors when loading this style. Select ''Info'' from the "
"right click menu for details."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
@@ -11546,6 +11563,9 @@ msgstr "Dilution of Position (red = high, green = low, if available)"
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Single Colour (can be customised for named layers)"
@@ -11558,6 +11578,18 @@ msgstr "Bicycle"
msgid "Foot"
msgstr "Foot"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Wood"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -11570,6 +11602,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11638,6 +11673,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11660,9 +11700,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr "Allows to tune the track colouring for different average speeds."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Track and Point Colouring"
@@ -12892,6 +12939,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13972,6 +14025,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Save user and password (unencrypted)"
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13993,12 +14052,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -15026,6 +15079,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -15526,13 +15582,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -15556,7 +15615,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -15607,7 +15669,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -15616,10 +15678,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -15655,6 +15729,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -15700,10 +15780,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -15736,34 +15822,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -15802,6 +15928,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -15835,9 +15967,6 @@ msgstr "Cadastre"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -15894,9 +16023,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15924,9 +16050,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15960,9 +16083,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15999,19 +16167,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -16074,9 +16251,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -16110,12 +16299,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -16242,9 +16453,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -16254,6 +16462,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -16275,12 +16497,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -16302,6 +16542,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -16344,6 +16587,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -16365,6 +16611,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -16380,6 +16632,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -16407,9 +16662,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -16431,9 +16731,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -16443,9 +16740,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -16759,7 +17053,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr "Create a grid of ways."
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -16853,6 +17147,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -19271,6 +19568,9 @@ msgstr "Stream"
msgid "River"
msgstr "River"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Canal"
@@ -20319,6 +20619,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Chalet"
@@ -20385,6 +20691,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast Food"
@@ -21328,31 +21640,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr "Hunting Stand"
-msgid "Height"
-msgstr "Height"
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
-msgstr "Lock"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -21944,6 +22244,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -23237,6 +23541,9 @@ msgstr "Butcher"
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -24050,9 +24357,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr "Wood"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -25097,6 +25401,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -25188,6 +25495,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -25264,6 +25577,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -25288,6 +25606,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -26065,6 +26386,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -26107,7 +26438,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -26911,6 +27242,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26952,8 +27286,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -28601,6 +28935,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -30778,9 +31171,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -30938,9 +31328,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr "Route patterns ..."
@@ -30998,6 +31385,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -31195,9 +31585,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/en_CA.po b/i18n/po/en_CA.po
index b27320f..5e14235 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:18+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:24+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr "Help"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -203,6 +209,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -224,12 +236,6 @@ msgstr ""
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr "Add Node..."
@@ -714,6 +720,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -735,9 +744,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -788,6 +794,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -937,17 +946,17 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
-msgstr "Separate Layer"
+msgid "Open Location..."
+msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
+msgstr ""
msgid "Enter URL to download:"
msgstr ""
@@ -955,6 +964,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr "Separate Layer"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Select if the data should be downloaded into a new layer"
+
msgid "Download Location"
msgstr ""
@@ -970,12 +985,6 @@ msgstr "Close dialog and cancel downloading"
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1768,9 +1777,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3956,9 +3962,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3988,12 +3991,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4686,12 +4704,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4708,8 +4732,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5030,9 +5054,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5171,82 +5192,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5412,6 +5357,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5471,7 +5492,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6863,212 +6884,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8174,6 +8195,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9660,6 +9684,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9672,9 +9699,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9771,14 +9795,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9791,6 +9807,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10779,6 +10798,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10791,6 +10813,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10803,6 +10837,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10862,6 +10899,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10880,9 +10922,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12077,6 +12126,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13112,6 +13167,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13133,12 +13194,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14098,6 +14153,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14586,13 +14644,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14616,7 +14677,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14667,7 +14731,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14676,10 +14740,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14715,6 +14791,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14760,10 +14842,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14796,34 +14884,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14862,6 +14990,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14895,9 +15029,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14954,9 +15085,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14984,9 +15112,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15020,9 +15145,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15059,19 +15229,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15134,9 +15313,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15170,12 +15361,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15302,9 +15515,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15314,6 +15524,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15335,12 +15559,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15362,6 +15604,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15404,6 +15649,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15425,6 +15673,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15440,6 +15694,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15467,9 +15724,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15491,9 +15793,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15503,9 +15802,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15817,7 +16113,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15905,6 +16201,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18301,6 +18600,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19349,6 +19651,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19415,6 +19723,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20358,31 +20672,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20974,6 +21276,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22267,6 +22573,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23080,9 +23389,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24127,6 +24433,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24218,6 +24527,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24294,6 +24609,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24318,6 +24638,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25091,6 +25414,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25133,7 +25466,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25936,6 +26269,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25977,8 +26313,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27576,6 +27912,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29737,9 +30132,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29897,9 +30289,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29957,6 +30346,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30154,9 +30546,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/en_GB.po b/i18n/po/en_GB.po
index 6c69efe..874bb76 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:15+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:21+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: de\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -67,9 +67,15 @@ msgstr "Building main menu"
msgid "Help"
msgstr "Help"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Initialising OSM API"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Initialising validator"
@@ -211,6 +217,12 @@ msgid ""
msgstr ""
"Set the selected elements on the map to the selected items in the list above."
+msgid "Select WMS layers"
+msgstr "Select WMS layers"
+
+msgid "Add layers"
+msgstr "Add layers"
+
msgid "Add imagery layer {0}"
msgstr "Add imagery layer {0}"
@@ -232,12 +244,6 @@ msgstr "Error"
msgid "Select image format for WMS layer"
msgstr "Select image format for WMS layer"
-msgid "Select WMS layers"
-msgstr "Select WMS layers"
-
-msgid "Add layers"
-msgstr "Add layers"
-
msgid "Add Node..."
msgstr "Add Node..."
@@ -748,6 +754,9 @@ msgstr "Jump To Position"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Opens a dialogue that allows to jump to a specific location"
+msgid "Jump to Position"
+msgstr "Jump to Position"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Enter Lat/Lon to jump to position."
@@ -769,9 +778,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Jump there"
-msgid "Jump to Position"
-msgstr "Jump to Position"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr "Could not parse Latitude, Longitude or Zoom. Please check."
@@ -824,6 +830,9 @@ msgstr "Merge layer"
msgid "Merge the current layer into another layer"
msgstr "Merge the current layer into another layer"
+msgid "{0} completed in {1}"
+msgstr "{0} completed in {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Merging layers with different upload policies"
@@ -991,24 +1000,30 @@ msgstr[1] "Opening {0} files..."
msgid "Opening file ''{0}'' ..."
msgstr "Opening file ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr "Which tasks to perform?"
+
+msgid "Ok"
+msgstr "Ok"
+
msgid "Open Location..."
msgstr "Open Location..."
msgid "Open an URL."
msgstr "Open an URL."
-msgid "Separate Layer"
-msgstr "Separate Layer"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Select if the data should be downloaded into a new layer"
-
msgid "Enter URL to download:"
msgstr "Enter URL to download:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Enter an URL from where data should be downloaded"
+msgid "Separate Layer"
+msgstr "Separate Layer"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Select if the data should be downloaded into a new layer"
+
msgid "Download Location"
msgstr "Download Location"
@@ -1024,12 +1039,6 @@ msgstr "Close dialogue and cancel downloading"
msgid "Download Data"
msgstr "Download Data"
-msgid "Which tasks to perform?"
-msgstr "Which tasks to perform?"
-
-msgid "Ok"
-msgstr "Ok"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1882,9 +1891,6 @@ msgstr "Query and download changesets ..."
msgid "Errors during download"
msgstr "Errors during download"
-msgid "Download Geo URL"
-msgstr "Download Geo URL"
-
msgid "Download GPS"
msgstr "Download GPS"
@@ -4225,9 +4231,6 @@ msgstr "Area style way is not closed"
msgid "No outer way for multipolygon"
msgstr "No outer way for multipolygon"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "Role for ''{0}'' should be ''{1}''"
-
msgid "No area style for multipolygon"
msgstr "No area style for multipolygon"
@@ -4263,12 +4266,27 @@ msgstr "Area style on outer way"
msgid "Multipolygon is not closed"
msgstr "Multipolygon is not closed"
-msgid "Multipolygon inner way is outside"
-msgstr "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "Intersection between multipolygon ways"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "Role for ''{0}'' should be ''{1}''"
+
+msgid "Multipolygon inner way is outside"
+msgstr "Multipolygon inner way is outside"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "No useful role for multipolygon member"
@@ -4975,12 +4993,18 @@ msgstr "Disable access to the given resource(s), separated by comma"
msgid "options provided as Java system properties"
msgstr "options provided as Java system properties"
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/PATH/TO/JOSM/PREF "
msgid "Set the preferences directory"
msgstr "Set the preferences directory"
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/PATH/TO/JOSM/USERDATA"
@@ -4997,11 +5021,9 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/PATH/TO/JOSM/HOMEDIR "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5347,9 +5369,6 @@ msgstr "Click to run job in background"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} completed in {1}"
-
msgid "Enlarge"
msgstr "Enlarge"
@@ -5494,85 +5513,6 @@ msgstr "Conflict background: remove member"
msgid "Conflict foreground: remove member"
msgstr "Conflict foreground: remove member"
-msgid "My with Their"
-msgstr "My with Their"
-
-msgid "My with Merged"
-msgstr "My with Merged"
-
-msgid "Their with Merged"
-msgstr "Their with Merged"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "role {0} is not participating in compare pair {1}"
-
-msgid "Properties"
-msgstr "Properties"
-
-msgid "Tags"
-msgstr "Tags"
-
-msgid "Nodes"
-msgstr "Nodes"
-
-msgid "Members"
-msgstr "Members"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "No pending tag conflicts to be resolved"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Tags({0} conflict)"
-msgstr[1] "Tags({0} conflicts)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} pending tag conflict to be resolved"
-msgstr[1] "{0} pending tag conflicts to be resolved"
-
-msgid "Nodes(resolved)"
-msgstr "Nodes(resolved)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-
-msgid "Nodes(with conflicts)"
-msgstr "Nodes(with conflicts)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Pending conflicts in the node list of this way"
-
-msgid "Members(resolved)"
-msgstr "Members(resolved)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-
-msgid "Members(with conflicts)"
-msgstr "Members(with conflicts)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Pending conflicts in the member list of this relation"
-
-msgid "No pending property conflicts"
-msgstr "No pending property conflicts"
-
-msgid "Properties(with conflicts)"
-msgstr "Properties(with conflicts)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Pending property conflicts to be resolved"
-
-msgid "Conflict Resolution"
-msgstr "Conflict Resolution"
-
msgid "{0} more..."
msgstr "{0} more..."
@@ -5755,6 +5695,85 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Their version ({0} entry)"
msgstr[1] "Their version ({0} entries)"
+msgid "My with Their"
+msgstr "My with Their"
+
+msgid "My with Merged"
+msgstr "My with Merged"
+
+msgid "Their with Merged"
+msgstr "Their with Merged"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "role {0} is not participating in compare pair {1}"
+
+msgid "Properties"
+msgstr "Properties"
+
+msgid "Tags"
+msgstr "Tags"
+
+msgid "Nodes"
+msgstr "Nodes"
+
+msgid "Members"
+msgstr "Members"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "No pending tag conflicts to be resolved"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Tags({0} conflict)"
+msgstr[1] "Tags({0} conflicts)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} pending tag conflict to be resolved"
+msgstr[1] "{0} pending tag conflicts to be resolved"
+
+msgid "Nodes(resolved)"
+msgstr "Nodes(resolved)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+
+msgid "Nodes(with conflicts)"
+msgstr "Nodes(with conflicts)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Pending conflicts in the node list of this way"
+
+msgid "Members(resolved)"
+msgstr "Members(resolved)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+
+msgid "Members(with conflicts)"
+msgstr "Members(with conflicts)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Pending conflicts in the member list of this relation"
+
+msgid "No pending property conflicts"
+msgstr "No pending property conflicts"
+
+msgid "Properties(with conflicts)"
+msgstr "Properties(with conflicts)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Pending property conflicts to be resolved"
+
+msgid "Conflict Resolution"
+msgstr "Conflict Resolution"
+
msgid "Node"
msgstr "Node"
@@ -5816,8 +5835,8 @@ msgstr "Role"
msgid "Primitive"
msgstr "Primitive"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
-msgstr "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
+msgstr ""
msgid "<undefined>"
msgstr "<undefined>"
@@ -7286,120 +7305,26 @@ msgid "Changeset ID: "
msgstr "Changeset ID: "
msgid "Enter a changeset id"
-msgstr "Enter a changeset id"
-
-msgid ""
-"Download the changeset with the specified id, including the changeset content"
-msgstr ""
-"Download the changeset with the specified id, including the changeset content"
-
-msgid "Select changesets owned by specific users"
-msgstr "Select changesets owned by specific users"
-
-msgid "Select changesets depending on whether they are open or closed"
-msgstr "Select changesets depending on whether they are open or closed"
-
-msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr ""
-"Select changesets based on the date/time they have been created or closed"
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr "Select only changesets related to a specific bounding box"
-
-msgid "Query open changesets only"
-msgstr "Query open changesets only"
-
-msgid "Query closed changesets only"
-msgstr "Query closed changesets only"
-
-msgid "Query both open and closed changesets"
-msgstr "Query both open and closed changesets"
-
-msgid "Only changesets owned by myself"
-msgstr "Only changesets owned by myself"
-
-msgid "User ID:"
-msgstr "User ID:"
-
-msgid "User name:"
-msgstr "User name:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Only changesets owned by the user with the following user ID"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "Only changesets owned by the user with the following user name"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "Current value ''{0}'' for user ID is not valid"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr "Cannot restrict the changeset query to the user name ''{0}''"
-
-msgid "Please enter a valid user ID"
-msgstr "Please enter a valid user ID"
-
-msgid "Invalid user ID"
-msgstr "Invalid user ID"
-
-msgid "Please enter a non-empty user name"
-msgstr "Please enter a non-empty user name"
-
-msgid "Invalid user name"
-msgstr "Invalid user name"
-
-msgid "Date: "
-msgstr "Date: "
-
-msgid "Time:"
-msgstr "Time:"
-
-msgid "Closed after - "
-msgstr "Closed after - "
-
-msgid "Date:"
-msgstr "Date:"
-
-msgid "Created before - "
-msgstr "Created before - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Only changesets closed after the following date/time"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr "Only changesets closed after and created before a specific date/time"
+msgstr "Enter a changeset id"
msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+"Download the changeset with the specified id, including the changeset content"
msgstr ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+"Download the changeset with the specified id, including the changeset content"
+
+msgid "Select changesets owned by specific users"
+msgstr "Select changesets owned by specific users"
+
+msgid "Select changesets depending on whether they are open or closed"
+msgstr "Select changesets depending on whether they are open or closed"
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Select changesets based on the date/time they have been created or closed"
msgstr ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Select changesets based on the date/time they have been created or closed"
-msgid "Invalid date/time values"
-msgstr "Invalid date/time values"
+msgid "Select only changesets related to a specific bounding box"
+msgstr "Select only changesets related to a specific bounding box"
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
@@ -7418,28 +7343,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Invalid bounding box"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-
-msgid "Please enter an integer value > 0"
-msgstr "Please enter an integer value > 0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Download my changesets only"
@@ -7527,6 +7430,75 @@ msgstr "Illegal changeset query URL"
msgid "Close the dialog and abort querying of changesets"
msgstr "Close the dialogue and abort querying of changesets"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Query open changesets only"
+
+msgid "Query closed changesets only"
+msgstr "Query closed changesets only"
+
+msgid "Query both open and closed changesets"
+msgstr "Query both open and closed changesets"
+
+msgid "Date: "
+msgstr "Date: "
+
+msgid "Time:"
+msgstr "Time:"
+
+msgid "Closed after - "
+msgstr "Closed after - "
+
+msgid "Date:"
+msgstr "Date:"
+
+msgid "Created before - "
+msgstr "Created before - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Only changesets closed after the following date/time"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr "Only changesets closed after and created before a specific date/time"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Invalid date/time values"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+
+msgid "Please enter an integer value > 0"
+msgstr "Please enter an integer value > 0"
+
msgid "URL: "
msgstr "URL: "
@@ -7547,6 +7519,53 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "This changeset query URL is invalid"
+msgid "Only changesets owned by myself"
+msgstr "Only changesets owned by myself"
+
+msgid "User ID:"
+msgstr "User ID:"
+
+msgid "User name:"
+msgstr "User name:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Only changesets owned by the user with the following user ID"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "Only changesets owned by the user with the following user name"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "Current value ''{0}'' for user ID is not valid"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr "Cannot restrict the changeset query to the user name ''{0}''"
+
+msgid "Please enter a valid user ID"
+msgstr "Please enter a valid user ID"
+
+msgid "Invalid user ID"
+msgstr "Invalid user ID"
+
+msgid "Please enter a non-empty user name"
+msgstr "Please enter a non-empty user name"
+
+msgid "Invalid user name"
+msgstr "Invalid user name"
+
msgid "Activate"
msgstr "Activate"
@@ -8721,6 +8740,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10360,6 +10382,9 @@ msgstr "Direction"
msgid "Velocity, {0}"
msgstr "Velocity, {0}"
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audio files (*.wav)"
+
msgid "Import Audio"
msgstr "Import Audio"
@@ -10375,9 +10400,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Import not possible"
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audio files (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Audio markers from {0}"
@@ -10488,16 +10510,6 @@ msgstr "(URL was: "
msgid "Select the map painting styles"
msgstr "Select the map painting styles"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-
msgid "loading style ''{0}''..."
msgstr "loading style ''{0}''..."
@@ -10514,6 +10526,9 @@ msgstr[1] ""
"There were {0} errors when loading this style. Select ''Info'' from the "
"right click menu for details."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
@@ -11609,6 +11624,9 @@ msgstr "Dilution of Position (red = high, green = low, if available)"
msgid "Track date"
msgstr "Track date"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Single Colour (can be customised for named layers)"
@@ -11621,6 +11639,18 @@ msgstr "Bicycle"
msgid "Foot"
msgstr "Foot"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Wood"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Create markers when reading GPX"
@@ -11633,6 +11663,9 @@ msgstr "Dynamic colour range based on data limits"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Smooth GPX graphics (antialiasing)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11702,6 +11735,11 @@ msgstr ""
"Apply antialiasing to the GPX lines resulting in a smoother appearance."
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11724,9 +11762,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "Colours points and track segments by its timestamp."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr "Allows tuning of the track colouring for different average speeds."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Track and Point Colouring"
@@ -13008,6 +13053,12 @@ msgstr "Checks for errors on religious objects"
msgid "Checks for errors on relations"
msgstr "Checks for errors on relations"
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr "Unnecessary tags"
@@ -14131,6 +14182,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Save user and password (unencrypted)"
+msgid "Assume"
+msgstr "Assume"
+
+msgid "Existing values"
+msgstr "Existing values"
+
msgid "<delete from {0} objects>"
msgstr "<delete from {0} objects>"
@@ -14152,12 +14209,6 @@ msgstr "Add checked tags to selected objects"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Enter: Add all tags to selected objects"
-msgid "Assume"
-msgstr "Assume"
-
-msgid "Existing values"
-msgstr "Existing values"
-
msgid "Enable the checkbox to accept the value"
msgstr "Enable the checkbox to accept the value"
@@ -15324,6 +15375,9 @@ msgstr "Adding JOSM localhost certificate to {0} keystore"
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "There was {0} tag found in the buffer, it is suspicious!"
@@ -15845,14 +15899,17 @@ msgstr "Mapbox Satellite"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr "OpenSeaMap"
-msgid "OpenStreetMap Carto (Standard layer)"
-msgstr "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
+msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, no labels)"
@@ -15875,8 +15932,11 @@ msgstr "Hike & Bike"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
@@ -15926,8 +15986,8 @@ msgstr "OSM Inspector: Places"
msgid "OSM Inspector: Highways"
msgstr "OSM Inspector: Highways"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
+msgstr ""
msgid "OSM Inspector: Routing"
msgstr "OSM Inspector: Routing"
@@ -15935,11 +15995,23 @@ msgstr "OSM Inspector: Routing"
msgid "OSM Inspector: Addresses"
msgstr "OSM Inspector: Addresses"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
-msgid "IGN Argentina (WMTS)"
-msgstr "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
+msgstr ""
msgid "IGN Argentina (WMS)"
msgstr "IGN Argentina (WMS)"
@@ -15974,6 +16046,12 @@ msgstr "LPI NSW Administrative Boundaries State Forest"
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr "LPI NSW Administrative Boundaries NPWS Reserve"
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -16019,11 +16097,17 @@ msgstr "VoGIS: Flächenwidmungsplan"
msgid "VoGIS: Höhen und Gelände"
msgstr "VoGIS: Höhen und Gelände"
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
-msgstr "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
+msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
-msgstr "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
+msgstr ""
msgid "URBISfr numerical imagery (2013)"
msgstr "URBISfr numerical imagery (2013)"
@@ -16058,8 +16142,17 @@ msgstr "SPW(allonie) 2009-2010 aerial imagery"
msgid "TEC bus lines (2014)"
msgstr "TEC bus lines (2014)"
-msgid "Benin:cotonou_pleiade_2016"
-msgstr "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
msgid "IBGE Mapa de Setores Urbanos"
msgstr "IBGE Mapa de Setores Urbanos"
@@ -16067,6 +16160,15 @@ msgstr "IBGE Mapa de Setores Urbanos"
msgid "IBGE Mapa de Setores Rurais"
msgstr "IBGE Mapa de Setores Rurais"
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Geobase Hydrography"
@@ -16079,12 +16181,34 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "British Columbia Mosaic"
+msgid "Latest southwest British Columbia Landsat"
+msgstr ""
+
msgid "Kelowna 2012"
msgstr "Kelowna 2012"
msgid "Kelowna Roads overlay"
msgstr "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr ""
+
msgid "Czech CUZK:KM"
msgstr "Czech CUZK:KM"
@@ -16121,6 +16245,12 @@ msgstr "Stevns (Denmark)"
msgid "Vejmidte (Denmark)"
msgstr "Vejmidte (Denmark)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Estonia Basemap (Maaamet)"
@@ -16154,9 +16284,6 @@ msgstr "Cadastre"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr "CRAIG - Auvergne 2013 - 25 cm"
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "GrandNancy Orthophotographie 2012"
@@ -16215,9 +16342,6 @@ msgstr ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
"- 1 m"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Sorbian Language)"
-
msgid "Hamburg (40 cm)"
msgstr "Hamburg (40 cm)"
@@ -16245,9 +16369,6 @@ msgstr "Berlin aerial photograph 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Berlin aerial photograph 2016"
-msgid "Stuttgart (aerial imagery)"
-msgstr "Stuttgart (aerial imagery)"
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16281,9 +16402,54 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Drone Imagery (Haiti)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone Imagery 2014 (Haiti)"
@@ -16320,14 +16486,8 @@ msgstr "Danube flood ortophoto 2013"
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
-msgid "Budapest district XII ortophoto 2013"
-msgstr "Budapest district XII ortophoto 2013"
-
-msgid "Interspect Budapest ortophoto 2014"
-msgstr "Interspect Budapest ortophoto 2014"
-
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
-msgstr "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Hungary (hiking routes)"
@@ -16335,6 +16495,21 @@ msgstr "OpenStreetMap Hungary (hiking routes)"
msgid "Hillshade Hungary"
msgstr "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -16395,9 +16570,21 @@ msgstr "PCN 2012 - Italy"
msgid "South Tyrol Orthofoto 2011"
msgstr "South Tyrol Orthofoto 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr "South Tyrol Topomap"
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "USSR - Latvia"
@@ -16431,12 +16618,34 @@ msgstr "Niger Delta Oct 2012 Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard -Orthophoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Gaza Strip - Pléiades - 2014/07/06"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
@@ -16563,9 +16772,6 @@ msgstr "Świętochłowice: Ortofotomapa 2012 (aerial image)"
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Zabrze: Ortofotomapa 2011 (aerial image)"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Szlaki (paths)"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr "Wrocław: Ortofotomapa 2015 (aerial image)"
@@ -16575,6 +16781,20 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Car"
@@ -16596,12 +16816,30 @@ msgstr "RABA-KGZ: Slovenia farmland use"
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr "RABA-KGZ: Slovenia built-up areas"
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr "City of Cape Town 2015 Aerial"
msgid "South Africa CD:NGI Aerial"
msgstr "South Africa CD:NGI Aerial"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr "Catastro Spain"
@@ -16623,6 +16861,9 @@ msgstr "IDEIB - Balearic Islands"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Canary Islands"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Kanton Aargau 25cm (AGIS 2011)"
@@ -16665,6 +16906,9 @@ msgstr "Canton de Fribourg 50cm (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Stadt Bern 10cm/25cm (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -16686,6 +16930,12 @@ msgstr "Bonvillars Orthophoto 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Fiez Orthophoto 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr "Taiwan e-Map Open Data"
@@ -16701,6 +16951,9 @@ msgstr "Taiwan Land-Section Data"
msgid "NLSC Open Data WMTS"
msgstr "NLSC Open Data WMTS"
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "MSR Maps Topo"
@@ -16728,9 +16981,54 @@ msgstr "NC Latest Orthoimagery"
msgid "U.S. Forest Service roads"
msgstr "U.S. Forest Service roads"
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ukraine - Orthophotomaps 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -16752,9 +17050,6 @@ msgstr "Surrey Air Survey"
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Scotland 1842-82"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr "NLS - OS 6-inch County Series 1888-1913"
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -16764,9 +17059,6 @@ msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr "NLS - OS 25-inch (Scotland) 1892-1905"
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25k historic (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "OS 1:25k historic (OSM-Limited)"
@@ -17099,8 +17391,8 @@ msgstr "Downloads new data when you pan/zoom"
msgid "Create a grid of ways."
msgstr "Create a grid of ways."
-msgid "Customization of public transport stops."
-msgstr "Customisation of public transport stops."
+msgid "Customization of public public transport stops."
+msgstr ""
msgid ""
"Creating and handling address nodes and buildings within Czech Republic."
@@ -17204,6 +17496,9 @@ msgstr "Simple tool to tag house numbers."
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "Generate imagery XML bounds from a multipolygon"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -19701,6 +19996,9 @@ msgstr "Stream"
msgid "River"
msgstr "River"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Canal"
@@ -20755,6 +21053,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr "Guest House/Bed & Breakfast"
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Chalet"
@@ -20821,6 +21125,12 @@ msgstr "Outdoor seating"
msgid "Takeaway"
msgstr "Takeaway"
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast Food"
@@ -21765,31 +22075,19 @@ msgstr "wildlife_hide"
msgid "Hunting Stand"
msgstr "Hunting Stand"
-msgid "Height"
-msgstr "Height"
-
-msgctxt "height"
-msgid "low"
-msgstr "low"
-
-msgctxt "height"
-msgid "half"
-msgstr "half"
-
-msgctxt "height"
-msgid "full"
-msgstr "full"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr "Hide"
-msgid "Lock"
-msgstr "Lock"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr "Water Point"
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr "Compressed Air"
@@ -22381,6 +22679,10 @@ msgid "hut"
msgstr "hut"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr "dormitory"
@@ -23676,6 +23978,9 @@ msgstr "Butcher"
msgid "Seafood"
msgstr "Seafood"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Deli (Fine Food)"
@@ -24493,9 +24798,6 @@ msgstr "Tree Row"
msgid "A line of trees."
msgstr "A line of trees."
-msgid "Wood"
-msgstr "Wood"
-
msgid "Woodland where timber production does not dominate use."
msgstr "Woodland where timber production does not dominate use."
@@ -25564,6 +25866,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0} is deprecated"
@@ -25668,6 +25973,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr "The key {0} has an uncommon value."
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} on a node. Should be used on a way."
@@ -25748,6 +26059,11 @@ msgstr "Coastline inside {1}"
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} should be on the node where {1} and {2} intersect"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "abbreviated street name"
@@ -25772,6 +26088,9 @@ msgstr "{0} used with {1}"
msgid "street name contains ss"
msgstr "street name contains ss"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -26577,6 +26896,16 @@ msgstr "Submit the current changeset"
msgid "Submit the current changeset to Mapillary"
msgstr "Submit the current changeset to Mapillary"
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr "Upload pictures"
@@ -26619,8 +26948,8 @@ msgstr "Open Mapillary changeset dialogue"
msgid "Mapillary changeset"
msgstr "Mapillary changeset"
-msgid "Submit"
-msgstr "Submit"
+msgid "Submitting changeset to server…"
+msgstr ""
msgid "Export all images"
msgstr "Export all images"
@@ -27523,6 +27852,9 @@ msgstr "Select an area (e.g. building) from an underlying image."
msgid "Area Selector"
msgstr "Area Selector"
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr "Created area"
@@ -27568,11 +27900,9 @@ msgid "Algorithm"
msgstr "Algorithm"
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
msgid "Distance Tolerance"
msgstr "Distance Tolerance"
@@ -29274,6 +29604,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Open Imagery XML file"
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr "Calibration Layer"
@@ -31548,9 +31937,6 @@ msgstr "PT: Route should start and end with a stop_position"
msgid "PT: First or last way needs to be split"
msgstr "PT: First or last way needs to be split"
-msgid "PT: Problem in the route segment"
-msgstr "PT: Problem in the route segment"
-
msgid "PT: Stop not served"
msgstr "PT: Stop not served"
@@ -31709,9 +32095,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr "[gap]"
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "Route patterns ..."
@@ -31769,6 +32152,9 @@ msgstr "left hand side"
msgid "Maximum distance from route"
msgstr "Maximum distance from route"
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "Public Transport: Change stop type"
@@ -31968,9 +32354,6 @@ msgstr "Reconstruct polygon"
msgid "Multipolygon must consist only of ways"
msgstr "Multipolygon must consist only of ways"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr "Reconstruction of polygons can be done only from outer ways"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Reconstruct polygons from relation {0}"
diff --git a/i18n/po/eo.po b/i18n/po/eo.po
index 4850aa2..614f75e 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:41+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:45+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: eo\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr "Konstruado de ĉefa menuo"
msgid "Help"
msgstr "Helpu"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Pravalorizado de API de OSM"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Pravalorizado de kontrolilo"
@@ -206,6 +212,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr "Elektu WMS mantelojn"
+
+msgid "Add layers"
+msgstr "Aldoni mantelojn"
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -227,12 +239,6 @@ msgstr "Eraro"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr "Elektu WMS mantelojn"
-
-msgid "Add layers"
-msgstr "Aldoni mantelojn"
-
msgid "Add Node..."
msgstr "Aldoni Nodon..."
@@ -715,6 +721,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -736,9 +745,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -789,6 +795,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -938,24 +947,30 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr "Malfermo de dosieron “{0}”…"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid "Open Location..."
msgstr "Malfermu lokon…"
msgid "Open an URL."
msgstr "Malfermu URL-on."
-msgid "Separate Layer"
-msgstr "Apartigu tavolojn"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr ""
-
msgid "Enter URL to download:"
msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr "Apartigu tavolojn"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -971,12 +986,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1769,9 +1778,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3957,9 +3963,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3989,12 +3992,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4687,12 +4705,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4709,8 +4733,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5031,9 +5055,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5172,82 +5193,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5413,6 +5358,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5472,7 +5493,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6864,212 +6885,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8175,6 +8196,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9661,6 +9685,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9673,9 +9700,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9772,14 +9796,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9792,6 +9808,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10780,6 +10799,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10792,6 +10814,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10804,6 +10838,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10863,6 +10900,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10881,9 +10923,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12078,6 +12127,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13117,6 +13172,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13138,12 +13199,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14103,6 +14158,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14591,13 +14649,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14621,7 +14682,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14672,7 +14736,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14681,10 +14745,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14720,6 +14796,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14765,10 +14847,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14801,34 +14889,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14867,6 +14995,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14900,9 +15034,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14959,9 +15090,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14989,9 +15117,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15025,9 +15150,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15064,19 +15234,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15139,9 +15318,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15175,12 +15366,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15307,9 +15520,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15319,6 +15529,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15340,12 +15564,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15367,6 +15609,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15409,6 +15654,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15430,6 +15678,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15445,6 +15699,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15472,9 +15729,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15496,9 +15798,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15508,9 +15807,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15822,7 +16118,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15910,6 +16206,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18306,6 +18605,9 @@ msgstr ""
msgid "River"
msgstr "Rivero"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19354,6 +19656,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19420,6 +19728,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20363,31 +20677,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20979,6 +21281,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22272,6 +22578,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23085,9 +23394,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24132,6 +24438,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24223,6 +24532,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24299,6 +24614,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24323,6 +24643,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25096,6 +25419,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25138,7 +25471,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25941,6 +26274,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25982,8 +26318,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27581,6 +27917,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29742,9 +30137,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29902,9 +30294,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29962,6 +30351,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30159,9 +30551,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/es.po b/i18n/po/es.po
index 1c02cde..50f14af 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: 2016-11-06 22:51+0100\n"
-"PO-Revision-Date: 2016-11-01 05:17+0000\n"
-"Last-Translator: Leo Arias <leo.arias at canonical.com>\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
+"PO-Revision-Date: 2016-12-26 10:03+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: 2016-11-07 05:08+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:13+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: es\n"
"X-Language: es_ES\n"
"X-Source-Language: C\n"
@@ -66,9 +66,15 @@ msgstr "Construyendo el menú principal"
msgid "Help"
msgstr "Ayuda"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Inicializando API de OSM"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Inicializando validador"
@@ -209,6 +215,12 @@ msgid ""
msgstr ""
"Selecciona en el mapa los elementos seleccionados en la lista superior."
+msgid "Select WMS layers"
+msgstr "Seleccionar capas WMS"
+
+msgid "Add layers"
+msgstr "Añadir capas"
+
msgid "Add imagery layer {0}"
msgstr "Agregar capa de imágenes {0}"
@@ -230,12 +242,6 @@ msgstr "Error"
msgid "Select image format for WMS layer"
msgstr "Seleccionar formato de imagen para la capa WMS"
-msgid "Select WMS layers"
-msgstr "Seleccionar capas WMS"
-
-msgid "Add layers"
-msgstr "Añadir capas"
-
msgid "Add Node..."
msgstr "Añadir nodo..."
@@ -452,7 +458,7 @@ msgid "Toggle dialogs panel, maximize mapview"
msgstr "Conmuta el panel de diálogos, maximiza la vista del mapa"
msgid "Distribute Nodes"
-msgstr "Distribuir Nodos"
+msgstr "Distribuir nodos"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
@@ -761,6 +767,9 @@ msgstr ""
"Abre una ventana de diálogo que permite desplazarse a una localización "
"especifica"
+msgid "Jump to Position"
+msgstr "Saltar a posición"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Introduzca Lat/Lon para ir a la posición."
@@ -782,9 +791,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Ir allí"
-msgid "Jump to Position"
-msgstr "Saltar a posición"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"No se puede deserializar la Latitud, Longitud o Zoom. Por favor verifíquelo."
@@ -840,6 +846,9 @@ msgstr "Unir capa"
msgid "Merge the current layer into another layer"
msgstr "Integrar la capa actual en otra capa"
+msgid "{0} completed in {1}"
+msgstr "{0} completado en {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Fusionando capas con diferentes políticas de carga"
@@ -1012,24 +1021,30 @@ msgstr[1] "Abriendo {0} archivos..."
msgid "Opening file ''{0}'' ..."
msgstr "Abriendo archivo ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr "¿Tareas a realizar?"
+
+msgid "Ok"
+msgstr "Aceptar"
+
msgid "Open Location..."
msgstr "Abrir dirección..."
msgid "Open an URL."
msgstr "Abrir una URL"
-msgid "Separate Layer"
-msgstr "Separar capa"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Seleccionar si los datos deben ser descargados en una nueva capa"
-
msgid "Enter URL to download:"
msgstr "Introduzca la URL a descargar"
msgid "Enter an URL from where data should be downloaded"
msgstr "Introduzca una URL desde donde los datos deben ser descargados"
+msgid "Separate Layer"
+msgstr "Separar capa"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Seleccionar si los datos deben ser descargados en una nueva capa"
+
msgid "Download Location"
msgstr "Descargar ubicación"
@@ -1045,12 +1060,6 @@ msgstr "Cerrar cuadro de diálogo y cancelar la descarga"
msgid "Download Data"
msgstr "Descargar datos"
-msgid "Which tasks to perform?"
-msgstr "¿Tareas a realizar?"
-
-msgid "Ok"
-msgstr "Aceptar"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1146,7 +1155,7 @@ msgid "Parse error"
msgstr "Error al deserializar"
msgid "Overpass query: "
-msgstr "Consulat de paso elevado: "
+msgstr "Consulta Overpass: "
msgid "Paste"
msgstr "Pegar"
@@ -1196,8 +1205,8 @@ msgid ""
"uploading."
msgstr ""
"Esta operación hace que JOSM olvide los objetos seleccionados.<br> Serán "
-"eliminados de la capa, pero <i>no</i> se borrarán<br>cuando se haga la "
-"subida de datos al servidor"
+"eliminados de la capa, pero <i>no</i> se borrarán<br> del servidor cuando se "
+"haga la subida de datos."
msgid ""
"The following dependent objects will be purged<br> in addition to the "
@@ -1923,9 +1932,6 @@ msgstr "Consultar y descargar modificaciones..."
msgid "Errors during download"
msgstr "Errores durante la descarga"
-msgid "Download Geo URL"
-msgstr "Descargar Geo URL"
-
msgid "Download GPS"
msgstr "Descargar GPS"
@@ -2414,7 +2420,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 ""
-"Mover los objetos arrastrando el ratón: Shift para añadir a la selección "
+"Mover los objetos arrastrando el ratón; Shift para añadir a la selección "
"(Ctrl para conmutar); Shift-Ctrl para rotar la selección; Alt-Ctrl para "
"escalar la selección; o cambiar la selección"
@@ -2621,7 +2627,7 @@ msgid "add toolbar button"
msgstr "añadir botón a la barra de herramientas"
msgid "Invalid search expression"
-msgstr "Expresión inválida de búsqueda"
+msgstr "Expresión de búsqueda inválida"
msgid "Filter"
msgstr "Filtrar"
@@ -2640,7 +2646,8 @@ msgid ""
"\n"
" {0}"
msgstr ""
-"Expresión inválida de búsqueda: \n"
+"La expresión de búsqueda no es válida: \n"
+"\n"
" {0}"
msgid "basic examples"
@@ -3159,7 +3166,7 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to delete?"
msgstr ""
"Va a eliminar objetos incompletos.<br> Esto causará problemas porque no ve "
-"el objeto real.<br>¿Está seguro que desea borrarlos?"
+"el objeto real.<br>¿Está seguro de que desea borrarlos?"
msgid ""
"You are about to delete {0} relation: {1}<br/>This step is rarely necessary "
@@ -3547,7 +3554,7 @@ msgid "deg° min'' sec\""
msgstr "gradº min'' seg''"
msgid "deg° min'' (Nautical)"
-msgstr "gradº min'' (Naútica)"
+msgstr "gradº min'' (Náutica)"
msgid "Projected Coordinates"
msgstr "Coordenadas proyectadas"
@@ -4154,7 +4161,7 @@ msgid "Crossing barriers"
msgstr "Cruzando barreras"
msgid "Self crossing"
-msgstr ""
+msgstr "Se cruza a sí misma"
msgid "Self-crossing ways"
msgstr "Vías que se cruzan a sí mismas"
@@ -4173,7 +4180,7 @@ msgid "This test checks that there are no nodes at the very same location."
msgstr "Esta examen comprueba que no haya nodos en el mismo lugar."
msgid "Mixed type duplicated nodes"
-msgstr "Mezclar nodos con tipo duplicado"
+msgstr "Nodos duplicados de tipo mixto"
msgid "Highway duplicated nodes"
msgstr "Nodos de vía duplicados"
@@ -4185,7 +4192,7 @@ msgid "Waterway duplicated nodes"
msgstr "Nodos duplicados en vía fluvial"
msgid "Boundary duplicated nodes"
-msgstr "Nodos duplicados de vecindades"
+msgstr "Nodos duplicados de frontera"
msgid "Power duplicated nodes"
msgstr "Nodos duplicados de electricidad"
@@ -4345,9 +4352,6 @@ msgstr "La vía estilo área no ha sido cerrada"
msgid "No outer way for multipolygon"
msgstr "Ninguna vía exterior para el multipolígono"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "El rol para ''{0}'' debería ser ''{1}''"
-
msgid "No area style for multipolygon"
msgstr "No hay estilo de área para multipolígono"
@@ -4385,12 +4389,27 @@ msgstr "Estilo de área en una vía exterior"
msgid "Multipolygon is not closed"
msgstr "El multipolígono no está cerrado"
-msgid "Multipolygon inner way is outside"
-msgstr "vía interna multipolígono está afuera"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "Intersección entre vías multipolígono"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "El rol para ''{0}'' debería ser ''{1}''"
+
+msgid "Multipolygon inner way is outside"
+msgstr "Vía interna de multipolígono está fuera"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr "El anillo multipolígono contiene segmentos dos veces"
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "Miembro de multipolígono no tiene un rol útil"
@@ -4610,13 +4629,13 @@ msgstr ""
msgid "Tag key contains character with code less than 0x20"
msgstr ""
-"La etiqueta de la llave contine un caracter con código menor que 0x20"
+"La clave de la etiqueta contine un carácter con código menor que 0x20"
msgid "Tag value longer than allowed"
msgstr "Valor de etiqueta más largo de lo permitido"
msgid "Tag key longer than allowed"
-msgstr "Valor de la llave de la etiqueta más largo de lo permitido"
+msgstr "Valor de la clave de la etiqueta más largo de lo permitido"
msgid "Tags with empty values"
msgstr "Etiquetas con valores vacíos"
@@ -5117,12 +5136,18 @@ msgstr "Deshabilitar el acceso al recurso(s) dado(s), separados por comas"
msgid "options provided as Java system properties"
msgstr "opciones proporcionadas como propiedades de sistema Java"
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/PATH/TO/JOSM/PREF "
msgid "Set the preferences directory"
msgstr "Fija el directorio de preferencias"
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/PATH/TO/JOSM/USERDATA"
@@ -5139,11 +5164,9 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/PATH/TO/JOSM/HOMEDIR "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Reubicar los 3 directorios en homedir. El directorio de memoria intermedia "
-"estará en homedir/cache"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5251,8 +5274,8 @@ msgstr "Descartar"
msgid "JOSM found {0} unsaved osm data layer. "
msgid_plural "JOSM found {0} unsaved osm data layers. "
-msgstr[0] "JOSM encontró {0} dato en la capa osm. "
-msgstr[1] "JOSM encontró {0} datos en la capa osm. "
+msgstr[0] "JOSM encontró {0} capa de datos osm no guardada. "
+msgstr[1] "JOSM encontró {0} capas de datos osm no guardadas. "
msgid ""
"It looks like JOSM crashed last time. Would you like to restore the data?"
@@ -5500,9 +5523,6 @@ msgstr "Click para ejecutar la tarea en segundo plano"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} completado en {1}"
-
msgid "Enlarge"
msgstr "Agrandar"
@@ -5649,6 +5669,200 @@ msgstr "Conflicto de fondo: elimine el miembro"
msgid "Conflict foreground: remove member"
msgstr "Conflicto de fondo: eliminar el miembro"
+msgid "{0} more..."
+msgstr "{0} más..."
+
+msgid ""
+"The following objects could not be copied to the target object<br>because "
+"they are deleted in the target dataset:"
+msgstr ""
+"Los siguientes objetos no se pudieron copiar al objeto destino<br>debido a "
+"que han sido eliminados del conjunto de datos destino:"
+
+msgid "Merging deleted objects failed"
+msgstr "Falló la unión de objetos eliminados"
+
+msgid "List in role {0} is currently not participating in a compare pair."
+msgstr ""
+"La lista en el rol {0} no está participando actualmente en una pareja de "
+"comparación."
+
+msgid "Unexpected value of parameter ''index''. Got {0}."
+msgstr "inexperado valor del parámetro \"index\". Obtenido {0}"
+
+msgid "Item {0} not found in list."
+msgstr "objeto {0} no encontrado en la lista"
+
+msgid "lock scrolling"
+msgstr "bloquear desplazamiento"
+
+msgid "Compare "
+msgstr "Comparar "
+
+msgid "My version"
+msgstr "Mi versión"
+
+msgid "List of elements in my dataset, i.e. the local dataset"
+msgstr ""
+"Lista de elementos de mi conjunto de datos, es decir el conjunto de datos "
+"locales"
+
+msgid "Merged version"
+msgstr "Versión fusionada"
+
+msgid ""
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
+"Lista de elementos unidos. Reemplazarán la lista de mis elementos cuando la "
+"decisión de unirlos sea aplicada."
+
+msgid "Their version"
+msgstr "Su versión"
+
+msgid "List of elements in their dataset, i.e. the server dataset"
+msgstr ""
+"Lista de elementos de su conjunto de datos, es decir el conjunto de datos "
+"del servidor"
+
+msgid "> top"
+msgstr "> arriba"
+
+msgid "Copy my selected nodes to the start of the merged node list"
+msgstr ""
+"Copiar mis nodos seleccionados al inicio de la lista de nodos fusionados"
+
+msgid "> bottom"
+msgstr "> abajo"
+
+msgid "Copy my selected elements to the end of the list of merged elements."
+msgstr ""
+"Copiar mis elementos seleccionados al final de la lista de elementos "
+"fusionados"
+
+msgid "> before"
+msgstr "> antes"
+
+msgid ""
+"Copy my selected elements before the first selected element in the list of "
+"merged elements."
+msgstr ""
+"Copiar mis elementos seleccionados antes del primer elemento seleccionado en "
+"la lista de elementos fusionados"
+
+msgid "> after"
+msgstr "> después"
+
+msgid ""
+"Copy my selected elements after the first selected element in the list of "
+"merged elements."
+msgstr ""
+"Copiar mis elementos seleccionados después del primer elemento seleccionado "
+"en la lista de elementos fusionados"
+
+msgid "< top"
+msgstr "< encima"
+
+msgid ""
+"Copy their selected element to the start of the list of merged elements."
+msgstr ""
+"Copiar su elemento seleccionado al inicio de la lista de elementos fusionados"
+
+msgid "< bottom"
+msgstr "< debajo"
+
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
+msgstr ""
+"Copiar sus elementos seleccionados al final de la lista de elementos "
+"fusionados"
+
+msgid "< before"
+msgstr "< antes"
+
+msgid ""
+"Copy their selected elements before the first selected element in the list "
+"of merged elements."
+msgstr ""
+"Copiar sus elementos seleccionados antes del primer elemento seleccionado en "
+"la lista de elementos fusionados"
+
+msgid "< after"
+msgstr "< después"
+
+msgid ""
+"Copy their selected element after the first selected element in the list of "
+"merged elements"
+msgstr ""
+"Copia su elemento seleccionado después del primer elemento seleccionado en "
+"la lista de elementos fusionados"
+
+msgid "Copy all my elements to the target"
+msgstr "Copiar todos mis elementos al destino"
+
+msgid "Copy all their elements to the target"
+msgstr "Copiar todos sus elementos al destino"
+
+msgid "Up"
+msgstr "Subir"
+
+msgid "Move up the selected entries by one position."
+msgstr "Mueva las entradas seleccionadas de a una posición."
+
+msgid "Down"
+msgstr "Bajar"
+
+msgid "Move down the selected entries by one position."
+msgstr "Bajar las entradas seleccionadas una posición"
+
+msgid "Remove"
+msgstr "Eliminar"
+
+msgid "Remove the selected entries from the list of merged elements."
+msgstr ""
+"Eliminar las entradas seleccionadas de la lista de elementos fusionados"
+
+msgid "Freeze"
+msgstr "Congelar"
+
+msgid "Freeze the current list of merged elements."
+msgstr "Congelar la lista actual de elementos fusionados"
+
+msgid "Unfreeze"
+msgstr "Descongelar"
+
+msgid "Unfreeze the list of merged elements and start merging."
+msgstr "Descongelar la lista de elementos fusionados y comenzar la fusión"
+
+msgid ""
+"<html>Click <strong>{0}</strong> to start merging my and their "
+"entries.</html>"
+msgstr ""
+"<html>Pulsar <strong>{0}</strong> para iniciar la fusión de mis entradas y "
+"las suyas</html>"
+
+msgid ""
+"<html>Click <strong>{0}</strong> to finish merging my and their "
+"entries.</html>"
+msgstr ""
+"<html>Pulsar <strong>{0}</strong> para terminar la fusión de mis entradas y "
+"las suyas</html>"
+
+msgid "My version ({0} entry)"
+msgid_plural "My version ({0} entries)"
+msgstr[0] "Mi versión ({0} ingresada)"
+msgstr[1] "Mi versión ({0} ingresadas)"
+
+msgid "Merged version ({0} entry)"
+msgid_plural "Merged version ({0} entries)"
+msgstr[0] "Versión fusionada ({0} ingresada)"
+msgstr[1] "Versión fusionada ({0} ingresadas)"
+
+msgid "Their version ({0} entry)"
+msgid_plural "Their version ({0} entries)"
+msgstr[0] "Su versión ({0} ingresada)"
+msgstr[1] "Su versión ({0} ingresadas)"
+
msgid "My with Their"
msgstr "Mía respecto a la suya"
@@ -5729,200 +5943,6 @@ msgstr "Conflictos de propiedades pendientes de resolver"
msgid "Conflict Resolution"
msgstr "Resolución de conflictos"
-msgid "{0} more..."
-msgstr "{0} más..."
-
-msgid ""
-"The following objects could not be copied to the target object<br>because "
-"they are deleted in the target dataset:"
-msgstr ""
-"Los siguientes objetos no se pudieron copiar al objeto destino<br>debido a "
-"que han sido eliminados del conjunto de datos destino:"
-
-msgid "Merging deleted objects failed"
-msgstr "Falló la unión de objetos eliminados"
-
-msgid "List in role {0} is currently not participating in a compare pair."
-msgstr ""
-"La lista en el rol {0} no está participando actualmente en una pareja de "
-"comparación."
-
-msgid "Unexpected value of parameter ''index''. Got {0}."
-msgstr "inexperado valor del parámetro \"index\". Obtenido {0}"
-
-msgid "Item {0} not found in list."
-msgstr "objeto {0} no encontrado en la lista"
-
-msgid "lock scrolling"
-msgstr "bloquear desplazamiento"
-
-msgid "Compare "
-msgstr "Comparar "
-
-msgid "My version"
-msgstr "Mi versión"
-
-msgid "List of elements in my dataset, i.e. the local dataset"
-msgstr ""
-"Lista de elementos de mi conjunto de datos, es decir el conjunto de datos "
-"locales"
-
-msgid "Merged version"
-msgstr "Versión fusionada"
-
-msgid ""
-"List of merged elements. They will replace the list of my elements when the "
-"merge decisions are applied."
-msgstr ""
-"Lista de elementos unidos. Reemplazarán la lista de mis elementos cuando la "
-"decisión de unirlos sea aplicada."
-
-msgid "Their version"
-msgstr "Su versión"
-
-msgid "List of elements in their dataset, i.e. the server dataset"
-msgstr ""
-"Lista de elementos de su conjunto de datos, es decir el conjunto de datos "
-"del servidor"
-
-msgid "> top"
-msgstr "> arriba"
-
-msgid "Copy my selected nodes to the start of the merged node list"
-msgstr ""
-"Copiar mis nodos seleccionados al inicio de la lista de nodos fusionados"
-
-msgid "> bottom"
-msgstr "> abajo"
-
-msgid "Copy my selected elements to the end of the list of merged elements."
-msgstr ""
-"Copiar mis elementos seleccionados al final de la lista de elementos "
-"fusionados"
-
-msgid "> before"
-msgstr "> antes"
-
-msgid ""
-"Copy my selected elements before the first selected element in the list of "
-"merged elements."
-msgstr ""
-"Copiar mis elementos seleccionados antes del primer elemento seleccionado en "
-"la lista de elementos fusionados"
-
-msgid "> after"
-msgstr "> después"
-
-msgid ""
-"Copy my selected elements after the first selected element in the list of "
-"merged elements."
-msgstr ""
-"Copiar mis elementos seleccionados después del primer elemento seleccionado "
-"en la lista de elementos fusionados"
-
-msgid "< top"
-msgstr "< encima"
-
-msgid ""
-"Copy their selected element to the start of the list of merged elements."
-msgstr ""
-"Copiar su elemento seleccionado al inicio de la lista de elementos fusionados"
-
-msgid "< bottom"
-msgstr "< debajo"
-
-msgid ""
-"Copy their selected elements to the end of the list of merged elements."
-msgstr ""
-"Copiar sus elementos seleccionados al final de la lista de elementos "
-"fusionados"
-
-msgid "< before"
-msgstr "< antes"
-
-msgid ""
-"Copy their selected elements before the first selected element in the list "
-"of merged elements."
-msgstr ""
-"Copiar sus elementos seleccionados antes del primer elemento seleccionado en "
-"la lista de elementos fusionados"
-
-msgid "< after"
-msgstr "< después"
-
-msgid ""
-"Copy their selected element after the first selected element in the list of "
-"merged elements"
-msgstr ""
-"Copia su elemento seleccionado después del primer elemento seleccionado en "
-"la lista de elementos fusionados"
-
-msgid "Copy all my elements to the target"
-msgstr "Copiar todos mis elementos al destino"
-
-msgid "Copy all their elements to the target"
-msgstr "Copiar todos sus elementos al destino"
-
-msgid "Up"
-msgstr "Subir"
-
-msgid "Move up the selected entries by one position."
-msgstr "Mueva las entradas seleccionadas de a una posición."
-
-msgid "Down"
-msgstr "Bajar"
-
-msgid "Move down the selected entries by one position."
-msgstr "Bajar las entradas seleccionadas una posición"
-
-msgid "Remove"
-msgstr "Eliminar"
-
-msgid "Remove the selected entries from the list of merged elements."
-msgstr ""
-"Eliminar las entradas seleccionadas de la lista de elementos fusionados"
-
-msgid "Freeze"
-msgstr "Congelar"
-
-msgid "Freeze the current list of merged elements."
-msgstr "Congelar la lista actual de elementos fusionados"
-
-msgid "Unfreeze"
-msgstr "Descongelar"
-
-msgid "Unfreeze the list of merged elements and start merging."
-msgstr "Descongelar la lista de elementos fusionados y comenzar la fusión"
-
-msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
-msgstr ""
-"<html>Pulsar <strong>{0}</strong> para iniciar la fusión de mis entradas y "
-"las suyas</html>"
-
-msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
-msgstr ""
-"<html>Pulsar <strong>{0}</strong> para terminar la fusión de mis entradas y "
-"las suyas</html>"
-
-msgid "My version ({0} entry)"
-msgid_plural "My version ({0} entries)"
-msgstr[0] "Mi versión ({0} ingresada)"
-msgstr[1] "Mi versión ({0} ingresadas)"
-
-msgid "Merged version ({0} entry)"
-msgid_plural "Merged version ({0} entries)"
-msgstr[0] "Versión fusionada ({0} ingresada)"
-msgstr[1] "Versión fusionada ({0} ingresadas)"
-
-msgid "Their version ({0} entry)"
-msgid_plural "Their version ({0} entries)"
-msgstr[0] "Su versión ({0} ingresada)"
-msgstr[1] "Su versión ({0} ingresadas)"
-
msgid "Node"
msgstr "Nodo"
@@ -5989,10 +6009,8 @@ msgstr "Función"
msgid "Primitive"
msgstr "Primitiva"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"Los nodos fusionados aún no están congelados. No se puede construir la orden "
-"de resolución."
msgid "<undefined>"
msgstr "<indefinido>"
@@ -6144,7 +6162,7 @@ msgstr "La clave ''{0}'' y todos sus valores serán suprimidos"
msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
msgstr ""
-"Todos los valores unidos como \"{0}\" serán aplicados a la llave \"{1}\""
+"Todos los valores unidos como \"{0}\" serán aplicados a la clave \"{1}\""
msgid "Tag collection does not include the selected value ''{0}''."
msgstr "La colección de etiquetas no incluye el valor seleccionado \"{0}\"."
@@ -6935,10 +6953,10 @@ msgid "Move the selected entry one row up."
msgstr "Mueve hacia arriba el elemento seleccionado una fila."
msgid "Reload from file"
-msgstr "Recargar desde fichero"
+msgstr "Recargar desde el archivo"
msgid "reload selected styles from file"
-msgstr "Recargar los estilos seleccionados desde un archivo"
+msgstr "Recargar los estilos seleccionados desde el archivo"
msgid "Save as..."
msgstr "Guardar como…"
@@ -7530,105 +7548,6 @@ msgid "Select only changesets related to a specific bounding box"
msgstr ""
"Selecciona los conjuntos de cambios relativos a un recuadro de selección"
-msgid "Query open changesets only"
-msgstr "Consultar sólo en las modificaciones abiertas"
-
-msgid "Query closed changesets only"
-msgstr "Consultar sólo en las modificaciones cerradas"
-
-msgid "Query both open and closed changesets"
-msgstr "Consultar en las modificaciones abiertas y cerradas"
-
-msgid "Only changesets owned by myself"
-msgstr "Sólo modificaciones realizadas por mí"
-
-msgid "User ID:"
-msgstr "ID de usuario:"
-
-msgid "User name:"
-msgstr "Nombre de usuario:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Sólo modificaciones realizadas por el usuario con el siguiente ID"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-"Sólo modificaciones realizadas por el usuario con el siguiente nombre"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Sólo modificaciones realizadas por mí (no disponible. Ahora mismo JOSM se "
-"está ejecutando por un usuario anónimo)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"No se puede restringir la consulta del conjunto de cambios al usuario actual "
-"debido a que el mismo es anónimo"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "El valor actual \"{0}\" no es válido para la ID de usuario"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"No es posible restringir la consulta del conjunto de cambios al nombre de "
-"usuario \"{0}\""
-
-msgid "Please enter a valid user ID"
-msgstr "Por favor, introduzca un ID de usuario válido"
-
-msgid "Invalid user ID"
-msgstr "ID de usuario inválido"
-
-msgid "Please enter a non-empty user name"
-msgstr "Por favor, introduzca un nombre de usuario no vacío"
-
-msgid "Invalid user name"
-msgstr "Nombre de usuario inválido"
-
-msgid "Date: "
-msgstr "Fecha: "
-
-msgid "Time:"
-msgstr "Hora:"
-
-msgid "Closed after - "
-msgstr "Cerrado después de - "
-
-msgid "Date:"
-msgstr "Fecha:"
-
-msgid "Created before - "
-msgstr "Creado antes de - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Sólo las modificaciones cerradas después de la fecha/hora siguiente"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-"Sólo las modificaciones cerradas después y creadas antes de una fecha/hora "
-"determinada"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"No se puede construir una petición de un conjunto de cambios con "
-"restricciones de tiempo. La entrada no es válida."
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr ""
-"<html>Por favor, introduzca valores de fecha/hora válidos para<br> "
-"restringir la consulta a un rango de tiempo determinado.</html>"
-
-msgid "Invalid date/time values"
-msgstr "Valores de fecha/hora inválidos"
-
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
"invalid."
@@ -7647,29 +7566,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Ventana de selección inválida"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"El valor actual no es una ID de usuario válida. Por favor, introduzca un "
-"valor entero mayor que cero"
-
-msgid "Please enter an integer value > 0"
-msgstr "Por favor, introduzca un valor entero > 0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Por favor, introduzca la fecha en el formato habitual de su "
-"zona.<br>Ejemplo: {0}<br>Ejemplo: {1}<br>Ejemplo: {2}<br>Ejemplo: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Introduzca la hora en el formato habitual de su zona.<br>Ejemplo: "
-"{0}<br>Ejemplo: {1}<br>Ejemplo: {2}<br>Ejemplo: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Descargar sólo mis modificaciones"
@@ -7765,6 +7661,78 @@ msgstr "URL de consulta de modificaciones incorrecta"
msgid "Close the dialog and abort querying of changesets"
msgstr "Cerrar el cuadro de diálogo y abortar la consulta de modificaciones"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Por favor, introduzca la fecha en el formato habitual de su "
+"zona.<br>Ejemplo: {0}<br>Ejemplo: {1}<br>Ejemplo: {2}<br>Ejemplo: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Consultar sólo en las modificaciones abiertas"
+
+msgid "Query closed changesets only"
+msgstr "Consultar sólo en las modificaciones cerradas"
+
+msgid "Query both open and closed changesets"
+msgstr "Consultar en las modificaciones abiertas y cerradas"
+
+msgid "Date: "
+msgstr "Fecha: "
+
+msgid "Time:"
+msgstr "Hora:"
+
+msgid "Closed after - "
+msgstr "Cerrado después de - "
+
+msgid "Date:"
+msgstr "Fecha:"
+
+msgid "Created before - "
+msgstr "Creado antes de - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Sólo las modificaciones cerradas después de la fecha/hora siguiente"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+"Sólo las modificaciones cerradas después y creadas antes de una fecha/hora "
+"determinada"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"No se puede construir una petición de un conjunto de cambios con "
+"restricciones de tiempo. La entrada no es válida."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Por favor, introduzca valores de fecha/hora válidos para<br> "
+"restringir la consulta a un rango de tiempo determinado.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Valores de fecha/hora inválidos"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Introduzca la hora en el formato habitual de su zona.<br>Ejemplo: "
+"{0}<br>Ejemplo: {1}<br>Ejemplo: {2}<br>Ejemplo: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"El valor actual no es una ID de usuario válida. Por favor, introduzca un "
+"valor entero mayor que cero"
+
+msgid "Please enter an integer value > 0"
+msgstr "Por favor, introduzca un valor entero > 0"
+
msgid "URL: "
msgstr "URL: "
@@ -7785,6 +7753,56 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "La URL de consulta de modificaciones no es válida"
+msgid "Only changesets owned by myself"
+msgstr "Sólo modificaciones realizadas por mí"
+
+msgid "User ID:"
+msgstr "ID de usuario:"
+
+msgid "User name:"
+msgstr "Nombre de usuario:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Sólo modificaciones realizadas por el usuario con el siguiente ID"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+"Sólo modificaciones realizadas por el usuario con el siguiente nombre"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Sólo modificaciones realizadas por mí (no disponible. Ahora mismo JOSM se "
+"está ejecutando por un usuario anónimo)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"No se puede restringir la consulta del conjunto de cambios al usuario actual "
+"debido a que el mismo es anónimo"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "El valor actual \"{0}\" no es válido para la ID de usuario"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"No es posible restringir la consulta del conjunto de cambios al nombre de "
+"usuario \"{0}\""
+
+msgid "Please enter a valid user ID"
+msgstr "Por favor, introduzca un ID de usuario válido"
+
+msgid "Invalid user ID"
+msgstr "ID de usuario inválido"
+
+msgid "Please enter a non-empty user name"
+msgstr "Por favor, introduzca un nombre de usuario no vacío"
+
+msgid "Invalid user name"
+msgstr "Nombre de usuario inválido"
+
msgid "Activate"
msgstr "Activar"
@@ -9006,6 +9024,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9089,9 +9110,10 @@ msgid ""
"Click <strong>{0}</strong> to load them now.<br>If necessary JOSM will "
"create conflicts which you can resolve in the Conflict Resolution Dialog."
msgstr ""
-"Haga click en <strong>{0}</strong> para enviarlos al servidor ahora. Si es "
-"necesario, JOSM creará conflictos que podrá resolver en el Diálogo de "
-"Resolución de Conflictos."
+"Haga clic en \"<strong>{0}</strong>\" para descarga ahora las geometrías que "
+"entrar en conflicto con las existentes en el servidor de OSM. JOSM mostrará "
+"los conflictos detectados en el panel \"Conflictos\" desde donde los podrá "
+"resolver."
msgid "Object still in use"
msgstr "El objeto todavía está en uso."
@@ -9134,7 +9156,7 @@ msgid "Enter a source"
msgstr "Introduzca una fuente"
msgid "Changeset id:"
-msgstr "id del conjunto de cambios:"
+msgstr "ID del conjunto de cambios:"
msgid "Created at:"
msgstr "Creado el:"
@@ -9376,7 +9398,7 @@ msgid "Launch a file chooser to select a file"
msgstr "Lanza un diálogo para seleccionar un archivo"
msgid "Select filename"
-msgstr "Seleccione nombre de fichero"
+msgstr "Seleccione nombre de archivo"
msgid "Open Recent"
msgstr "Abrir reciente"
@@ -9431,11 +9453,11 @@ msgid_plural ""
msgstr[0] ""
"<html>La capa {0} necesita ser guardada pero no tiene archivo "
"asociado.<br>Seleccione un archivo para esta capa o descarte los "
-"cambios.<br>Capa sin fichero:</html>"
+"cambios.<br>Capa sin un archivo:</html>"
msgstr[1] ""
"<html>Las capas {0} necesitan ser guardadas pero no tienen archivos "
"asociados.<br>Seleccione un archivo para cada capa o descarte los "
-"cambios.<br>Capas sin fichero:</html>"
+"cambios.<br>Capas sin un archivo:</html>"
msgid "Unsaved data and missing associated file"
msgstr "Datos sin guardar y pérdida de archivo asociado"
@@ -9451,11 +9473,11 @@ msgid_plural ""
msgstr[0] ""
"<html>La capa {0} necesita ser guardada pero no tiene un archivo "
"asociado<br>que no puede ser escrito.<br>Seleccione otro archivo para esta "
-"capa o descarte los cambios.<br>Capa con un fichero de sólo lectura:</html>"
+"capa o descarte los cambios.<br>Capa con un archivo de sólo lectura:</html>"
msgstr[1] ""
"<html>Las capas {0} necesitan ser guardadas pero no tienen archivos "
"asociados<br>que puedan ser escritos.<br>Seleccione otro archivo para cada "
-"capa o descarte los cambios.<br>Capas con un fichero de sólo lectura:</html>"
+"capa o descarte los cambios.<br>Capas con un archivo de sólo lectura:</html>"
msgid "Unsaved data non-writable files"
msgstr "Datos sin guardar de archivos no modificables"
@@ -9629,11 +9651,10 @@ msgid ""
"change, you will make life<br />easier for many other mappers."
msgstr ""
"No ha especificado la fuente de origen de sus cambios. Esto está permitido "
-"técnicamente, pero esta información ayuda a otros usuarios a entender de "
-"donde proceden esos los datos (conocimiento local, ortofoto, etc.). \r\n"
-"<br/> \r\n"
-"Si usted dedica unos segundos a explicar sus cambios facilitará enormemente "
-"la labor de otros colaboradores de OpenStreetMap."
+"técnicamente, pero esta información ayuda a otros<br /> usuarios a entender "
+"de donde proceden esos datos (conocimiento local, ortofoto, etc.). .<br "
+"/><br />Si usted dedica unos segundos a explicar sus cambios facilitará "
+"enormemente la labor de otros colaboradores de OpenStreetMap."
msgid "Revise"
msgstr "Revisar"
@@ -9707,8 +9728,8 @@ msgstr ""
msgid "The changeset is <strong>left open</strong> after this upload"
msgstr ""
-"El conjunto de cambios está <strong>parcialmente abierto</strong> después de "
-"esta subida"
+"El conjunto de cambios ha <strong>quedado abierto</strong> después de esta "
+"subida"
msgid "configure changeset"
msgstr "configurar conjunto de cambios"
@@ -10694,6 +10715,9 @@ msgstr "Dirección"
msgid "Velocity, {0}"
msgstr "Velocidad, {0}"
+msgid "Wave Audio files (*.wav)"
+msgstr "archivos Wave Audio (*.wav)"
+
msgid "Import Audio"
msgstr "Importar audio"
@@ -10709,9 +10733,6 @@ msgstr ""
msgid "Import not possible"
msgstr "No es posible importar"
-msgid "Wave Audio files (*.wav)"
-msgstr "archivos Wave Audio (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Marcadores de audio desde {0}"
@@ -10825,18 +10846,6 @@ msgstr "(La URL era: "
msgid "Select the map painting styles"
msgstr "Seleciones Estilo de MAPa de imagenes"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-"Error al cargar los estilos Mappaint desde ''{0}''. La excepción fue: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-"JOSM ya no admite estilos de representación cartográfica escritos en el "
-"viejo formato XML .\n"
-"Por favor, actualice '' {0} '' a MapCSS"
-
msgid "loading style ''{0}''..."
msgstr "cargando estilo ''{0}''..."
@@ -10854,6 +10863,10 @@ msgstr[1] ""
"en el menú emergente al pulsar con el botón derecho del ratón para más "
"detalles."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+"Error al cargar los estilos Mappaint desde ''{0}''. La excepción fue: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
"Error al deserializar los estilos Mappaint desde ''{0}''. El error fue: {1}"
@@ -10874,8 +10887,8 @@ msgid ""
"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
"to use the Access Token in this JOSM session only.</html>"
msgstr ""
-"<html>Seleccione para almacenar llave de Acceso en las preferencias de "
-"JOSM.<br>Desmarque para usar la llave de Acceso únicamente en esta sesión de "
+"<html>Seleccione para almacenar llave de acceso en las preferencias de "
+"JOSM.<br>Desmarque para usar la llave de acceso únicamente en esta sesión de "
"JOSM.</html>"
msgid "Use default settings"
@@ -10891,7 +10904,7 @@ msgid "Request Token URL:"
msgstr "URL de solicitud de Llave"
msgid "Access Token URL:"
-msgstr "URL de Llave de Acceso"
+msgstr "URL de llave de acceso"
msgid "Authorize URL:"
msgstr "URL de Autorización:"
@@ -10938,9 +10951,9 @@ msgid ""
"Token.</html>"
msgstr ""
"<html>Ejecutar un procedimiento totalmente automático para obtener una llave "
-"de acceso del sitio web OSM.<br>JOSM accede al sitio OSM a través del "
-"usuario JOSM y<br>autoriza total y automáticamente el usuario y descarga una "
-"llave de acceso.</html>"
+"de acceso del sitio web de OSM.<br>JOSM accede al sitio de OSM a través del "
+"usuario de JOSM y<br>autorizar total y automáticamente al usuario y "
+"descargar una llave de acceso.</html>"
msgid ""
"<html>Run a semi-automatic procedure to get an access token from the OSM "
@@ -10959,7 +10972,7 @@ msgid ""
"<html>Enter an Access Token manually if it was generated and retrieved "
"outside<br>of JOSM.</html>"
msgstr ""
-"<html>Introducir una llave de Acceso manualmente si fue generada y "
+"<html>Introducir una llave de acceso manualmente si fue generada y "
"descargada fuera<br>de JOSM.</html>"
msgid ""
@@ -10986,16 +10999,16 @@ msgid "Advanced OAuth properties"
msgstr "Propiedades avanzadas de OAuth"
msgid "Accept Access Token"
-msgstr "Aceptar llave de Acceso"
+msgstr "Aceptar llave de acceso"
msgid ""
"<html>You have successfully retrieved an OAuth Access Token from the OSM "
"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
"in subsequent requests to gain access to the OSM API.</html>"
msgstr ""
-"<html>Ha obtenido una llave de Acceso OAuth del sitio OSM. Presione en "
+"<html>Ha obtenido una llave de acceso OAuth del sitio OSM. Presione en "
"<strong>{0}</strong> para aceptar la llave. JOSM la usará en solicitudes "
-"posteriores para acceder al API OSM.</html>"
+"posteriores para acceder al API de OSM.</html>"
msgid "Authorize now"
msgstr "Autorizar ahora"
@@ -11011,7 +11024,7 @@ msgid "Run the automatic authorization steps again"
msgstr "Volver a ejecutar los pasos automáticos de autorización"
msgid "Test Access Token"
-msgstr "Probar llave de Acceso"
+msgstr "Probar llave de acceso"
msgid "Please enter your OSM password"
msgstr "Por favor, introduzca su contraseña de OSM"
@@ -11029,7 +11042,7 @@ msgid ""
"OSM server failed.<br><br>Please try again or choose another kind of "
"authorization process,<br>i.e. semi-automatic or manual authorization.</html>"
msgstr ""
-"<html>El proceso automático de obtener una llave de Acceso OAuth<br> del "
+"<html>El proceso automático de obtener una llave de acceso OAuth<br> del "
"servidor OSM falló.<br><br>Por favor, inténtelo de nuevo o elija otro "
"esquema de autorización,<br>por ejemplo, autorización semi automática o "
"manual.</html>"
@@ -11053,7 +11066,7 @@ msgid ""
"OSM server failed. JOSM failed to log into {0}<br>for user "
"{1}.<br><br>Please check username and password and try again.</html>"
msgstr ""
-"<html>Falló el proceso automático de obtener una llave de Acceso "
+"<html>Falló el proceso automático de obtener una llave de acceso "
"OAuth<br>del servidor OSM para acceder a {0}<br>para el usuario {1}. "
"<br><br>Por favor, revise el nombre de usuario y la contraseña e inténtelo "
"de nuevo.</html>"
@@ -11072,7 +11085,7 @@ msgid "Advanced OAuth parameters"
msgstr "Parámetros Avanzados de OAuth"
msgid "Enter the OAuth Access Token"
-msgstr "Introduzca la Llave de Acceso OAuth"
+msgstr "Introduzca la llave de acceso OAuth"
msgid "Enter advanced OAuth properties"
msgstr "Ingresar propiedades avanzadas de OAuth"
@@ -11081,30 +11094,30 @@ msgid ""
"<html><body>Please enter an OAuth Access Token which is authorized to access "
"the OSM server ''{0}''.</body></html>"
msgstr ""
-"<html><body>Por favor introduzca una llave de Acceso OAuth que esté "
+"<html><body>Por favor introduzca una llave de acceso OAuth que esté "
"autorizada para acceder al servidor OSM \"{0}\".</body></html>"
msgid "Please enter an Access Token Key"
-msgstr "Por favor, introduzca una Llave de Acceso"
+msgstr "Por favor, introduzca una llave de acceso"
msgid ""
"The Access Token Key must not be empty. Please enter an Access Token Key"
msgstr ""
"La llave de Acceso no puede estar vacía. Por favor ingrese una llave de "
-"Acceso"
+"acceso"
msgid "Please enter an Access Token Secret"
-msgstr "Por favor ingrese llave de Acceso secreta"
+msgstr "Por favor ingrese llave de acceso secreta"
msgid ""
"The Access Token Secret must not be empty. Please enter an Access Token "
"Secret"
msgstr ""
-"La llave de Acceso secreta no puede estar en blanco. Por favor, introduzca "
-"una llave de Acceso secreta"
+"La llave de acceso secreta no puede estar vacía. Por favor, introduzca una "
+"llave de acceso secreta"
msgid "Click to test the Access Token"
-msgstr "Presione para probar la llave de Acceso"
+msgstr "Presione para probar la llave de acceso"
msgid ""
"With OAuth you grant JOSM the right to upload map data and GPS tracks on "
@@ -11126,7 +11139,7 @@ msgstr ""
"consumidor en los <i>parámetros Avanzados de OAuth</i>."
msgid "Get an Access Token for ''{0}''"
-msgstr "Obtener una llave de Acceso para \"{0}\""
+msgstr "Obtener una llave de acceso para \"{0}\""
msgid "Close the dialog and cancel authorization"
msgstr "Cerrar el diálogo y cancelar autorización"
@@ -11220,11 +11233,11 @@ msgid "Select to grant JOSM the right to modify notes on your behalf"
msgstr "Seleccione para garantizar a JOSM que modificará notas de su parte."
msgid "Retrieving OAuth Access Token..."
-msgstr "Obteniendo llave de Acceso OAuth..."
+msgstr "Obteniendo llave de acceso OAuth..."
msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
msgstr ""
-"<html>Falló la descarga de una llave de Acceso OAuth de \"{0}\".</html>"
+"<html>Falló la descarga de una llave de acceso OAuth de \"{0}\".</html>"
msgid "Request Failed"
msgstr "Solicitud fallida"
@@ -11252,10 +11265,10 @@ msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
msgstr "<html>Paso 1/3: Descarga de Llave de Solicitud OAuth</html>"
msgid "<html>Step 2/3: Authorize and retrieve an Access Token</html>"
-msgstr "<html> Paso 2/3: Autorizar y descargar llave de Acceso</html>"
+msgstr "<html> Paso 2/3: Autorizar y descargar llave de acceso</html>"
msgid "Request Access Token"
-msgstr "Solicitar llave de Acceso"
+msgstr "Solicitar llave de acceso"
msgid ""
"<html>JOSM successfully retrieved a Request Token. JOSM is now launching an "
@@ -11298,19 +11311,19 @@ msgid "Retrieve Access Token"
msgstr "Obtener Llave de Solicitud de Acceso"
msgid "Click to retrieve an Access Token"
-msgstr "Presione para obtener llave de Acceso"
+msgstr "Haga clic para obtener la llave de acceso"
msgid "Testing OAuth Access Token"
-msgstr "Probando Llave de Acceso OAuth"
+msgstr "Probando la llave de acceso OAuth"
msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
msgstr ""
-"Fue rechazada la descarga de detalles de usuario con la Llave de Acceso "
+"Fue rechazada la descarga de detalles de usuario con la llave de acceso "
"\"{0}\""
msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden."
msgstr ""
-"No está permitida la obtención de detalles usuarios con la llave de Acceso "
+"No está permitida la obtención de detalles usuarios con la llave de acceso "
"\"{0}\"."
msgid ""
@@ -11346,10 +11359,10 @@ msgid ""
"nevertheless use it<br>to upload data, upload GPS traces, and/or access "
"other protected resources.</html>"
msgstr ""
-"<html>El servidor OSM \"{0}\" conoce la llave de Acceso \"{1}\".<br>Falló la "
-"prueba de obtener detalles de usuarios para esta llave,aunque, <br> "
+"<html>El servidor OSM \"{0}\" conoce la llave de acceso \"{1}\".<br>Falló la "
+"prueba de obtener detalles de usuarios para esta llave, aunque, <br> "
"dependiendo de qué permisos tenga esta llave, podrá usarla para<br>subir "
-"datos, trazas y/o acceder a oros recursos protegidos.</html>"
+"datos, trazas y/o acceder a otros recursos protegidos.</html>"
msgid "Token allows restricted access"
msgstr "La llave permite acceso restringido"
@@ -11362,7 +11375,7 @@ msgid ""
msgstr ""
"<html>Fallo al obtener información acerca del usuario actual del servidor "
"OSM \"{0}\".<br>Esto probablemente no es un problema causado al probar la "
-"llave de Acceso, <br>puede ser un problema de configuración del servidor. "
+"llave de acceso, <br>puede ser un problema de configuración del servidor. "
"Revise cuidadosamente la<br>URL del servidor y su conexión a Internet.</html>"
msgid ""
@@ -11985,10 +11998,10 @@ msgid "Force lines if no segments imported"
msgstr "Forzar líneas si no hay segmentos importados"
msgid "Draw large GPS points"
-msgstr "Dibuja grandes los puntos GPS"
+msgstr "Aumentar el tamaño de dibujado de los puntos GPS"
msgid "Draw a circle from HDOP value"
-msgstr "Dibuja un círculo a partir del valor HDOP"
+msgstr "Dibujar círculos en función del valor HDOP"
msgid "Velocity (red = slow, green = fast)"
msgstr "Velocidad (rojo=lento, verde=rápido)"
@@ -12004,6 +12017,9 @@ msgstr ""
msgid "Track date"
msgstr "Fecha de la traza"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Color único (puede ser personalizado para las capas seleccionadas)"
@@ -12016,6 +12032,18 @@ msgstr "Bicicleta"
msgid "Foot"
msgstr "A pie"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Bosque natural"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Crear marcadores al leer el archivo GPX"
@@ -12028,6 +12056,9 @@ msgstr "Gama de colores dinámica basada en los límites de los datos"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Gráficos GPX suavizados (antialiasing)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -12064,7 +12095,7 @@ msgstr ""
"información de la línea."
msgid "Draw direction arrows for lines, connecting GPS points."
-msgstr "Dibujar flechas de dirección en las líneas que conectan puntos gps."
+msgstr "Dibujar flechas de dirección en las líneas que conectan puntos GPS."
msgid ""
"Draw the direction arrows using table lookups instead of complex math."
@@ -12082,7 +12113,9 @@ msgid "Minimum distance (pixels)"
msgstr "Distancia mínima en píxeles"
msgid "Draw a circle from HDOP value."
-msgstr "Dibuja un círculo a partir del valor HDOP."
+msgstr ""
+"Dibuja un círculo que varía de acuerdo a la incertidumre en el "
+"posicionamiento GPS."
msgid "Draw larger dots for the GPS points."
msgstr "Dibujar más grandes los puntos gps."
@@ -12091,7 +12124,7 @@ msgid "Width of drawn GPX line (0 for default)"
msgstr "Ancho de la línea GPX dibujada (0 por omisión)"
msgid "Drawing width of GPX lines"
-msgstr "Dibujar el ancho de las líneas GPX"
+msgstr "Ancho de dibujado de las líneas GPX"
msgid ""
"Apply antialiasing to the GPX lines resulting in a smoother appearance."
@@ -12100,6 +12133,11 @@ msgstr ""
"menos definidos."
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -12123,11 +12161,18 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "Puntos de color y segmentos de rutas por su fecha y hora."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
"Permitir ajustar el color de la traza según las diferentes velocidades "
"medias."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Coloreado de traza y punto"
@@ -12153,7 +12198,7 @@ msgid "Show splash screen at startup"
msgstr "Mostrar pantalla de bienvenida al inicio"
msgid "Show object ID in selection lists"
-msgstr "Mostrar el ID del objeto en las listas de selección"
+msgstr "Mostrar el identificador del objeto en las listas de selección"
msgid "Show localized name in selection lists"
msgstr "Mostrar nombre localizado en listas de selección"
@@ -12169,8 +12214,8 @@ msgstr "Mostrar las fechas en formato ISO"
msgid "Use native file choosers (nicer, but do not support file filters)"
msgstr ""
-"Utiliza selector de archivos nativos (se ven mejor pero no soportan filtros "
-"de archivo)"
+"Utilizar selector de archivos nativos (mejor visualización pero no soportan "
+"filtros de archivo)"
msgid "Reverse zoom with mouse wheel"
msgstr "Zoom inverso con la rueda del ratón"
@@ -12205,7 +12250,7 @@ msgid ""
"Use file choosers that behave more like native ones. They look nicer but do "
"not support some features like file filters"
msgstr ""
-"Utiliza selector de archivos que se comporta de forma más similar a los "
+"Utilizar selector de archivos que se comporta de forma más similar a los "
"nativos. Lucen mejor pero no soportan algunas características como los "
"filtros de archivos"
@@ -12493,8 +12538,8 @@ msgid ""
"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
"the file name and saves it in the same folder.)</i>"
msgstr ""
-"<i>(JOSM puede mantener los ficheros de respaldo cuando se guardan las capas "
-"de dato. Añade al final del nombre del fichero \"~\" guardándolo en el mismo "
+"<i>(JOSM puede mantener los archivos de respaldo cuando se guardan las capas "
+"de dato. Añade al final del nombre del archivo \"~\" guardándolo en el mismo "
"directorio.)</i>"
msgid "Notification at each save"
@@ -13210,30 +13255,30 @@ msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
"Please authorize first."
msgstr ""
-"No tiene acceso a la llave de Acceso para acceder al servidor OSM usando "
+"No tiene acceso la llave de acceso para acceder al servidor OSM usando "
"OAuth. Por favor autorícelo primero."
msgid ""
"You already have an Access Token to access the OSM server using OAuth."
msgstr ""
-"Usted ya tiene una llave de Acceso para acceder al servidor OSM usando OAuth"
+"Usted ya tiene una llave de acceso para acceder al servidor OSM usando OAuth"
msgid "Click to step through the OAuth authorization process"
msgstr "Seleccione para seguir los pasos del proceso de autorización OAuth"
msgid "New Access Token"
-msgstr "Nueva llave de Acceso"
+msgstr "Nueva llave de acceso"
msgid ""
"Click to step through the OAuth authorization process and generate a new "
"Access Token"
msgstr ""
-"Seleccione para seguir los pasos del proceso de autorización OAuth y generar "
-"una nueva llave de Acceso"
+"Haga clic para seguir los pasos del proceso de autorización OAuth y generar "
+"una nueva llave de acceso"
msgid "Click test access to the OSM server with the current access token"
msgstr ""
-"Seleccione probar acceso al servidor OSM con la llave de Acceso actual"
+"Haga clic probar el acceso al servidor OSM con la llave de acceso actual"
msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
msgstr ""
@@ -13455,6 +13500,12 @@ msgstr "Verifica que no haya errores en objetos religiosos"
msgid "Checks for errors on relations"
msgstr "Verifica que no haya errores en las relaciones"
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr "Etiquetas innecesarias"
@@ -14008,7 +14059,7 @@ msgstr "No se pudieron importar archivos."
msgid "<html>Could not read file ''{0}''.<br>Error is:<br>{1}</html>"
msgstr ""
-"<html>No se pudo leer el fichero \"{0}\".<br>El error es:<br>{1}</html>"
+"<html>No se pudo leer el archivo \"{0}\".<br>El error es:<br>{1}</html>"
msgid "<html>Could not read files.<br>Error is:<br>{0}</html>"
msgstr ""
@@ -14629,6 +14680,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Guardar nombre de usuario y contraseña (sin cifrar)"
+msgid "Assume"
+msgstr "Asumir"
+
+msgid "Existing values"
+msgstr "Valores existentes"
+
msgid "<delete from {0} objects>"
msgstr "<eliminar desde {0} objetos>"
@@ -14650,12 +14707,6 @@ msgstr "Añadir las etiquetas verificadas a los objetos seleccionados"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Mayús+Enter: añade todas las etiquetas a los objetos seleccionados"
-msgid "Assume"
-msgstr "Asumir"
-
-msgid "Existing values"
-msgstr "Valores existentes"
-
msgid "Enable the checkbox to accept the value"
msgstr "Permitir que la casilla de verificación acepte el valor"
@@ -14848,7 +14899,7 @@ msgstr ""
"GPX. Se esperaba: 0.1"
msgid "File name expected for layer no. {0}"
-msgstr "Se esperaba un nombre de fichero para la capa nº {0}"
+msgstr "Se esperaba un nombre de archivo para la capa nº {0}"
msgid ""
"Version ''{0}'' of meta data for imagery layer is not supported. Expected: "
@@ -14886,11 +14937,11 @@ msgid "Unsupported scheme ''{0}'' in URI ''{1}''."
msgstr "Esquema no soportado ''{0}'' en la URI ''{1}''."
msgid "Unexpected root element ''{0}'' in session file"
-msgstr "Elemento raíz ''{0}'' inesperado en el fichero de sesión"
+msgstr "Elemento raíz ''{0}'' inesperado en el archivo de sesión"
msgid "Version ''{0}'' of session file is not supported. Expected: 0.1"
msgstr ""
-"La versión ''{0}'' del fichero de sesión no está soportada. Se esperaba 0.1"
+"La versión ''{0}'' del archivo de sesión no está soportada. Se esperaba 0.1"
msgid "missing mandatory attribute ''index'' for element ''layer''"
msgstr "falta el atributo ''index'' obligatorio para el elemento ''layer''"
@@ -15280,10 +15331,10 @@ msgid "Reading local plugin information.."
msgstr "Leyendo la información del complemento local..."
msgid "Processing plugin site cache files..."
-msgstr "Procesando ficheros de caché del sitio del complemento..."
+msgstr "Procesando archivos de caché del sitio del complemento..."
msgid "Processing file ''{0}''"
-msgstr "Procesando fichero \"{0}\""
+msgstr "Procesando archivo \"{0}\""
msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
@@ -15357,10 +15408,10 @@ msgid ""
"configured.<br>Please open the Preferences Dialog and generate or enter an "
"Access Token.</html>"
msgstr ""
-"<html>Fallo al autenticar en el servidor OSM \"{0}\".<br>Está usando OAuth "
-"para autenticarse pero ahora mismo no hay<br> una lleva de Acceso OAuth "
+"<html>Fallo al autenticarse en el servidor OSM \"{0}\".<br>Está usando OAuth "
+"para autentificarse pero ahora mismo no existe<br> una llave de acceso OAuth "
"configurada.<br>Por favor abra el diálogo de preferencias y genere o "
-"introduzca un llave de Acceso.</html>"
+"introduzca un llave de acceso.</html>"
msgid ""
"<strong>Failed</strong> to delete <strong>node {0}</strong>. It is still "
@@ -15862,6 +15913,9 @@ msgstr "Añadiendo certificado localhost de JOSM a {0} almacén de claves."
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr "Conflicto de atajo silencioso: ''{0}'' movido por ''{1}'' a ''{2}''."
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "Esta etiqueta {0} fue encontrada en el búfer, esto es sospechoso!"
@@ -16267,37 +16321,37 @@ msgid "Create New Folder"
msgstr "Crear Nuevo Directorio"
msgid "Delete File"
-msgstr "Borrar Fichero"
+msgstr "Eliminar archivo"
msgid "Enter file name:"
-msgstr "Ingrese nombre de fichero:"
+msgstr "Introduzca nombre de archivo:"
msgid "Enter path or folder name:"
-msgstr "Ingrese ruta del fichero:"
+msgstr "Introduzca la ruta del archivo:"
msgid "Error "
msgstr "Error "
msgid "Error renaming file \"{0}\" to \"{1}\""
-msgstr "Error al renombrar fichero \"{0}\" a \"{1}\""
+msgstr "Error al renombrar el archivo \"{0}\" a \"{1}\""
msgid "File name:"
-msgstr "Nombre de fichero:"
+msgstr "Nombre del archivo:"
msgid "File Name:"
-msgstr "Nombre de Fichero:"
+msgstr "Nombre del archivo:"
msgid "FileChooser help."
-msgstr "Ayuda de elección de fichero"
+msgstr "Ayuda de FileChooser"
msgid "Files"
-msgstr "Ficheros"
+msgstr "Archivos"
msgid "Files of type:"
-msgstr "Ficheros de tipo:"
+msgstr "Archivos de tipo:"
msgid "Files of Type:"
-msgstr "Ficheros de tipo:"
+msgstr "Archivos del tipo:"
msgid "Filter:"
msgstr "Filtro:"
@@ -16321,16 +16375,16 @@ msgid "New Folder"
msgstr "Nuevo Directorio"
msgid "Open selected file"
-msgstr "Abrir fichero seleccionado"
+msgstr "Abrir el archivo seleccionado"
msgid "Open selected file."
-msgstr "Abrir fichero seleccionado."
+msgstr "Abrir el archivo seleccionado."
msgid "Rename File"
-msgstr "Renombrar fichero"
+msgstr "Renombrar archivo"
msgid "Rename file \"{0}\" to"
-msgstr "Renombrar fichero \"{0}\" a"
+msgstr "Renombrar el archivo \"{0}\" a"
msgid "Save in:"
msgstr "Guardar en:"
@@ -16339,7 +16393,7 @@ msgid "Save In:"
msgstr "Guardar en:"
msgid "Save selected file."
-msgstr "Almacenar fichero seleccionado."
+msgstr "Almacenar el archivo seleccionado."
msgid "Selection:"
msgstr "Selección:"
@@ -16395,14 +16449,17 @@ msgstr "Imagen Satelital Mapbox"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr "OpenSeaMap"
-msgid "OpenStreetMap Carto (Standard layer)"
-msgstr "OpenStreetMap Carto (estilo estándar)"
+msgid "OpenStreetMap Carto (Standard)"
+msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik blanco y negro)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, sin etiquetas)"
@@ -16425,8 +16482,11 @@ msgstr "Ciclismo & Montañismo"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Cambodia, Laos, Thailand, Vietnam bilingüe"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr "Camboya, Laos, Tailandia, Vietnam, Myanmar bilingüe"
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (superposición)"
@@ -16476,8 +16536,8 @@ msgstr "OSM Inspector: Lugares"
msgid "OSM Inspector: Highways"
msgstr "OSM Inspector: Caminos"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM Inspector: Multipolígono"
+msgid "OSM Inspector: Area"
+msgstr ""
msgid "OSM Inspector: Routing"
msgstr "OSM Inspector: Enrutamiento"
@@ -16485,11 +16545,23 @@ msgstr "OSM Inspector: Enrutamiento"
msgid "OSM Inspector: Addresses"
msgstr "OSM Inspector: Direcciones"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM Inspector: Límites (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
-msgid "IGN Argentina (WMTS)"
-msgstr "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
+msgstr ""
msgid "IGN Argentina (WMS)"
msgstr "IGN Argentina (WMS)"
@@ -16524,6 +16596,12 @@ msgstr "Límites administrativos de Bosques Estatales de LPI NSW"
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr "Límites administrativos de Reservas NPWS de LPI NSW"
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -16569,11 +16647,17 @@ msgstr "VoGIS: Flächenwidmungsplan"
msgid "VoGIS: Höhen und Gelände"
msgstr "VoGIS: Alturas y terrenos"
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
-msgstr "AGIV (Flandes) - Imágenes aéreas más recientes (invierno)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
+msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
-msgstr "AGIV - Imágenes aéreas de 10cm 2013-15"
+msgid "AGIV Flanders GRB"
+msgstr ""
msgid "URBISfr numerical imagery (2013)"
msgstr "Imágenes aéreas numéricas de URBISfr (2013)"
@@ -16608,8 +16692,17 @@ msgstr "SPW(solitario) 2009-2010 imágenes aéreas"
msgid "TEC bus lines (2014)"
msgstr "Líneas de transporte urbano TEC (2014)"
-msgid "Benin:cotonou_pleiade_2016"
-msgstr "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
msgid "IBGE Mapa de Setores Urbanos"
msgstr "IBGE Mapa de Sectores Urbanos"
@@ -16617,6 +16710,15 @@ msgstr "IBGE Mapa de Sectores Urbanos"
msgid "IBGE Mapa de Setores Rurais"
msgstr "IBGE Mapa de Sectores Rurales"
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Hidrografía Geobase"
@@ -16629,12 +16731,34 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "Mosaico de Columbia Británica"
+msgid "Latest southwest British Columbia Landsat"
+msgstr ""
+
msgid "Kelowna 2012"
msgstr "Kelowna 2012"
msgid "Kelowna Roads overlay"
msgstr "Superposición de callejero de Kelowna"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr ""
+
msgid "Czech CUZK:KM"
msgstr "Chequia CUZK:KM"
@@ -16671,6 +16795,12 @@ msgstr "Stevns (Dinamarca)"
msgid "Vejmidte (Denmark)"
msgstr "Vejmidte (Dinamarca)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Mapa base de Estonia (Maaamet)"
@@ -16704,9 +16834,6 @@ msgstr "Catastro"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr "CRAIG - Auvergne 2013 - 25 cm"
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Alpes-Marítimos 2009 - 40 cm"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "GrandNancy Ortografía 2012"
@@ -16764,9 +16891,6 @@ msgid ""
msgstr ""
"Vercors - Reserva natural de Hauts-Plateaux du Vercors - Ortofotos 1999 - 1 m"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (idioma sorabo)"
-
msgid "Hamburg (40 cm)"
msgstr "Hamburgo (40 cm)"
@@ -16794,9 +16918,6 @@ msgstr "Berlin fotografía aérea 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Berlín - Fotografías aéreas de 2016"
-msgid "Stuttgart (aerial imagery)"
-msgstr "Imágenes aéreas de Stuttgart"
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Erlangen - Imágenes aéreas (2016 5.0 cm)"
@@ -16832,9 +16953,54 @@ msgstr "NRW-Atlas: Mapa topográfico 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Área metropolitana de Rurh: Luftbilder (10 cm)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Imágenes aéreas de drones (Haití)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Avión no tripulado Imágenes 2014 (Haití)"
@@ -16871,14 +17037,8 @@ msgstr "Inundación del Danubio ortofoto de 2013"
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Línea costera del Danubio en Budapestt, Szentendre y Szigetmonostor"
-msgid "Budapest district XII ortophoto 2013"
-msgstr "Ortofoto 2013 de Distrito XII de Budapest"
-
-msgid "Interspect Budapest ortophoto 2014"
-msgstr "Interspect Budapest ortofoto 2014"
-
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
-msgstr "Cinco distritos de Budapest: III, IV, XIII, XIV, XV"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Hungría (rutas de senderismo)"
@@ -16886,6 +17046,21 @@ msgstr "OpenStreetMap Hungría (rutas de senderismo)"
msgid "Hillshade Hungary"
msgstr "Sombreado (hillshade) en Hungría"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Oficina de Guerra de Irlanda del Norte 1:25k GSGS 3906"
@@ -16946,9 +17121,21 @@ msgstr "PCN 2012 - Italia"
msgid "South Tyrol Orthofoto 2011"
msgstr "Tirol Sur Ortofoto 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr "Tirol Sur Topomapa"
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "URSS - Letonia"
@@ -16982,12 +17169,34 @@ msgstr "Delta del Níger Oct 2012"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard - Ortofoto de 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Franja de Gaza - Pléyades - 2014/07/06"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Franja de Gaza - Pléyades - 2014/07/06 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Pangasinán/Bulacan (Alta resolución Filipinas)"
@@ -17114,9 +17323,6 @@ msgstr "Świętochłowice: Ortofotomapa 2012 (imagen aérea)"
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Zabrze: Ortofotomapa 2011 (imagen aérea)"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Szlaki (caminos)"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr "Breslavia: ortofotomapa de 2015 (imagen aérea)"
@@ -17126,6 +17332,20 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk vehículo"
@@ -17147,12 +17367,30 @@ msgstr "RABA-KGZ: Eslovenia - Uso agrícola"
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr "RABA-KGZ: Eslovenia - Área urbanizada"
-msgid "City of Cape Town 2015 Aerial"
+msgid "City of Cape Town 2013 Aerial"
msgstr ""
+msgid "City of Cape Town 2015 Aerial"
+msgstr "Ciudad de Cabo 2015 Aérea"
+
msgid "South Africa CD:NGI Aerial"
msgstr "Sudáfrica CD:NGI Aérea"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr "Catastro de España"
@@ -17174,6 +17412,9 @@ msgstr "IDEIB - Islas Baleares"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Expresa - Islas Canarias"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Cantón Aargau 25cm (AGIS 2011)"
@@ -17217,6 +17458,9 @@ msgstr "Cantón de Friburgo 50cm (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Ciudad de Berna 10cm/25cm (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Orthofoto Yverdon-les-Bains 25cm (2007)"
@@ -17238,6 +17482,12 @@ msgstr "Bonvillars Ortofoto 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Fiez Ortofoto 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr "Datos abiertos Taiwan e-Map"
@@ -17253,6 +17503,9 @@ msgstr "Datos del Departamento de Tierras de Taiwán"
msgid "NLSC Open Data WMTS"
msgstr "NLSC Open Data WMTS"
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "MSR Mapas Topográficos"
@@ -17280,9 +17533,54 @@ msgstr "NC Últimas Ortoimágenes"
msgid "U.S. Forest Service roads"
msgstr "Callejero del servicio de Bosques de EEUU"
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ucrania - Ortofotomapas 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr "Ucrania - Kiev 2014 (DZK)"
@@ -17304,9 +17602,6 @@ msgstr "Surrey Investigación de Aire"
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-pulgadas Escocia 1842-82"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr "NLS - OS Serie de Condados 1888-1913 6 pulgadas"
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k Primera Serie 1937-61"
@@ -17316,9 +17611,6 @@ msgstr "NLS - OS 1-pulgada Séptima Serie 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr "NLS - OS 25-pulgadas (Escocia) 1892-1905"
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25k histórica (OSM-Óptima)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "OS 1:25k histórico (OSM-Limitado)"
@@ -17661,8 +17953,8 @@ msgstr "Descargar datos nuevos al desplazarse o cambiar el zoom"
msgid "Create a grid of ways."
msgstr "Crea una cuadrícula de viales"
-msgid "Customization of public transport stops."
-msgstr "Personalización de las paradas de transporte público."
+msgid "Customization of public public transport stops."
+msgstr ""
msgid ""
"Creating and handling address nodes and buildings within Czech Republic."
@@ -17775,6 +18067,9 @@ msgstr "Sencilla herramienta para etiquetar números de policía."
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "Genera imágenes XML a partir de los límites de un multipolígono"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18331,7 +18626,7 @@ msgstr "No vehículo de ruedas"
msgctxt "riding"
msgid "horse_riding"
-msgstr ""
+msgstr "equitación"
msgctxt "riding"
msgid "pitch"
@@ -20320,6 +20615,9 @@ msgstr "Arroyo o riachuelo"
msgid "River"
msgstr "Río"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Canal"
@@ -20974,7 +21272,7 @@ msgid "Type 2 (Mennekes)"
msgstr "Tipo 2 (Mennekes)"
msgid "Type 2 Combo"
-msgstr "Combo Tipo 2"
+msgstr "CCS Combo Tipo 2"
msgid "Type 3 (SCAME)"
msgstr "Tipo 3 (SCAME)"
@@ -21319,7 +21617,7 @@ msgid "Taxiway"
msgstr "Pista de rodaje"
msgid "Holding Position"
-msgstr ""
+msgstr "Posición de espera"
msgid "Helipad"
msgstr "Pista de aterrizaje de helicópteros"
@@ -21378,6 +21676,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr "Pensión / Cama y desayuno"
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Cabaña o bungalow"
@@ -21444,6 +21748,12 @@ msgstr "Mesas al aire libre"
msgid "Takeaway"
msgstr "Comida para llevar"
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Establecimiento de comida rápida"
@@ -21996,7 +22306,7 @@ msgid "Emergency Phone Number"
msgstr "Número de teléfono de emergencia"
msgid "(Use number as shown on plate.)"
-msgstr ""
+msgstr "(Usar número como se muestra en la placa.)"
msgid "Veterinary"
msgstr "Veterinario"
@@ -22392,31 +22702,19 @@ msgstr "guarida de observación de vida salvaje"
msgid "Hunting Stand"
msgstr "Apostadero de caza"
-msgid "Height"
-msgstr "Altura"
-
-msgctxt "height"
-msgid "low"
-msgstr "baja"
-
-msgctxt "height"
-msgid "half"
-msgstr "media"
-
-msgctxt "height"
-msgid "full"
-msgstr "completa"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr "Apostadero"
-msgid "Lock"
-msgstr "Esclusa"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr "Punto de agua"
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr "Aire comprimido"
@@ -22678,7 +22976,7 @@ msgid "freeride"
msgstr "pista libre (freeride)"
msgid "Grooming"
-msgstr "estilo de superficie"
+msgstr "Entrenamiento"
msgctxt "piste:grooming"
msgid "classic"
@@ -22890,7 +23188,7 @@ msgstr "universidad"
msgctxt "building"
msgid "college"
-msgstr ""
+msgstr "universidad"
msgctxt "building"
msgid "hospital"
@@ -23008,6 +23306,10 @@ msgid "hut"
msgstr "cabaña"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr "habitación"
@@ -24303,6 +24605,9 @@ msgstr "Carnicería"
msgid "Seafood"
msgstr "Pescadería o marisquería"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Delicatessen"
@@ -25125,9 +25430,6 @@ msgstr "Fila de árboles"
msgid "A line of trees."
msgstr "Una hilera de árboles."
-msgid "Wood"
-msgstr "Bosque natural"
-
msgid "Woodland where timber production does not dominate use."
msgstr "Área forestada donde la producción de leña no domina el uso."
@@ -25899,7 +26201,7 @@ msgid "national"
msgstr "nacional"
msgid "local"
-msgstr ""
+msgstr "local"
msgid "Mountain Biking Route"
msgstr "Ruta de ciclismo de montaña"
@@ -26116,6 +26418,8 @@ msgid ""
"Object has no {0}, however, it has {1} and {2} whose value looks like a "
"housenumber."
msgstr ""
+"El objeto no tiene {0}, sin embargo, tiene {1} y {2} cuyos valores parecen "
+"ser números de portal."
msgid "Same value of {0} and {1}"
msgstr "El mismo valor que {0} y {1}"
@@ -26124,7 +26428,7 @@ msgid "{0} without {1}"
msgstr "{0} sin {1}"
msgid "missing tag"
-msgstr ""
+msgstr "etiqueta perdida"
msgid "{0} without {1} or {2}"
msgstr "{0} sin {1} o {2}"
@@ -26204,6 +26508,9 @@ msgstr "Diferente número de carriles en las claves {0} y {1}"
msgid "possibly missing {0} tag"
msgstr "posible etiqueta {0} faltante"
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0} está obsoleto"
@@ -26309,11 +26616,17 @@ msgid "{0} is deprecated. Use the {1}: key prefix instead."
msgstr "{0} está en desuso. Utilice en su lugar el prefijo clave {1}."
msgid "questionable key (ending with a number)"
-msgstr ""
+msgstr "clave dudosa (termina con un número)"
msgid "The key {0} has an uncommon value."
msgstr "La clave {0} tiene un valor poco común."
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} sobre un nodo. Debería ser utilizado sobre una vía."
@@ -26394,6 +26707,11 @@ msgstr "Línea de costa hacia adentro {1}"
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} debería estar en el nodo donde {1} y {2} se intersectan"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "nombre de calle abreviado"
@@ -26418,6 +26736,9 @@ msgstr "{0} se utiliza con {1}"
msgid "street name contains ss"
msgstr "nombre de calle contiene ss"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -26862,10 +27183,10 @@ msgid "Can not save preferences"
msgstr "No se puede guardar las preferencias"
msgid "Epsilon multiplier"
-msgstr "Multiplicador Épsilon"
+msgstr "Multiplicador épsilon"
msgid "Starting Epsilon"
-msgstr "Épsilon Inicial"
+msgstr "Épsilon inicial"
msgid "Max points count per 1 km"
msgstr "Máximo número de puntos contabilizados para 1 km"
@@ -26889,13 +27210,13 @@ msgid "Snap to nodes"
msgstr "Ajustar al nodo"
msgid "Add fixed points on click"
-msgstr "Añadir puntos fijos con click"
+msgstr "Añadir puntos fijos con el clic del ratón"
msgid "Add fixed points on spacebar"
-msgstr "Añadir puntos fijos con barra espaciadora"
+msgstr "Añadir puntos fijos con la barra espaciadora"
msgid "Allow edit existing ways"
-msgstr "Permite editar caminos existentes"
+msgstr "Permitir editar las vías existentes"
msgid "Draw closed polygons only"
msgstr "Dibujar únicamente polígonos cerrados"
@@ -27238,6 +27559,16 @@ msgstr "Enviar el conjunto de cambios actual"
msgid "Submit the current changeset to Mapillary"
msgstr "Enviar el conjunto de cambios actual a Mapillary"
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr "Subir fotos"
@@ -27280,8 +27611,8 @@ msgstr "Abrir el conjunto de cambios de Mapillary actual"
msgid "Mapillary changeset"
msgstr "Conjunto de cambios de Mapillary"
-msgid "Submit"
-msgstr "Enviar"
+msgid "Submitting changeset to server…"
+msgstr ""
msgid "Export all images"
msgstr "Exportar todas las imágenes"
@@ -27433,7 +27764,7 @@ msgstr ""
"siguiente/anterior."
msgid "Preview images when hovering its icon"
-msgstr "Vista previa de imágenes cuando el mouse está en su icono"
+msgstr "Vista previa de imágenes cuando el cursor se sitúa sobre el icono"
msgid "Login"
msgstr "Acceder"
@@ -28210,6 +28541,9 @@ msgstr ""
msgid "Area Selector"
msgstr "Selector de Área"
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr "Área creada"
@@ -28257,11 +28591,9 @@ msgid "Algorithm"
msgstr "Algoritmo"
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
-"Píxeles máximos que un punto puede estar alejado de una línea y todavía ser "
-"considerado como un miembro de esta línea (Por defecto: {0})."
msgid "Distance Tolerance"
msgstr "Distancia de tolerancia"
@@ -28458,26 +28790,26 @@ msgid ""
"Error loading file.\n"
"Probably an old version of the cache file."
msgstr ""
-"Error al cargar el fichero.\n"
-"Probablemente una versión antigua de caché del fichero."
+"Error al cargar el archivo.\n"
+"Probablemente esté producido por una versión antigua de la caché del archivo."
msgid "Lambert Zone {0} cache file (.{0})"
-msgstr "Zona Lambert {0} fichero de caché (.{0})"
+msgstr "Zona Lambert {0} archivo de caché (.{0})"
msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
msgstr "Lambert CC9 Zone {0} cache file (.CC{0})"
msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
-msgstr "Fichero de Caché Guadeloupe Fort-Marigot (.UTM1)"
+msgstr "Archivo de caché Guadeloupe Fort-Marigot (.UTM1)"
msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
-msgstr "Fichero de Caché Guadeloupe Ste-Anne (.UTM2)"
+msgstr "Archivo de caché Guadeloupe Ste-Anne (.UTM2)"
msgid "Martinique Fort Desaix cache file (.UTM3)"
-msgstr "Fichero de Caché Martinique Fort Desaix(.UTM3)"
+msgstr "Archivo de caché Martinique Fort Desaix(.UTM3)"
msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "Fichero de Caché Reunion RGR92 (.UTM4)"
+msgstr "Archivo de caché Reunion RGR92 (.UTM4)"
msgid "CadastreGrabber: Illegal url."
msgstr "CadastreGrabber: URL Ilegal."
@@ -28876,8 +29208,8 @@ msgstr ""
msgid ""
"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-"El fichero seleccionado {0} no es un fichero de caché de este "
-"plugin(extensión inválida)"
+"El archivo seleccionado {0} no es un archivo de caché de este componente "
+"(extensión inválida)"
msgid "The location {0} is already on screen. Cache not loaded."
msgstr "El lugar {0} ya está en la pantalla. No se carga caché."
@@ -30004,6 +30336,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Abrir archivo de XML de imagen aérea"
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr "Capa de Calibración"
@@ -30295,7 +30686,7 @@ msgid "Indoor Mapping Helper"
msgstr "Asistente para el cartografiado de interiores"
msgid "POWER"
-msgstr "ENERGÍA"
+msgstr "COMENZAR"
msgid "Activates the plug-in"
msgstr "Activa el componente"
@@ -30334,9 +30725,9 @@ msgid ""
"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
"management.</html>"
msgstr ""
-"<Html> Tenga en cuenta que debe comenzar ajustando la imagen del plano del "
-"edificio. <br> Para ello utilice el componente PicLayer, el cual puede "
-"instalar utilizando el gestor de componentes del JOSM. </ Html>"
+"<html>Tenga en cuenta que debe comenzar ajustando la imagen del plano del "
+"edificio.<br>Para ello utilice el componente PicLayer, el cual puede "
+"instalar utilizando el gestor de componentes de JOSM. </html>"
msgid "Level Selection"
msgstr "Selección de nivel"
@@ -31812,8 +32203,8 @@ msgstr "Escribir coordenadas en el encabezado de la imagen"
msgid ""
"Write position information into the exif header of the following files:"
msgstr ""
-"Escribir información de posición en el encabezado exif de los siguientes "
-"ficheros:"
+"Escribir información de posición en el encabezado EXIF de los siguientes "
+"archivos:"
msgid "settings"
msgstr "configuración"
@@ -31822,7 +32213,7 @@ msgid "keep backup files"
msgstr "mantener archivos de respaldo"
msgid "change file modification time:"
-msgstr "cambiar hora de modificación del fichero:"
+msgstr "cambiar hora de modificación del archivo:"
msgid "to gps time"
msgstr "a hora gps"
@@ -31834,7 +32225,7 @@ msgid "Photo Geotagging Plugin"
msgstr "Plugin para geolocalización de fotografías"
msgid "Writing position information to image files..."
-msgstr "Escribiendo información de posición a ficheros de imágenes..."
+msgstr "Escribiendo información de posición a los archivos de imágenes..."
msgid "Could not read mtime."
msgstr "No se pudo leer mtime."
@@ -31843,10 +32234,10 @@ msgid "Could not write mtime."
msgstr "No se pudo escribir mtime."
msgid "File could not be deleted!"
-msgstr "¡No se pudo eliminar el fichero!"
+msgstr "¡No se pudo eliminar el archivo!"
msgid "Could not rename file!"
-msgstr "¡No se pudo renombrar el fichero!"
+msgstr "¡No se pudo renombrar el archivo!"
msgid "Could not rename file {0} to {1}!"
msgstr "¡No se pudo renombrar el archivo {0} a {1}!"
@@ -31866,7 +32257,7 @@ msgid "Override"
msgstr "Sobrescribir"
msgid "Could not delete temporary file!"
-msgstr "¡No se pudo borrar fichero temporal!"
+msgstr "¡No se pudo borrar archivo temporal!"
msgid "Test failed: Could not read mtime."
msgstr "La prueba falló: No se pudo leer el mtime."
@@ -31969,10 +32360,10 @@ msgid "Load Picture Calibration..."
msgstr "Cargar calibración de imágenes..."
msgid "Loads calibration data from a file"
-msgstr "Carga datos de calibración de un fichero"
+msgstr "Cargar datos de calibración desde un archivo"
msgid "Loading file failed: {0}"
-msgstr "Falló la carga del fichero: {0}"
+msgstr "Falló la carga del archivo: {0}"
msgid "Problem occurred"
msgstr "Ocurrió un problema"
@@ -31996,10 +32387,10 @@ msgid "Save Picture Calibration..."
msgstr "Guardar calibración de imagen..."
msgid "Saves calibration data to a file"
-msgstr "Guardar los datos de calibración a un fichero"
+msgstr "Guardar los datos de calibración a un archivo"
msgid "Saving file failed: {0}"
-msgstr "Fallo al almacenar fichero: {0}"
+msgstr "Fallo al grabar el archivo: {0}"
msgid "New picture layer from clipboard"
msgstr "Nueva capa de imágenes desde el portapapeles"
@@ -32108,7 +32499,7 @@ msgid "PicLayer: {0}"
msgstr "PicLayer: {0}"
msgid "Calibration Files"
-msgstr "Calibrar ficheros"
+msgstr "Calibrar archivos"
msgid "Could not find the map object."
msgstr "No se encontró el objeto mapa."
@@ -32124,7 +32515,7 @@ msgstr "Los datos del portapapeles no son una imagen"
msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
-"Advertencia: Fallo al manipular fichero zip \"{0}\". La excepción fue: {1}"
+"Advertencia: Fallo al manipular el archivo zip \"{0}\". La excepción fue: {1}"
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr "Se encontró un archivo de calibración asociado a la imagen: {0}\n"
@@ -32352,9 +32743,6 @@ msgstr "PT: La ruta debe empezar y terminar con una posición de parada"
msgid "PT: First or last way needs to be split"
msgstr "PT: Es necesario dividir la primera o última vía"
-msgid "PT: Problem in the route segment"
-msgstr "PT: Problema en el segmento de ruta"
-
msgid "PT: Stop not served"
msgstr "PT: Parada no operativa"
@@ -32523,9 +32911,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr "[interrupción]"
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "Patrones de ruta..."
@@ -32583,6 +32968,9 @@ msgstr "lado de la mano izquierda"
msgid "Maximum distance from route"
msgstr "Distancia máxima desde el itinerario"
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "Transporte público: cambiar tipo de parada"
@@ -32785,11 +33173,6 @@ msgstr "Reconstruir polígono"
msgid "Multipolygon must consist only of ways"
msgstr "El multipolígono debe estar compuesto únicamente de vías"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-"La reconstrucción de polígonos puede ser hecha únicamente a partir de vías "
-"exteriores"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Reconstruir polígonos a partir de la relación {0}"
@@ -32848,7 +33231,7 @@ msgid "Way platform without ''platform'' role found"
msgstr "Se encontró una plataforma vía sin el rol ''platform''."
msgid "Revert changeset fully"
-msgstr "Revertir conjunto de cambios en su totalidad"
+msgstr "Revertir el conjunto de cambios en su totalidad"
msgid "Revert selection only"
msgstr "Revertir únicamente selección"
@@ -33588,7 +33971,7 @@ msgstr ""
"Seleccionar y acercar todos los elementos sin marcar en la lista por hacer."
msgid "Pass"
-msgstr ""
+msgstr "Pasar"
msgid "Moves on to the next item but leaves this item in the todo list. ([)."
msgstr ""
@@ -33841,13 +34224,13 @@ msgid "Export sigs..."
msgstr "Exportar firmas..."
msgid "Export all signatures to XML file."
-msgstr "Exportar todas las firmas a un fichero XML."
+msgstr "Exportar todas las firmas a un archivo XML."
msgid "Export sigs to XML..."
msgstr "Exportar firmas a XML..."
msgid "Save Signatures file"
-msgstr "Guardar fichero de firmas"
+msgstr "Guardar archivo de firmas"
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
@@ -33993,10 +34376,10 @@ msgid "Selected WaySegment was:"
msgstr "El SegmentoVía selecciado era:"
msgid "Signature Files"
-msgstr "Ficheros de firmas"
+msgstr "Archivo de firmas"
msgid "OSM Signature Files"
-msgstr "Ficheros de firmas OSM"
+msgstr "Archivo de firmas OSM"
msgid "Only digits allowed in osmid: ''{0}''."
msgstr "Se admiten dígitos únicamente en osmid: \"{0}\"."
diff --git a/i18n/po/et.po b/i18n/po/et.po
index 2392c84..2719a98 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
"PO-Revision-Date: 2016-01-02 11:25+0000\n"
"Last-Translator: AivoK <aivo.kuhlberg at hot.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: 2016-11-07 04:42+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:45+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: et\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr "Loon peamenüüd"
msgid "Help"
msgstr "Abi"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Lähtestan OSM API"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Lähtestan validaatori"
@@ -206,6 +212,12 @@ msgid ""
msgstr ""
"Pane valitud elemendid kaardil ülal asuvasse valitud objektide nimekirja."
+msgid "Select WMS layers"
+msgstr "Vali WMS-kihid"
+
+msgid "Add layers"
+msgstr "Lisa kihte"
+
msgid "Add imagery layer {0}"
msgstr "Lisa aluskaart {0}"
@@ -227,12 +239,6 @@ msgstr "Viga"
msgid "Select image format for WMS layer"
msgstr "Vali WMS kihi pildivorming"
-msgid "Select WMS layers"
-msgstr "Vali WMS-kihid"
-
-msgid "Add layers"
-msgstr "Lisa kihte"
-
msgid "Add Node..."
msgstr "Lisa sõlm..."
@@ -732,6 +738,9 @@ msgstr "Hüppa asukohta"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Avab dialoogi, mis võimaldab hüpata määratud asukohta"
+msgid "Jump to Position"
+msgstr "Hüppa asukohta"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Sisesta koordinaadid, kuhu hüpata."
@@ -753,9 +762,6 @@ msgstr "Viide"
msgid "Jump there"
msgstr "Hüppa sinna"
-msgid "Jump to Position"
-msgstr "Hüppa asukohta"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Ei suutnud eraldada laiuskraadi, pikkuskraadi või suurendusastet. Palun "
@@ -810,6 +816,9 @@ msgstr "Liida kihid"
msgid "Merge the current layer into another layer"
msgstr "Liida aktiivne kiht teise kihiga"
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -963,24 +972,30 @@ msgstr[1] "Avan {0} faili..."
msgid "Opening file ''{0}'' ..."
msgstr "Avan faili ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Ok"
+
msgid "Open Location..."
msgstr "Ava asukoht..."
msgid "Open an URL."
msgstr "Ava URL"
-msgid "Separate Layer"
-msgstr "Eralda kiht."
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Vali, kas andmed tuleb alla laadida uude kihti"
-
msgid "Enter URL to download:"
msgstr "Sisesta link, kust alla laadida."
msgid "Enter an URL from where data should be downloaded"
msgstr "Sisesta URL, kust andmeid laadida."
+msgid "Separate Layer"
+msgstr "Eralda kiht."
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Vali, kas andmed tuleb alla laadida uude kihti"
+
msgid "Download Location"
msgstr "Allalaadimise koht"
@@ -996,12 +1011,6 @@ msgstr "Sule dialoogiaken ja katkesta allalaadimine"
msgid "Download Data"
msgstr "Andmete allalaadimine"
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr "Ok"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1818,9 +1827,6 @@ msgstr ""
msgid "Errors during download"
msgstr "Viga allalaadimisel"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr "GPS allalaadimine"
@@ -4039,9 +4045,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr "Liitalal pole välist teed"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -4071,12 +4074,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr "Liitala pole suletud"
-msgid "Multipolygon inner way is outside"
-msgstr "Liitala sisemine tee on väljaspool"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "Liitala teede ristumine"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr "Liitala sisemine tee on väljaspool"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4769,12 +4787,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4791,8 +4815,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5113,9 +5137,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5254,82 +5275,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr "Atribuudid"
-
-msgid "Tags"
-msgstr "Sildid"
-
-msgid "Nodes"
-msgstr "Sõlmed"
-
-msgid "Members"
-msgstr "Liikmed"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr "Atribuudid (konfliktidega)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5495,6 +5440,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr "Atribuudid"
+
+msgid "Tags"
+msgstr "Sildid"
+
+msgid "Nodes"
+msgstr "Sõlmed"
+
+msgid "Members"
+msgstr "Liikmed"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr "Atribuudid (konfliktidega)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5554,7 +5575,7 @@ msgstr "Roll"
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6930,116 +6951,30 @@ msgstr "Laadi alla muutuskogum OSM serverist"
msgid "Update content"
msgstr "Uuenda sisu"
-msgid "Update the changeset content from the OSM server"
-msgstr "Värskenda muutuskogumit OSM serverist"
-
-msgid "Changeset ID: "
-msgstr "Muutuskogumi ID: "
-
-msgid "Enter a changeset id"
-msgstr "Sisesta muutuskogumi id"
-
-msgid ""
-"Download the changeset with the specified id, including the changeset content"
-msgstr ""
-
-msgid "Select changesets owned by specific users"
-msgstr ""
-
-msgid "Select changesets depending on whether they are open or closed"
-msgstr ""
-
-msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr ""
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr ""
-
-msgid "Query open changesets only"
-msgstr ""
-
-msgid "Query closed changesets only"
-msgstr ""
-
-msgid "Query both open and closed changesets"
-msgstr ""
-
-msgid "Only changesets owned by myself"
-msgstr ""
-
-msgid "User ID:"
-msgstr ""
-
-msgid "User name:"
-msgstr ""
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr ""
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-
-msgid "Please enter a valid user ID"
-msgstr ""
-
-msgid "Invalid user ID"
-msgstr ""
-
-msgid "Please enter a non-empty user name"
-msgstr ""
-
-msgid "Invalid user name"
-msgstr "Vigane kasutajanimi"
-
-msgid "Date: "
-msgstr ""
-
-msgid "Time:"
-msgstr ""
-
-msgid "Closed after - "
-msgstr ""
-
-msgid "Date:"
-msgstr ""
+msgid "Update the changeset content from the OSM server"
+msgstr "Värskenda muutuskogumit OSM serverist"
-msgid "Created before - "
-msgstr ""
+msgid "Changeset ID: "
+msgstr "Muutuskogumi ID: "
-msgid "Only changesets closed after the following date/time"
+msgid "Enter a changeset id"
+msgstr "Sisesta muutuskogumi id"
+
+msgid ""
+"Download the changeset with the specified id, including the changeset content"
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Select changesets owned by specific users"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Select changesets depending on whether they are open or closed"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Select changesets based on the date/time they have been created or closed"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Select only changesets related to a specific bounding box"
msgstr ""
msgid ""
@@ -7055,25 +6990,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"Praegune väärtus ei ole õige kasutaja ID. Palun sisesta nullist suurem "
-"täisarvuline väärtus."
-
-msgid "Please enter an integer value > 0"
-msgstr ""
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-
msgid "Download my changesets only"
msgstr "Laadi alla ainult minu muutuskogumid"
@@ -7157,6 +7073,68 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid "Query open changesets only"
+msgstr ""
+
+msgid "Query closed changesets only"
+msgstr ""
+
+msgid "Query both open and closed changesets"
+msgstr ""
+
+msgid "Date: "
+msgstr ""
+
+msgid "Time:"
+msgstr ""
+
+msgid "Closed after - "
+msgstr ""
+
+msgid "Date:"
+msgstr ""
+
+msgid "Created before - "
+msgstr ""
+
+msgid "Only changesets closed after the following date/time"
+msgstr ""
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+
+msgid "Invalid date/time values"
+msgstr ""
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"Praegune väärtus ei ole õige kasutaja ID. Palun sisesta nullist suurem "
+"täisarvuline väärtus."
+
+msgid "Please enter an integer value > 0"
+msgstr ""
+
msgid "URL: "
msgstr ""
@@ -7174,6 +7152,49 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Only changesets owned by myself"
+msgstr ""
+
+msgid "User ID:"
+msgstr ""
+
+msgid "User name:"
+msgstr ""
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr ""
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr ""
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+
+msgid "Please enter a valid user ID"
+msgstr ""
+
+msgid "Invalid user ID"
+msgstr ""
+
+msgid "Please enter a non-empty user name"
+msgstr ""
+
+msgid "Invalid user name"
+msgstr "Vigane kasutajanimi"
+
msgid "Activate"
msgstr "Aktiveeri"
@@ -8295,6 +8316,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9819,6 +9843,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr "Heli import"
@@ -9831,9 +9858,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9932,14 +9956,6 @@ msgstr "(URL oli: "
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9952,6 +9968,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10947,6 +10966,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10959,6 +10981,18 @@ msgstr "Jalgratas"
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Mets"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10971,6 +11005,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11030,6 +11067,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11048,9 +11090,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12267,6 +12316,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13316,6 +13371,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Salvesta kasutaja ja salasõna (krüpteerimata)"
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13337,12 +13398,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14333,6 +14388,9 @@ msgstr "JOSM localhost sertifikaadi lisamine {0} võtmehoidlasse"
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14823,13 +14881,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14853,7 +14914,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14904,7 +14968,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14913,10 +14977,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14952,6 +15028,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14997,10 +15079,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -15033,34 +15121,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -15099,6 +15227,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -15132,9 +15266,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -15191,9 +15322,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15221,9 +15349,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15257,9 +15382,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15296,19 +15466,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15371,9 +15550,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15407,12 +15598,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15539,9 +15752,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15551,6 +15761,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15572,12 +15796,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15599,6 +15841,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15641,6 +15886,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15662,6 +15910,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15677,6 +15931,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15704,9 +15961,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15728,9 +16030,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15740,9 +16039,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -16054,7 +16350,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr "Loo teede võrgustik."
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -16144,6 +16440,9 @@ msgstr "Lihtne töövahend majanumbrite märkimiseks"
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18547,6 +18846,9 @@ msgstr "Oja"
msgid "River"
msgstr "Jõgi"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -19595,6 +19897,12 @@ msgstr "Motell"
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19661,6 +19969,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Kiirtoit"
@@ -20604,31 +20918,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr "Jahikantsel"
-msgid "Height"
-msgstr "Kõrgus"
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
-msgstr "Lukusta"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -21220,6 +21522,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22513,6 +22819,9 @@ msgstr "Lihunik"
msgid "Seafood"
msgstr "Mereannid"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Delikatessid"
@@ -23326,9 +23635,6 @@ msgstr "Puuderivi"
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr "Mets"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24373,6 +24679,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24464,6 +24773,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24540,6 +24855,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24564,6 +24884,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25337,6 +25660,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25379,7 +25712,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -26192,6 +26525,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26233,8 +26569,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27835,6 +28171,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Ava aluskaardi XML-fail"
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -30007,9 +30402,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -30167,9 +30559,6 @@ msgstr ""
msgid "[gap]"
msgstr "[lünk]"
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -30227,6 +30616,9 @@ msgstr "vasakul pool"
msgid "Maximum distance from route"
msgstr "Suurim kaugus marsruudist"
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30424,9 +30816,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/eu.po b/i18n/po/eu.po
index 65d422b..d7b5924 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:35+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:38+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: eu\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr "Menu nagusia eraikitzen"
msgid "Help"
msgstr "Laguntza"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "OSM API hasieratzen"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Balioztatzailea hasieratzen"
@@ -206,6 +212,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr "Hautatu WMS geruzak"
+
+msgid "Add layers"
+msgstr "Gehitu geruzak"
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -227,12 +239,6 @@ msgstr "Errorea"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr "Hautatu WMS geruzak"
-
-msgid "Add layers"
-msgstr "Gehitu geruzak"
-
msgid "Add Node..."
msgstr "Nodoa gehitu..."
@@ -724,6 +730,9 @@ msgstr ""
"Kokagune jakin bateraino jauzi egiten lagunduko digun elkarrizketa bat "
"zabalduko du"
+msgid "Jump to Position"
+msgstr "Jauzi posiziora"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Sar ezazu posiziora jauzi egiteko Lat/Lon"
@@ -745,9 +754,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Jauzi hara"
-msgid "Jump to Position"
-msgstr "Jauzi posiziora"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Ezin izan da latitudea, longitudea edo zooma analizatu. Mesedez begira ezazu "
@@ -800,6 +806,9 @@ msgstr "Geruza bateratu"
msgid "Merge the current layer into another layer"
msgstr "Uneko geruza beste geruza batetan bateratu"
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -953,24 +962,30 @@ msgstr[1] "Fitxategi hauek irekitzen: {0}"
msgid "Opening file ''{0}'' ..."
msgstr "''{0}'' fitxategia zabaltzen..."
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid "Open Location..."
msgstr "Ireki helbidea..."
msgid "Open an URL."
msgstr "Ireki URL-a."
-msgid "Separate Layer"
-msgstr "Geruza banatu"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Aukeratu hau, datuak kapa berri batean deskargatu nahi badituzu"
-
msgid "Enter URL to download:"
msgstr "Sartu deskargatu nahi duzun URL-a"
msgid "Enter an URL from where data should be downloaded"
msgstr "Sartu datuak deskargatu behar direneko URL-a"
+msgid "Separate Layer"
+msgstr "Geruza banatu"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Aukeratu hau, datuak kapa berri batean deskargatu nahi badituzu"
+
msgid "Download Location"
msgstr "Kokapena deskargatu"
@@ -986,12 +1001,6 @@ msgstr "Elkarrizketa-koadroa itxi eta deskarga utzi"
msgid "Download Data"
msgstr "Datuak deskargatu"
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1833,9 +1842,6 @@ msgstr ""
msgid "Errors during download"
msgstr "Deskarga iraun duen bitartean errore batzuk detektatu dira"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -4088,9 +4094,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -4120,12 +4123,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4834,12 +4852,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr "aukera hauek Java-ren sistema propietate moduan ematen dira"
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4856,8 +4880,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5187,9 +5211,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5330,86 +5351,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr "Nirea eta Beraiena"
-
-msgid "My with Merged"
-msgstr "Nirea eta Bildua"
-
-msgid "Their with Merged"
-msgstr "Beraiena eta Bildua"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "{0} rola ez dago konparatzen ari garen bikotean: {1}."
-
-msgid "Properties"
-msgstr "Propietateak"
-
-msgid "Tags"
-msgstr "Etiketak"
-
-msgid "Nodes"
-msgstr "Nodoak"
-
-msgid "Members"
-msgstr "Kideak"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Ez dago konpondu beharreko etiketa gatazkarik"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Etiketak (gatazka {0})"
-msgstr[1] "Etiketak ({0} gatazka)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "Etiketa gatazka {0} konpontzeke"
-msgstr[1] "{0} etiketa gatazka konpontzeke"
-
-msgid "Nodes(resolved)"
-msgstr "Nodoak (konponduta)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Elkartutako nodoen zerrenda izoztua. Bide honen nodo zerrendan ez dago "
-"konpontzeko gatazkarik."
-
-msgid "Nodes(with conflicts)"
-msgstr "Nodoak (gatazkekin)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Bide honetako nodo zerrendan gatazkak daude oraindik"
-
-msgid "Members(resolved)"
-msgstr "Kideak (konponduta)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Batutako kide zerrenda izoztua. Jadanik ez dago erlazio honen kideen arteko "
-"gatazkarik"
-
-msgid "Members(with conflicts)"
-msgstr "Kideak (gatazkekin)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Erlazio honen kideen arteko konpondu gabeko gatazkak"
-
-msgid "No pending property conflicts"
-msgstr "Ez dago propietateen gatazkarik"
-
-msgid "Properties(with conflicts)"
-msgstr "Propietateak (gatazkekin)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Konpondu beharreko propietateen gatazkak"
-
-msgid "Conflict Resolution"
-msgstr "Gatazkaren konponbidea"
-
msgid "{0} more..."
msgstr "{0} gehiago..."
@@ -5589,6 +5530,86 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Beraien bertsioa (elementu {0})"
msgstr[1] "Beraien bertsioa ({0} elementu)"
+msgid "My with Their"
+msgstr "Nirea eta Beraiena"
+
+msgid "My with Merged"
+msgstr "Nirea eta Bildua"
+
+msgid "Their with Merged"
+msgstr "Beraiena eta Bildua"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "{0} rola ez dago konparatzen ari garen bikotean: {1}."
+
+msgid "Properties"
+msgstr "Propietateak"
+
+msgid "Tags"
+msgstr "Etiketak"
+
+msgid "Nodes"
+msgstr "Nodoak"
+
+msgid "Members"
+msgstr "Kideak"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Ez dago konpondu beharreko etiketa gatazkarik"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Etiketak (gatazka {0})"
+msgstr[1] "Etiketak ({0} gatazka)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "Etiketa gatazka {0} konpontzeke"
+msgstr[1] "{0} etiketa gatazka konpontzeke"
+
+msgid "Nodes(resolved)"
+msgstr "Nodoak (konponduta)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Elkartutako nodoen zerrenda izoztua. Bide honen nodo zerrendan ez dago "
+"konpontzeko gatazkarik."
+
+msgid "Nodes(with conflicts)"
+msgstr "Nodoak (gatazkekin)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Bide honetako nodo zerrendan gatazkak daude oraindik"
+
+msgid "Members(resolved)"
+msgstr "Kideak (konponduta)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Batutako kide zerrenda izoztua. Jadanik ez dago erlazio honen kideen arteko "
+"gatazkarik"
+
+msgid "Members(with conflicts)"
+msgstr "Kideak (gatazkekin)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Erlazio honen kideen arteko konpondu gabeko gatazkak"
+
+msgid "No pending property conflicts"
+msgstr "Ez dago propietateen gatazkarik"
+
+msgid "Properties(with conflicts)"
+msgstr "Propietateak (gatazkekin)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Konpondu beharreko propietateen gatazkak"
+
+msgid "Conflict Resolution"
+msgstr "Gatazkaren konponbidea"
+
msgid "Node"
msgstr "Nodoa"
@@ -5650,9 +5671,8 @@ msgstr "Rola"
msgid "Primitive"
msgstr "Primitiboa"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"Batutako nodoak ez daude oraindik izoztuta. Ezin dugu ebazpen komandoa eraiki"
msgid "<undefined>"
msgstr "<definitu gabea>"
@@ -7016,122 +7036,36 @@ msgstr "itxita"
msgid "Download content"
msgstr "Edukia jaitsi"
-msgid "Download the changeset content from the OSM server"
-msgstr ""
-
-msgid "Update content"
-msgstr "Edukia eguneratu"
-
-msgid "Update the changeset content from the OSM server"
-msgstr ""
-
-msgid "Changeset ID: "
-msgstr "Aldaketa-multzoaren IDa: "
-
-msgid "Enter a changeset id"
-msgstr "Eman aldaketa-multzoaren IDa"
-
-msgid ""
-"Download the changeset with the specified id, including the changeset content"
-msgstr ""
-
-msgid "Select changesets owned by specific users"
-msgstr ""
-
-msgid "Select changesets depending on whether they are open or closed"
-msgstr ""
-
-msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr ""
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr ""
-
-msgid "Query open changesets only"
-msgstr ""
-
-msgid "Query closed changesets only"
-msgstr ""
-
-msgid "Query both open and closed changesets"
-msgstr ""
-
-msgid "Only changesets owned by myself"
-msgstr ""
-
-msgid "User ID:"
-msgstr "Erabiltzaile IDa:"
-
-msgid "User name:"
-msgstr "Erabiltzaile izena:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr ""
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-
-msgid "Please enter a valid user ID"
-msgstr "Balizko erabiltzaile ID bat eman"
-
-msgid "Invalid user ID"
-msgstr ""
-
-msgid "Please enter a non-empty user name"
-msgstr ""
-
-msgid "Invalid user name"
-msgstr "Baliogabeko erabiltzaile izena"
-
-msgid "Date: "
-msgstr "Data: "
-
-msgid "Time:"
+msgid "Download the changeset content from the OSM server"
msgstr ""
-msgid "Closed after - "
+msgid "Update content"
+msgstr "Edukia eguneratu"
+
+msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Date:"
-msgstr "Data:"
+msgid "Changeset ID: "
+msgstr "Aldaketa-multzoaren IDa: "
-msgid "Created before - "
-msgstr ""
+msgid "Enter a changeset id"
+msgstr "Eman aldaketa-multzoaren IDa"
-msgid "Only changesets closed after the following date/time"
+msgid ""
+"Download the changeset with the specified id, including the changeset content"
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Select changesets owned by specific users"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Select changesets depending on whether they are open or closed"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Select changesets based on the date/time they have been created or closed"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Select only changesets related to a specific bounding box"
msgstr ""
msgid ""
@@ -7147,23 +7081,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-
-msgid "Please enter an integer value > 0"
-msgstr ""
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-
msgid "Download my changesets only"
msgstr "Nire aldaketa-multzoa soilik jaitsi"
@@ -7239,6 +7156,66 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid "Query open changesets only"
+msgstr ""
+
+msgid "Query closed changesets only"
+msgstr ""
+
+msgid "Query both open and closed changesets"
+msgstr ""
+
+msgid "Date: "
+msgstr "Data: "
+
+msgid "Time:"
+msgstr ""
+
+msgid "Closed after - "
+msgstr ""
+
+msgid "Date:"
+msgstr "Data:"
+
+msgid "Created before - "
+msgstr ""
+
+msgid "Only changesets closed after the following date/time"
+msgstr ""
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+
+msgid "Invalid date/time values"
+msgstr ""
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+
+msgid "Please enter an integer value > 0"
+msgstr ""
+
msgid "URL: "
msgstr "URL-a: "
@@ -7256,6 +7233,49 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Only changesets owned by myself"
+msgstr ""
+
+msgid "User ID:"
+msgstr "Erabiltzaile IDa:"
+
+msgid "User name:"
+msgstr "Erabiltzaile izena:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr ""
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr ""
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+
+msgid "Please enter a valid user ID"
+msgstr "Balizko erabiltzaile ID bat eman"
+
+msgid "Invalid user ID"
+msgstr ""
+
+msgid "Please enter a non-empty user name"
+msgstr ""
+
+msgid "Invalid user name"
+msgstr "Baliogabeko erabiltzaile izena"
+
msgid "Activate"
msgstr "Aktibatu"
@@ -8359,6 +8379,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9847,6 +9870,9 @@ msgstr "Norabidea"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9859,9 +9885,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9958,14 +9981,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9978,6 +9993,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10966,6 +10984,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10978,6 +10999,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Basoa"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10990,6 +11023,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11049,6 +11085,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11067,9 +11108,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12264,6 +12312,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13300,6 +13354,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13321,12 +13381,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14286,6 +14340,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14779,13 +14836,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14809,7 +14869,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14860,7 +14923,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14869,10 +14932,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14908,6 +14983,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14953,10 +15034,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14992,31 +15079,71 @@ msgstr ""
msgid "TEC bus lines (2014)"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
+msgstr ""
+
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -15055,6 +15182,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -15088,9 +15221,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -15147,9 +15277,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15177,9 +15304,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15213,9 +15337,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15252,19 +15421,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15327,9 +15505,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15363,12 +15553,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15495,9 +15707,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15507,6 +15716,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15528,12 +15751,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15555,6 +15796,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15597,6 +15841,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15618,6 +15865,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15633,6 +15886,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15660,9 +15916,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15684,9 +15985,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15696,9 +15994,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -16011,7 +16306,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr "Bideen lauki bat sortu."
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -16104,6 +16399,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18534,6 +18832,9 @@ msgstr "Errekastoa"
msgid "River"
msgstr "Ibaia"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Kanala"
@@ -19582,6 +19883,12 @@ msgstr "Motela"
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Bungalowa"
@@ -19648,6 +19955,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Otordu lasterreko jatetxea"
@@ -20591,31 +20904,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr "Ehiza-postua"
-msgid "Height"
-msgstr "Garaiera"
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
-msgstr "Esklusa"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -21207,6 +21508,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22500,6 +22805,9 @@ msgstr "Harategia"
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23313,9 +23621,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr "Basoa"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24360,6 +24665,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24451,6 +24759,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24527,6 +24841,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24551,6 +24870,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25324,6 +25646,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25366,7 +25698,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -26169,6 +26501,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26210,8 +26545,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27809,6 +28144,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29975,9 +30369,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -30135,9 +30526,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -30195,6 +30583,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30392,9 +30783,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/fa.po b/i18n/po/fa.po
index 684a49d..defdfc4 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:02+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:07+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: fa\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr "منو اصلی ساختمان"
msgid "Help"
msgstr "کمک"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "مقدار دهی اولیه API OSM"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "مقداردهی اولیه اعتبار سنج"
@@ -202,6 +208,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr "انتخاب لایه های WMS"
+
+msgid "Add layers"
+msgstr "افزودن لایه ها"
+
msgid "Add imagery layer {0}"
msgstr "افزودن لایه تصویری {0}"
@@ -223,12 +235,6 @@ msgstr "خطا"
msgid "Select image format for WMS layer"
msgstr "انتخاب فرمت تصویر برای لایه WMS"
-msgid "Select WMS layers"
-msgstr "انتخاب لایه های WMS"
-
-msgid "Add layers"
-msgstr "افزودن لایه ها"
-
msgid "Add Node..."
msgstr "افزودن گره..."
@@ -731,6 +737,9 @@ msgstr "پرش به موقعیت"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "یک گفتگو باز میشود که اجازه ی پرش به یک مکان خاص را میدهد"
+msgid "Jump to Position"
+msgstr "پرش به موقعیت"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "وارد کردن عرض/طول جغرافیایی برای پرش به موقعیت."
@@ -752,9 +761,6 @@ msgstr "آدرس"
msgid "Jump there"
msgstr "پرش به آنجا"
-msgid "Jump to Position"
-msgstr "پرش به موقعیت"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr "عرض، طول یا بزرگنمایی را نمیتوان تجزیه کرد، لطفا بررسی کنید."
@@ -807,6 +813,9 @@ msgstr "ترکیب کردن لایه"
msgid "Merge the current layer into another layer"
msgstr "ترکیب لایه ی کنونی با لایه ای دیگر"
+msgid "{0} completed in {1}"
+msgstr "{0} در {1} تکمیل شد"
+
msgid "Merging layers with different upload policies"
msgstr "ترکیب لایه ها با سیاست بارگذاری مختلف"
@@ -978,24 +987,30 @@ msgstr[0] ""
msgid "Opening file ''{0}'' ..."
msgstr "باز کردن پرونده ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "تایید"
+
msgid "Open Location..."
msgstr "باز کردن مکان..."
msgid "Open an URL."
msgstr "باز کردن یک URL."
-msgid "Separate Layer"
-msgstr "جداسازى لايه"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "اگر داده ها باید داخل لایه ی جدید دانلود شوند انتخاب کنید"
-
msgid "Enter URL to download:"
msgstr "وارد کردن آدرس برای دانلود:"
msgid "Enter an URL from where data should be downloaded"
msgstr "وارد کردن یک آدرس از جایی که داده ها باید دانلود شود"
+msgid "Separate Layer"
+msgstr "جداسازى لايه"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "اگر داده ها باید داخل لایه ی جدید دانلود شوند انتخاب کنید"
+
msgid "Download Location"
msgstr "محل دانلود"
@@ -1011,12 +1026,6 @@ msgstr "بستن گفتگو و لغو دانلود"
msgid "Download Data"
msgstr "دانلود داده ها"
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr "تایید"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1827,9 +1836,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -4013,9 +4019,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -4045,12 +4048,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4744,12 +4762,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4766,8 +4790,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5088,9 +5112,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr "{0} در {1} تکمیل شد"
-
msgid "Enlarge"
msgstr ""
@@ -5229,82 +5250,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5470,6 +5415,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5529,7 +5550,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6925,212 +6946,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8236,6 +8257,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9727,6 +9751,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9739,9 +9766,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9838,14 +9862,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9858,6 +9874,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10846,6 +10865,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10858,6 +10880,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10870,6 +10904,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10929,6 +10966,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10947,9 +10989,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12144,6 +12193,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13179,6 +13234,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13200,12 +13261,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14165,6 +14220,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14653,13 +14711,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14683,7 +14744,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14734,7 +14798,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14743,10 +14807,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14782,6 +14858,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14827,10 +14909,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14863,34 +14951,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14929,6 +15057,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14962,9 +15096,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -15021,9 +15152,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15051,9 +15179,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15087,9 +15212,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15126,19 +15296,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15201,9 +15380,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15237,12 +15428,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15369,9 +15582,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15381,6 +15591,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15402,12 +15626,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15429,6 +15671,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15471,6 +15716,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15492,6 +15740,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15507,6 +15761,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15534,9 +15791,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15558,9 +15860,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15570,9 +15869,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15884,7 +16180,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15972,6 +16268,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18368,6 +18667,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19416,6 +19718,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19482,6 +19790,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20425,31 +20739,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -21041,6 +21343,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22334,6 +22640,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23147,9 +23456,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24194,6 +24500,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24285,6 +24594,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24361,6 +24676,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24385,6 +24705,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25158,6 +25481,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25200,7 +25533,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -26003,6 +26336,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26044,8 +26380,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27643,6 +27979,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29804,9 +30199,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29964,9 +30356,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -30024,6 +30413,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30221,9 +30613,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/fi.po b/i18n/po/fi.po
index 19dd19d..7b06ac5 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:43+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:47+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: fi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -65,9 +65,15 @@ msgstr "Luodaan päävalikko"
msgid "Help"
msgstr "Ohje"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Valmistellaan OSM API -yhteys"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Valmistellaan tarkistin"
@@ -210,6 +216,12 @@ msgstr ""
"Asettaa valitut elementit kartalle valittuihin kohteisiin ylläolevalle "
"listalle."
+msgid "Select WMS layers"
+msgstr "Valitse WMS-taso"
+
+msgid "Add layers"
+msgstr "Lisää tasoja"
+
msgid "Add imagery layer {0}"
msgstr "Lisää kuvataso {0}"
@@ -231,12 +243,6 @@ msgstr "Virhe"
msgid "Select image format for WMS layer"
msgstr "Valitse WMS-tason kuvaformaatti"
-msgid "Select WMS layers"
-msgstr "Valitse WMS-taso"
-
-msgid "Add layers"
-msgstr "Lisää tasoja"
-
msgid "Add Node..."
msgstr "Lisää piste..."
@@ -744,6 +750,9 @@ msgstr "Siirry sijaintiin"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Siirry haluamiisi koordinaatteihin."
+msgid "Jump to Position"
+msgstr "Siirry sijaintiin"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Syotä leveys/pituusasteet uudelle sijainnille"
@@ -765,9 +774,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Siirry"
-msgid "Jump to Position"
-msgstr "Siirry sijaintiin"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Leveysastetta, pituusastetta tai mittakaavaa ei kyetty tulkitsemaan. "
@@ -822,6 +828,9 @@ msgstr "Yhdistä taso"
msgid "Merge the current layer into another layer"
msgstr "Yhdistä nykyinen taso toiseen tasoon"
+msgid "{0} completed in {1}"
+msgstr "{0} suoritettu ajassa {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Ristiriita yhdistettävien tasojen lähetystiedoissa"
@@ -992,24 +1001,30 @@ msgstr[1] "Avataan {0} tiedostoa..."
msgid "Opening file ''{0}'' ..."
msgstr "Avataan tiedostoa \"{0}\"..."
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "OK"
+
msgid "Open Location..."
msgstr "Avaa sijainti..."
msgid "Open an URL."
msgstr "Avaa URL-osoite."
-msgid "Separate Layer"
-msgstr "Uusi taso"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Valitse, ladataanko data uudelle tasolle"
-
msgid "Enter URL to download:"
msgstr "Anna ladattavan alueen URL-osoite:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Syötä URL jonka tiedot pitäisi ladata"
+msgid "Separate Layer"
+msgstr "Uusi taso"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Valitse, ladataanko data uudelle tasolle"
+
msgid "Download Location"
msgstr "Latauksen sijainti"
@@ -1025,12 +1040,6 @@ msgstr "Sulkee ikkunan ja peruuuttaa latauksen"
msgid "Download Data"
msgstr "Lataa dataa"
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr "OK"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1893,9 +1902,6 @@ msgstr "Hae ja lataa muutoskokoelmia..."
msgid "Errors during download"
msgstr "Virheitä latauksen aikana"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr "Lataa GPS-pisteet"
@@ -4221,9 +4227,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr "Monimonikulmion ulompi polku puuttuu"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "Relaation jäsenen ''{0}'' roolina pitäisi olla ''{1}''"
-
msgid "No area style for multipolygon"
msgstr ""
@@ -4257,12 +4260,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr "Monimonikulmiota ei ole suljettu"
-msgid "Multipolygon inner way is outside"
-msgstr "Monimonikulmion sisempi polku on ulkopuolella"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "Monimonikulmion polut risteävät keskenään"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "Relaation jäsenen ''{0}'' roolina pitäisi olla ''{1}''"
+
+msgid "Multipolygon inner way is outside"
+msgstr "Monimonikulmion sisempi polku on ulkopuolella"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "Monimonikulmion jäsenellä ei ole käyttökelpoista roolia"
@@ -4976,12 +4994,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr "Javan järjestelmäominaisuuksina näkyvät asetukset"
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4998,8 +5022,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5333,9 +5357,6 @@ msgstr "Napsauta suorittaaksesi työ taustalla"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} suoritettu ajassa {1}"
-
msgid "Enlarge"
msgstr ""
@@ -5477,86 +5498,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr "Omaa ja muiden"
-
-msgid "My with Merged"
-msgstr "Omaa ja yhdistettä"
-
-msgid "Their with Merged"
-msgstr "Muiden ja yhdistettä"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "Rooli {0} ei ole mukana vertailuparissa {1}."
-
-msgid "Properties"
-msgstr "Ominaisuudet"
-
-msgid "Tags"
-msgstr "Tagit"
-
-msgid "Nodes"
-msgstr "Pisteet"
-
-msgid "Members"
-msgstr "Jäsenet"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Ei ratkaisemattomia ristiriitoja tageissa"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Tagit ({0} ristiriita)"
-msgstr[1] "Tagit ({0} ristiriitaa)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} tagiristiriita ratkaistavana"
-msgstr[1] "{0} tagiristiriitaa ratkaistavana"
-
-msgid "Nodes(resolved)"
-msgstr "Pisteet (ratkaistu)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Pistelistojen yhdiste jäädytetty. Tämän polun pistelistassa ei ole "
-"ratkaisemattomia ristiriitoja"
-
-msgid "Nodes(with conflicts)"
-msgstr "Pisteet (ristiriitoja)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Tämän polun pistelistan ratkaisemattomat ristiriidat"
-
-msgid "Members(resolved)"
-msgstr "Jäsenet (ratkaistu)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Yhdistetty jäsenluettelo on lukittu. Tämän relaation jäsenluettelossa ei ole "
-"enää ristiriitoja."
-
-msgid "Members(with conflicts)"
-msgstr "Jäsenet (ristiriitoja)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Tämän relaation jäsenluettelossa on vielä ristiriitoja."
-
-msgid "No pending property conflicts"
-msgstr "Ei ratkaisemattomia ristiriitoja ominaisuuksissa"
-
-msgid "Properties(with conflicts)"
-msgstr "Ominaisuudet (ristiriitoja)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Ominaisuuksien ratkaisemattomat ristiriidat"
-
-msgid "Conflict Resolution"
-msgstr "Ristiriidan ratkaisu"
-
msgid "{0} more..."
msgstr "Vielä {0}..."
@@ -5736,6 +5677,86 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Muitten versio ({0} rivi)"
msgstr[1] "Muitten versio ({0} riviä)"
+msgid "My with Their"
+msgstr "Omaa ja muiden"
+
+msgid "My with Merged"
+msgstr "Omaa ja yhdistettä"
+
+msgid "Their with Merged"
+msgstr "Muiden ja yhdistettä"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "Rooli {0} ei ole mukana vertailuparissa {1}."
+
+msgid "Properties"
+msgstr "Ominaisuudet"
+
+msgid "Tags"
+msgstr "Tagit"
+
+msgid "Nodes"
+msgstr "Pisteet"
+
+msgid "Members"
+msgstr "Jäsenet"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Ei ratkaisemattomia ristiriitoja tageissa"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Tagit ({0} ristiriita)"
+msgstr[1] "Tagit ({0} ristiriitaa)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} tagiristiriita ratkaistavana"
+msgstr[1] "{0} tagiristiriitaa ratkaistavana"
+
+msgid "Nodes(resolved)"
+msgstr "Pisteet (ratkaistu)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Pistelistojen yhdiste jäädytetty. Tämän polun pistelistassa ei ole "
+"ratkaisemattomia ristiriitoja"
+
+msgid "Nodes(with conflicts)"
+msgstr "Pisteet (ristiriitoja)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Tämän polun pistelistan ratkaisemattomat ristiriidat"
+
+msgid "Members(resolved)"
+msgstr "Jäsenet (ratkaistu)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Yhdistetty jäsenluettelo on lukittu. Tämän relaation jäsenluettelossa ei ole "
+"enää ristiriitoja."
+
+msgid "Members(with conflicts)"
+msgstr "Jäsenet (ristiriitoja)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Tämän relaation jäsenluettelossa on vielä ristiriitoja."
+
+msgid "No pending property conflicts"
+msgstr "Ei ratkaisemattomia ristiriitoja ominaisuuksissa"
+
+msgid "Properties(with conflicts)"
+msgstr "Ominaisuudet (ristiriitoja)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Ominaisuuksien ratkaisemattomat ristiriidat"
+
+msgid "Conflict Resolution"
+msgstr "Ristiriidan ratkaisu"
+
msgid "Node"
msgstr "Piste"
@@ -5799,10 +5820,8 @@ msgstr "Rooli"
msgid "Primitive"
msgstr "Alkeinen"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"Yhdistettyjä pisteitä ei ole jäädytetty vielä. Ei voida rakentaa "
-"ratkaisukomentoa"
msgid "<undefined>"
msgstr "<määrittelemätön>"
@@ -7238,109 +7257,18 @@ msgid ""
"Download the changeset with the specified id, including the changeset content"
msgstr "Lataa muutoskokoelma (myös sisältö) annetulla ID:llä."
-msgid "Select changesets owned by specific users"
-msgstr "Valitse annetun käyttäjän muutoskokoelmat"
-
-msgid "Select changesets depending on whether they are open or closed"
-msgstr "Hae muutoskokoelman aukiolon perusteella"
-
-msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr "Hae muutoskokoelman luomis- tai sulkemisajankohdan perusteella"
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr "Hae muutoskokoelmat vain tietyltä alueelta"
-
-msgid "Query open changesets only"
-msgstr "Hae vain avoimia muutoskokoelmia"
-
-msgid "Query closed changesets only"
-msgstr "Hae vain suljettuja muutoskokoelmia"
-
-msgid "Query both open and closed changesets"
-msgstr "Hae avoimia ja suljettuja muutoskokoelmia"
-
-msgid "Only changesets owned by myself"
-msgstr "Vain omat muutoskokoelmani"
-
-msgid "User ID:"
-msgstr "Käyttäjän ID:"
-
-msgid "User name:"
-msgstr "Käyttäjänimi:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Hae muutoskokoelmia käyttäjän id-numeron perusteella"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "Hae muutoskokoelmia käyttäjänimen perusteella"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Vain omat muutoskokoelmani (Ei käytössä. JOSMilla ei ole käyttäjätunnusta "
-"tiedossa)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Kyselyä ei voi rajata nykyiseen käyttäjään, koska käyttäjätunnus puuttuu"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "Nykyinen käyttäjätunnus \"{0}\" ei ole kelvollinen"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr "Kyselyä ei voi rajata käyttäjätunnukseen \"{0}\""
-
-msgid "Please enter a valid user ID"
-msgstr "Syötä kelvollinen käyttäjätunnus"
-
-msgid "Invalid user ID"
-msgstr "Virheellinen käyttäjän ID"
-
-msgid "Please enter a non-empty user name"
-msgstr "Käyttäjätunnus ei voi olla tyhjä"
-
-msgid "Invalid user name"
-msgstr "Virheellinen käyttäjänimi"
-
-msgid "Date: "
-msgstr "Päivämäärä: "
-
-msgid "Time:"
-msgstr "Aika:"
-
-msgid "Closed after - "
-msgstr "Suljettu jälkeen - "
-
-msgid "Date:"
-msgstr "Päivämäärä:"
-
-msgid "Created before - "
-msgstr "Luotu ennen - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Vain annetun ajankohdan jälkeen suljetut"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-"Vain annetun hetken jälkeen suljetut, tai ennen annettua hetkeä luodut "
-"muutoskokoelmat"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr "Haku ei onnistu annetuilla aikarajoilla."
+msgid "Select changesets owned by specific users"
+msgstr "Valitse annetun käyttäjän muutoskokoelmat"
+
+msgid "Select changesets depending on whether they are open or closed"
+msgstr "Hae muutoskokoelman aukiolon perusteella"
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr ""
+"Select changesets based on the date/time they have been created or closed"
+msgstr "Hae muutoskokoelman luomis- tai sulkemisajankohdan perusteella"
-msgid "Invalid date/time values"
-msgstr "päivämäärä tai aika: virheellinen muoto"
+msgid "Select only changesets related to a specific bounding box"
+msgstr "Hae muutoskokoelmat vain tietyltä alueelta"
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
@@ -7358,28 +7286,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Rajaava suorakulmio ei kelpaa"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"Annettu arvo ei ole kelvollinen käyttäjä-ID. Anna positiivinen kokonaisluku."
-
-msgid "Please enter an integer value > 0"
-msgstr "Anna positiivinen kokonaisluku."
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Syötä päiväys paikallisessa muodossa.<br>Esimerkki: {0}<br>Esimerkki: "
-"{1}<br>Esimerkki: {2}<br>Esimerkki: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Syötä aika paikallisessa muodossa.<br>Esimerkki: {0}<br>Esimerkki: "
-"{1}<br>Esimerkki: {2}<br>Esimerkki: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Lataa vain omat muutoskokoelmani"
@@ -7469,6 +7375,73 @@ msgstr "Muutoskokoelmien hakuun käytetty URL ei ole kelvollinen"
msgid "Close the dialog and abort querying of changesets"
msgstr "Sulje tämä ikkuna ja keskeytä muutoskokoelmien haku"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Syötä päiväys paikallisessa muodossa.<br>Esimerkki: {0}<br>Esimerkki: "
+"{1}<br>Esimerkki: {2}<br>Esimerkki: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Hae vain avoimia muutoskokoelmia"
+
+msgid "Query closed changesets only"
+msgstr "Hae vain suljettuja muutoskokoelmia"
+
+msgid "Query both open and closed changesets"
+msgstr "Hae avoimia ja suljettuja muutoskokoelmia"
+
+msgid "Date: "
+msgstr "Päivämäärä: "
+
+msgid "Time:"
+msgstr "Aika:"
+
+msgid "Closed after - "
+msgstr "Suljettu jälkeen - "
+
+msgid "Date:"
+msgstr "Päivämäärä:"
+
+msgid "Created before - "
+msgstr "Luotu ennen - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Vain annetun ajankohdan jälkeen suljetut"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+"Vain annetun hetken jälkeen suljetut, tai ennen annettua hetkeä luodut "
+"muutoskokoelmat"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr "Haku ei onnistu annetuilla aikarajoilla."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+
+msgid "Invalid date/time values"
+msgstr "päivämäärä tai aika: virheellinen muoto"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Syötä aika paikallisessa muodossa.<br>Esimerkki: {0}<br>Esimerkki: "
+"{1}<br>Esimerkki: {2}<br>Esimerkki: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"Annettu arvo ei ole kelvollinen käyttäjä-ID. Anna positiivinen kokonaisluku."
+
+msgid "Please enter an integer value > 0"
+msgstr "Anna positiivinen kokonaisluku."
+
msgid "URL: "
msgstr "URL: "
@@ -7488,6 +7461,52 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Tämä URL ei ole kelvollinen."
+msgid "Only changesets owned by myself"
+msgstr "Vain omat muutoskokoelmani"
+
+msgid "User ID:"
+msgstr "Käyttäjän ID:"
+
+msgid "User name:"
+msgstr "Käyttäjänimi:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Hae muutoskokoelmia käyttäjän id-numeron perusteella"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "Hae muutoskokoelmia käyttäjänimen perusteella"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Vain omat muutoskokoelmani (Ei käytössä. JOSMilla ei ole käyttäjätunnusta "
+"tiedossa)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Kyselyä ei voi rajata nykyiseen käyttäjään, koska käyttäjätunnus puuttuu"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "Nykyinen käyttäjätunnus \"{0}\" ei ole kelvollinen"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr "Kyselyä ei voi rajata käyttäjätunnukseen \"{0}\""
+
+msgid "Please enter a valid user ID"
+msgstr "Syötä kelvollinen käyttäjätunnus"
+
+msgid "Invalid user ID"
+msgstr "Virheellinen käyttäjän ID"
+
+msgid "Please enter a non-empty user name"
+msgstr "Käyttäjätunnus ei voi olla tyhjä"
+
+msgid "Invalid user name"
+msgstr "Virheellinen käyttäjänimi"
+
msgid "Activate"
msgstr "Aktivoi"
@@ -8672,6 +8691,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10294,6 +10316,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "Ääniaaltotiedostot (*.wav)"
+
msgid "Import Audio"
msgstr "Tuo äänitiedosto"
@@ -10306,9 +10331,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr "Ääniaaltotiedostot (*.wav)"
-
msgid "Audio markers from {0}"
msgstr ""
@@ -10405,14 +10427,6 @@ msgstr "(URL oli: "
msgid "Select the map painting styles"
msgstr "Valitse käytettävät piirtotyylit"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -10425,6 +10439,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -11444,6 +11461,9 @@ msgstr "Paikannuksen tarkkuus (punainen = huono, vihreä = hyvä)"
msgid "Track date"
msgstr "Aikaleima"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Valittu väri (muutettavissa tasokohtaisesti)"
@@ -11456,6 +11476,18 @@ msgstr "Polkupyörä"
msgid "Foot"
msgstr "Jalankulku (foot)"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Metsä"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Luo Merkinnät -taso GPX-tiedostoja avattaessa"
@@ -11468,6 +11500,9 @@ msgstr "Väriskaala sopeutetaan datan minimi- ja maksimiarvoihin"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Pehmennä viivan reunaa"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11540,6 +11575,11 @@ msgstr ""
"näyttäisi vähemmän karkealta."
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11562,9 +11602,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "Värittää pisteet ja viivat pisteen aikaleiman mukaan"
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr "Nopeusvärityksen valinta eri keskinopeuksille."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Jäljen ja pisteiden väritys"
@@ -12815,6 +12862,12 @@ msgstr "Etsii virheitä uskonnollisista karttakohteista"
msgid "Checks for errors on relations"
msgstr "Etsii mahdollisia virheitä relaatioista"
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr "Tarpeettomat tagit"
@@ -13906,6 +13959,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Tallenna käyttäjänimi ja salasana (salaamattomana)"
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13927,12 +13986,6 @@ msgstr "Lisää valitut tagit valittuihin karttakohteisiin"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Enter: Lisää kaikki tagit valittuihin karttakohteisiin"
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14953,6 +15006,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -15447,13 +15503,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -15477,7 +15536,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -15528,7 +15590,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -15537,10 +15599,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -15576,6 +15650,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -15621,10 +15701,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -15657,34 +15743,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -15723,6 +15849,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -15756,9 +15888,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -15815,9 +15944,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15845,9 +15971,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15881,9 +16004,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Saksan Ruhrin alueen ilmakuvat (10 cm erotuskyky)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15920,19 +16088,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15995,9 +16172,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -16031,12 +16220,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -16163,9 +16374,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -16175,6 +16383,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -16196,12 +16418,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -16223,6 +16463,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -16265,6 +16508,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -16286,6 +16532,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -16301,6 +16553,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr "NLSC Open Data WMTS"
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -16328,9 +16583,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -16352,9 +16652,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -16364,9 +16661,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -16682,7 +16976,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -16777,6 +17071,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -19202,6 +19499,9 @@ msgstr "Puro / oja"
msgid "River"
msgstr "Joki"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Kanava"
@@ -20250,6 +20550,12 @@ msgstr "Motelli"
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Alppimaja"
@@ -20316,6 +20622,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Pikaruoka"
@@ -21259,31 +21571,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr "Metsästyslava"
-msgid "Height"
-msgstr "Korkeus"
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -21875,6 +22175,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -23168,6 +23472,9 @@ msgstr "Lihakauppa"
msgid "Seafood"
msgstr "Mereneläviä"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Deli (herkkukauppa)"
@@ -23981,9 +24288,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr "Metsä"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -25029,6 +25333,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0} ei ole enää suositeltu merkintätapa"
@@ -25128,6 +25435,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -25204,6 +25517,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -25228,6 +25546,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -26017,6 +26338,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -26059,7 +26390,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -26866,6 +27197,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26907,8 +27241,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -28526,6 +28860,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -30728,9 +31121,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -30888,9 +31278,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -30948,6 +31335,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -31147,9 +31537,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/fil.po b/i18n/po/fil.po
index 0477fb7..f4169af 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:18+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:25+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: fil\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr "Tulong"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr ""
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -708,6 +714,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -729,9 +738,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -782,6 +788,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -931,16 +940,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -949,6 +958,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -964,12 +979,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1762,9 +1771,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3950,9 +3956,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3982,12 +3985,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4680,12 +4698,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4702,8 +4726,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5024,9 +5048,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5165,82 +5186,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5406,6 +5351,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5465,7 +5486,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6857,212 +6878,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8168,6 +8189,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9654,6 +9678,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9666,9 +9693,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9765,14 +9789,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9785,6 +9801,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10773,6 +10792,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10785,6 +10807,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10797,6 +10831,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10856,6 +10893,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10874,9 +10916,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12071,6 +12120,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13106,6 +13161,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13127,12 +13188,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14092,6 +14147,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14580,13 +14638,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14610,7 +14671,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14661,7 +14725,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14670,10 +14734,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14709,6 +14785,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14754,10 +14836,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14790,34 +14878,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14856,6 +14984,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14889,9 +15023,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14948,9 +15079,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14978,9 +15106,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15014,9 +15139,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15053,19 +15223,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15128,9 +15307,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15164,12 +15355,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15296,9 +15509,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15308,6 +15518,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15329,12 +15553,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15356,6 +15598,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15398,6 +15643,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15419,6 +15667,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15434,6 +15688,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15461,9 +15718,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15485,9 +15787,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15497,9 +15796,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15811,7 +16107,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15899,6 +16195,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18295,6 +18594,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19343,6 +19645,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19409,6 +19717,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20352,31 +20666,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20968,6 +21270,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22261,6 +22567,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23074,9 +23383,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24121,6 +24427,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24212,6 +24521,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24288,6 +24603,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24312,6 +24632,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25085,6 +25408,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25127,7 +25460,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25930,6 +26263,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25971,8 +26307,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27570,6 +27906,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29731,9 +30126,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29891,9 +30283,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29951,6 +30340,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30148,9 +30540,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/fo.po b/i18n/po/fo.po
index 599ace2..4595ae7 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:42+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:46+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}: valmøguleiki ''{1}'' er tvítýddur"
@@ -63,9 +63,15 @@ msgstr ""
msgid "Help"
msgstr "Hjálp"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -200,6 +206,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -221,12 +233,6 @@ msgstr "Feilur"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -707,6 +713,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -728,9 +737,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -781,6 +787,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -930,16 +939,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -948,6 +957,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -963,12 +978,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1761,9 +1770,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3949,9 +3955,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3981,12 +3984,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4679,12 +4697,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4701,8 +4725,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5023,9 +5047,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5164,82 +5185,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5405,6 +5350,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5464,7 +5485,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6856,212 +6877,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8167,6 +8188,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9653,6 +9677,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9665,9 +9692,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9764,14 +9788,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9784,6 +9800,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10772,6 +10791,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10784,6 +10806,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10796,6 +10830,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10855,6 +10892,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10873,9 +10915,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12070,6 +12119,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13105,6 +13160,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13126,12 +13187,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14091,6 +14146,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14579,13 +14637,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14609,7 +14670,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14660,7 +14724,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14669,10 +14733,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14708,6 +14784,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14753,10 +14835,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14789,34 +14877,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14855,6 +14983,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14888,9 +15022,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14947,9 +15078,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14977,9 +15105,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15013,9 +15138,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15052,19 +15222,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15127,9 +15306,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15163,12 +15354,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15295,9 +15508,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15307,6 +15517,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15328,12 +15552,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15355,6 +15597,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15397,6 +15642,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15418,6 +15666,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15433,6 +15687,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15460,9 +15717,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15484,9 +15786,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15496,9 +15795,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15810,7 +16106,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15898,6 +16194,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18294,6 +18593,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19342,6 +19644,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19408,6 +19716,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20351,31 +20665,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20967,6 +21269,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22260,6 +22566,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23073,9 +23382,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24120,6 +24426,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24211,6 +24520,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24287,6 +24602,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24311,6 +24631,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25084,6 +25407,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25126,7 +25459,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25929,6 +26262,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25970,8 +26306,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27569,6 +27905,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29730,9 +30125,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29890,9 +30282,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29950,6 +30339,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30147,9 +30539,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/fr.po b/i18n/po/fr.po
index 0eaed9d..fd4c511 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: 2016-11-06 22:51+0100\n"
-"PO-Revision-Date: 2016-11-03 13:35+0000\n"
-"Last-Translator: Simon Legner <Unknown>\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
+"PO-Revision-Date: 2016-12-31 14:28+0000\n"
+"Last-Translator: Don-vip <Unknown>\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: 2016-11-07 04:44+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:48+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: fr\n"
"X-Poedit-Bookmarks: 1767,-1,-1,2669,-1,-1,-1,-1,-1,-1\n"
@@ -64,9 +64,15 @@ msgstr "Construction du menu principal"
msgid "Help"
msgstr "Aide"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Initialisation de l’API OSM"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Initialisation du validateur"
@@ -210,6 +216,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr "Sélectionner un objet"
+msgid "Select WMS layers"
+msgstr "Sélectionner les calques WMS"
+
+msgid "Add layers"
+msgstr "Ajouter des couches"
+
msgid "Add imagery layer {0}"
msgstr "Ajouter le calque d’imagerie {0}"
@@ -231,12 +243,6 @@ msgstr "Erreur"
msgid "Select image format for WMS layer"
msgstr "Sélectionnez le format d''image pour le calque WMS"
-msgid "Select WMS layers"
-msgstr "Sélectionner les calques WMS"
-
-msgid "Add layers"
-msgstr "Ajouter des couches"
-
msgid "Add Node..."
msgstr "Ajouter un nœud"
@@ -492,10 +498,10 @@ msgid "Download notes in current view"
msgstr "Télécharger les notes dans la vue actuelle"
msgid "Download in current view"
-msgstr ""
+msgstr "Télécharger dans la vue courante"
msgid "Download map data from the OSM server in current view"
-msgstr ""
+msgstr "Télécharger les données du serveur OSM dans la vue courante"
msgid "Download object..."
msgstr "Télécharger un objet"
@@ -757,6 +763,9 @@ msgstr "Aller à la position"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Ouvre une fenêtre permettant de se rendre à une position précise"
+msgid "Jump to Position"
+msgstr "Aller à la position"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Entrez une latitude/longitude pour vous rendre à la position."
@@ -779,9 +788,6 @@ msgstr "Adresse web"
msgid "Jump there"
msgstr "Aller ici"
-msgid "Jump to Position"
-msgstr "Aller à la position"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Impossible d’analyser la latitude, la longitude ou le zoom. Veuillez "
@@ -838,6 +844,9 @@ msgstr "Fusionner le calque"
msgid "Merge the current layer into another layer"
msgstr "Fusionner le calque actuel avec un autre calque"
+msgid "{0} completed in {1}"
+msgstr "{0} terminé(e)s en {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Fusion de calques aux stratégies d’envoi différentes"
@@ -1010,24 +1019,30 @@ msgstr[1] "Ouverture de {0} fichiers..."
msgid "Opening file ''{0}'' ..."
msgstr "Ouverture du fichier ''{0}''…"
+msgid "Which tasks to perform?"
+msgstr "Quelles tâches effectuer ?"
+
+msgid "Ok"
+msgstr "Valider"
+
msgid "Open Location..."
msgstr "Ouvrir un emplacement…"
msgid "Open an URL."
msgstr "Ouvrir une adresse web"
-msgid "Separate Layer"
-msgstr "Télécharger dans un nouveau calque"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Télécharger les données dans un nouveau calque"
-
msgid "Enter URL to download:"
msgstr "Entrez l’adresse web de téléchargement :"
msgid "Enter an URL from where data should be downloaded"
msgstr "Entrer l’adresse web depuis laquelle les données seront téléchargées"
+msgid "Separate Layer"
+msgstr "Télécharger dans un nouveau calque"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Télécharger les données dans un nouveau calque"
+
msgid "Download Location"
msgstr "Emplacement du téléchargement"
@@ -1043,12 +1058,6 @@ msgstr "Annuler le téléchargement et fermer la fenêtre"
msgid "Download Data"
msgstr "Télécharger les données"
-msgid "Which tasks to perform?"
-msgstr "Quelles tâches effectuer ?"
-
-msgid "Ok"
-msgstr "Valider"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1913,9 +1922,6 @@ msgstr "Récupérer et télécharger les groupes de modifications…"
msgid "Errors during download"
msgstr "Des erreurs sont survenues lors du téléchargement."
-msgid "Download Geo URL"
-msgstr "Télécharger une Géo URL"
-
msgid "Download GPS"
msgstr "Téléchargement GPS"
@@ -4101,7 +4107,7 @@ msgid "Reversed coastline"
msgstr "Ligne de côte inversée"
msgid "invalid coastline"
-msgstr ""
+msgstr "Ligne de côte invalide"
msgid "Conditional Keys"
msgstr "Clés conditionelles"
@@ -4140,10 +4146,10 @@ msgid "Crossing barriers"
msgstr "Barrières de passage à niveaux"
msgid "Self crossing"
-msgstr ""
+msgstr "Se croise sur lui-même"
msgid "Self-crossing ways"
-msgstr ""
+msgstr "Chemins se croisant sur eux-mêmes"
msgid ""
"This test checks if two roads, railways, waterways or buildings crosses in "
@@ -4325,9 +4331,6 @@ msgstr "Le chemin délimitant la surface n’est pas fermé"
msgid "No outer way for multipolygon"
msgstr "Aucun chemin intérieur pour le multipolygone"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "Le rôle de \"{0}\" devrait être \"{1}\""
-
msgid "No area style for multipolygon"
msgstr "Pas de style de zone pour le multipolygone"
@@ -4365,12 +4368,27 @@ msgstr "Style de la zone sur la partie externe du chemin"
msgid "Multipolygon is not closed"
msgstr "Le multipolygone n’est pas fermé"
-msgid "Multipolygon inner way is outside"
-msgstr "Le chemin intérieur du multipolygone est à l’extérieur"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "Intersection entre les chemins du multipolygone"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "Le rôle de \"{0}\" devrait être \"{1}\""
+
+msgid "Multipolygon inner way is outside"
+msgstr "Le chemin intérieur du multipolygone est à l’extérieur"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "Membre du multipolygone sans rôle utile"
@@ -4378,10 +4396,10 @@ msgid "Non-Way in multipolygon"
msgstr "Non-chemin dans le multipolygone"
msgid "Multipolygon member(s) repeated with different role"
-msgstr ""
+msgstr "Membre(s) du multipolygône répétés avec des rôle différents"
msgid "Multipolygon member(s) repeated with same role"
-msgstr ""
+msgstr "Membre(s) du multipolygône répété(s) avec le même rôle"
msgid "Missing name:* translation"
msgstr "Traduction name:* manquante"
@@ -5094,12 +5112,18 @@ msgid "options provided as Java system properties"
msgstr ""
"options disponibles en tant que fichiers de propriétés système pour Java"
+msgid "Change the JOSM directory name"
+msgstr "Modifier le nom du répertoire JOSM"
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/CHEMIN/VERS/JOSM/PREF "
msgid "Set the preferences directory"
msgstr "Définir le répertoire des préférences"
+msgid "Default: {0}"
+msgstr "Défaut: {0}"
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/CHEMIN/VERS/JOSM/USERDATA"
@@ -5116,11 +5140,9 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/CHEMIN/VERS/JOSM/HOMEDIR "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Déplacer les 3 répertoires dans le répertoire racine de l’utilisateur. Le "
-"répertoire de cache sera répertoire_racine/cache"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5472,9 +5494,6 @@ msgstr "Cliquez pour lancer la tâche en arrière-plan"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} terminé(e)s en {1}"
-
msgid "Enlarge"
msgstr "Agrandir"
@@ -5620,6 +5639,190 @@ msgstr "Conflit d''arrière-plan: supprimer le membre"
msgid "Conflict foreground: remove member"
msgstr "Conflit d''avant-plan: supprimer le membre"
+msgid "{0} more..."
+msgstr "{0} suivants…"
+
+msgid ""
+"The following objects could not be copied to the target object<br>because "
+"they are deleted in the target dataset:"
+msgstr ""
+"Les objets suivants ne peuvent pas être copiés<br>car ils sont supprimés du "
+"jeu de données :"
+
+msgid "Merging deleted objects failed"
+msgstr "La fusion des objets supprimés a échoué"
+
+msgid "List in role {0} is currently not participating in a compare pair."
+msgstr "La liste du rôle {0} ne fait pas partie d’une comparaison de paire."
+
+msgid "Unexpected value of parameter ''index''. Got {0}."
+msgstr ""
+"La valeur du paramètre \"index\" est inattendue. Actuellement elle est {0}"
+
+msgid "Item {0} not found in list."
+msgstr "Élément {0} non trouvé dans la liste"
+
+msgid "lock scrolling"
+msgstr "Figer le défilement"
+
+msgid "Compare "
+msgstr "Comparer : "
+
+msgid "My version"
+msgstr "Ma version"
+
+msgid "List of elements in my dataset, i.e. the local dataset"
+msgstr ""
+"Liste des éléments de mon jeu de données, par exemple le jeu de données local"
+
+msgid "Merged version"
+msgstr "Version fusionnée"
+
+msgid ""
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
+"Liste d’’éléments fusionnés. Ils remplaceront la liste de mes éléments quand "
+"les décisions de fusion seront appliquées."
+
+msgid "Their version"
+msgstr "Version du serveur"
+
+msgid "List of elements in their dataset, i.e. the server dataset"
+msgstr ""
+"Liste des éléments de leur jeu de données, par exemple le jeu de données du "
+"serveur"
+
+msgid "> top"
+msgstr "> haut"
+
+msgid "Copy my selected nodes to the start of the merged node list"
+msgstr "Copier mes nœuds sélectionnés au début de la version fusionnée"
+
+msgid "> bottom"
+msgstr "> bas"
+
+msgid "Copy my selected elements to the end of the list of merged elements."
+msgstr "Copier mes nœuds sélectionnés à la fin de la version fusionnée"
+
+msgid "> before"
+msgstr "> avant"
+
+msgid ""
+"Copy my selected elements before the first selected element in the list of "
+"merged elements."
+msgstr ""
+"Copier mes nœuds sélectionnés avant le premier nœud sélectionné de la "
+"version fusionnée"
+
+msgid "> after"
+msgstr "> après"
+
+msgid ""
+"Copy my selected elements after the first selected element in the list of "
+"merged elements."
+msgstr ""
+"Copier mes nœuds sélectionnés après le premier nœud sélectionné de la "
+"version fusionnée"
+
+msgid "< top"
+msgstr "< haut"
+
+msgid ""
+"Copy their selected element to the start of the list of merged elements."
+msgstr "Copier leurs nœuds sélectionnés au début de la version fusionnée"
+
+msgid "< bottom"
+msgstr "< bas"
+
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
+msgstr "Copier leurs nœuds sélectionnés à la fin de la version fusionnée"
+
+msgid "< before"
+msgstr "< avant"
+
+msgid ""
+"Copy their selected elements before the first selected element in the list "
+"of merged elements."
+msgstr ""
+"Copier leurs nœuds sélectionnés avant le premier nœud sélectionné de la "
+"version fusionnée"
+
+msgid "< after"
+msgstr "< après"
+
+msgid ""
+"Copy their selected element after the first selected element in the list of "
+"merged elements"
+msgstr ""
+"Copier leurs nœuds sélectionnés après le premier nœud sélectionné de la "
+"version fusionnée"
+
+msgid "Copy all my elements to the target"
+msgstr "Copier tous mes nœuds dans la version fusionnée"
+
+msgid "Copy all their elements to the target"
+msgstr "Copier tous leurs nœuds dans la version fusionnée"
+
+msgid "Up"
+msgstr "Monter"
+
+msgid "Move up the selected entries by one position."
+msgstr "Déplacer vers le haut les entrées sélectionnées d''un cran."
+
+msgid "Down"
+msgstr "Descendre"
+
+msgid "Move down the selected entries by one position."
+msgstr "Descendre les nœuds sélectionnés"
+
+msgid "Remove"
+msgstr "Supprimer"
+
+msgid "Remove the selected entries from the list of merged elements."
+msgstr "Supprimer les nœuds de la version fusionnée"
+
+msgid "Freeze"
+msgstr "Figer"
+
+msgid "Freeze the current list of merged elements."
+msgstr "Figer la version fusionnée"
+
+msgid "Unfreeze"
+msgstr "Libérer"
+
+msgid "Unfreeze the list of merged elements and start merging."
+msgstr "Libérer la liste des éléments fusionnés"
+
+msgid ""
+"<html>Click <strong>{0}</strong> to start merging my and their "
+"entries.</html>"
+msgstr ""
+"<html>Cliquez sur <strong>{0}</strong> pour fusionner les nœuds.</html>"
+
+msgid ""
+"<html>Click <strong>{0}</strong> to finish merging my and their "
+"entries.</html>"
+msgstr ""
+"<html>Cliquez sur <strong>{0}</strong> pour interrompre la fusion des "
+"nœuds.</html>"
+
+msgid "My version ({0} entry)"
+msgid_plural "My version ({0} entries)"
+msgstr[0] "Ma version ({0} élément)"
+msgstr[1] "Ma version ({0} éléments)"
+
+msgid "Merged version ({0} entry)"
+msgid_plural "Merged version ({0} entries)"
+msgstr[0] "Version fusionnée ({0} élément)"
+msgstr[1] "Version fusionnée ({0} éléments)"
+
+msgid "Their version ({0} entry)"
+msgid_plural "Their version ({0} entries)"
+msgstr[0] "Version du serveur ({0} élément)"
+msgstr[1] "Version du serveur ({0} éléments)"
+
msgid "My with Their"
msgstr "Le mien avec le leur"
@@ -5700,190 +5903,6 @@ msgstr "Des conflits d’attributs sont en attente de résolution"
msgid "Conflict Resolution"
msgstr "Résolution des conflits"
-msgid "{0} more..."
-msgstr "{0} suivants…"
-
-msgid ""
-"The following objects could not be copied to the target object<br>because "
-"they are deleted in the target dataset:"
-msgstr ""
-"Les objets suivants ne peuvent pas être copiés<br>car ils sont supprimés du "
-"jeu de données :"
-
-msgid "Merging deleted objects failed"
-msgstr "La fusion des objets supprimés a échoué"
-
-msgid "List in role {0} is currently not participating in a compare pair."
-msgstr "La liste du rôle {0} ne fait pas partie d’une comparaison de paire."
-
-msgid "Unexpected value of parameter ''index''. Got {0}."
-msgstr ""
-"La valeur du paramètre \"index\" est inattendue. Actuellement elle est {0}"
-
-msgid "Item {0} not found in list."
-msgstr "Élément {0} non trouvé dans la liste"
-
-msgid "lock scrolling"
-msgstr "Figer le défilement"
-
-msgid "Compare "
-msgstr "Comparer : "
-
-msgid "My version"
-msgstr "Ma version"
-
-msgid "List of elements in my dataset, i.e. the local dataset"
-msgstr ""
-"Liste des éléments de mon jeu de données, par exemple le jeu de données local"
-
-msgid "Merged version"
-msgstr "Version fusionnée"
-
-msgid ""
-"List of merged elements. They will replace the list of my elements when the "
-"merge decisions are applied."
-msgstr ""
-"Liste d’’éléments fusionnés. Ils remplaceront la liste de mes éléments quand "
-"les décisions de fusion seront appliquées."
-
-msgid "Their version"
-msgstr "Version du serveur"
-
-msgid "List of elements in their dataset, i.e. the server dataset"
-msgstr ""
-"Liste des éléments de leur jeu de données, par exemple le jeu de données du "
-"serveur"
-
-msgid "> top"
-msgstr "> haut"
-
-msgid "Copy my selected nodes to the start of the merged node list"
-msgstr "Copier mes nœuds sélectionnés au début de la version fusionnée"
-
-msgid "> bottom"
-msgstr "> bas"
-
-msgid "Copy my selected elements to the end of the list of merged elements."
-msgstr "Copier mes nœuds sélectionnés à la fin de la version fusionnée"
-
-msgid "> before"
-msgstr "> avant"
-
-msgid ""
-"Copy my selected elements before the first selected element in the list of "
-"merged elements."
-msgstr ""
-"Copier mes nœuds sélectionnés avant le premier nœud sélectionné de la "
-"version fusionnée"
-
-msgid "> after"
-msgstr "> après"
-
-msgid ""
-"Copy my selected elements after the first selected element in the list of "
-"merged elements."
-msgstr ""
-"Copier mes nœuds sélectionnés après le premier nœud sélectionné de la "
-"version fusionnée"
-
-msgid "< top"
-msgstr "< haut"
-
-msgid ""
-"Copy their selected element to the start of the list of merged elements."
-msgstr "Copier leurs nœuds sélectionnés au début de la version fusionnée"
-
-msgid "< bottom"
-msgstr "< bas"
-
-msgid ""
-"Copy their selected elements to the end of the list of merged elements."
-msgstr "Copier leurs nœuds sélectionnés à la fin de la version fusionnée"
-
-msgid "< before"
-msgstr "< avant"
-
-msgid ""
-"Copy their selected elements before the first selected element in the list "
-"of merged elements."
-msgstr ""
-"Copier leurs nœuds sélectionnés avant le premier nœud sélectionné de la "
-"version fusionnée"
-
-msgid "< after"
-msgstr "< après"
-
-msgid ""
-"Copy their selected element after the first selected element in the list of "
-"merged elements"
-msgstr ""
-"Copier leurs nœuds sélectionnés après le premier nœud sélectionné de la "
-"version fusionnée"
-
-msgid "Copy all my elements to the target"
-msgstr "Copier tous mes nœuds dans la version fusionnée"
-
-msgid "Copy all their elements to the target"
-msgstr "Copier tous leurs nœuds dans la version fusionnée"
-
-msgid "Up"
-msgstr "Monter"
-
-msgid "Move up the selected entries by one position."
-msgstr "Déplacer vers le haut les entrées sélectionnées d''un cran."
-
-msgid "Down"
-msgstr "Descendre"
-
-msgid "Move down the selected entries by one position."
-msgstr "Descendre les nœuds sélectionnés"
-
-msgid "Remove"
-msgstr "Supprimer"
-
-msgid "Remove the selected entries from the list of merged elements."
-msgstr "Supprimer les nœuds de la version fusionnée"
-
-msgid "Freeze"
-msgstr "Figer"
-
-msgid "Freeze the current list of merged elements."
-msgstr "Figer la version fusionnée"
-
-msgid "Unfreeze"
-msgstr "Libérer"
-
-msgid "Unfreeze the list of merged elements and start merging."
-msgstr "Libérer la liste des éléments fusionnés"
-
-msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
-msgstr ""
-"<html>Cliquez sur <strong>{0}</strong> pour fusionner les nœuds.</html>"
-
-msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
-msgstr ""
-"<html>Cliquez sur <strong>{0}</strong> pour interrompre la fusion des "
-"nœuds.</html>"
-
-msgid "My version ({0} entry)"
-msgid_plural "My version ({0} entries)"
-msgstr[0] "Ma version ({0} élément)"
-msgstr[1] "Ma version ({0} éléments)"
-
-msgid "Merged version ({0} entry)"
-msgid_plural "Merged version ({0} entries)"
-msgstr[0] "Version fusionnée ({0} élément)"
-msgstr[1] "Version fusionnée ({0} éléments)"
-
-msgid "Their version ({0} entry)"
-msgid_plural "Their version ({0} entries)"
-msgstr[0] "Version du serveur ({0} élément)"
-msgstr[1] "Version du serveur ({0} éléments)"
-
msgid "Node"
msgstr "Nœud"
@@ -5949,10 +5968,8 @@ msgstr "Rôle"
msgid "Primitive"
msgstr "Objet"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"Les nœuds fusionnés ne sont pas encore figés. Impossible de construire la "
-"commande de résolution"
msgid "<undefined>"
msgstr "<non défini>"
@@ -6996,7 +7013,7 @@ msgid "Sort"
msgstr "Trier"
msgid "Open the note in an external browser"
-msgstr ""
+msgstr "Ouvrir la note dans un navigateur externe"
msgid "Object type:"
msgstr "Type :"
@@ -7252,7 +7269,7 @@ msgid "Download the content of the selected changesets from the server"
msgstr "Télécharger le contenu du groupe de modifications"
msgid "Download changed objects"
-msgstr ""
+msgstr "Télécharger les objets modifiés"
msgid ""
"Download the current version of the changed objects in the selected "
@@ -7462,104 +7479,6 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr "Télécharger les groupes selon une zone délimitée"
-msgid "Query open changesets only"
-msgstr "Seulement les groupes ouverts"
-
-msgid "Query closed changesets only"
-msgstr "Seulement les groupes fermés"
-
-msgid "Query both open and closed changesets"
-msgstr "Tous les groupes"
-
-msgid "Only changesets owned by myself"
-msgstr "Seulement ceux que je possède"
-
-msgid "User ID:"
-msgstr "Identifiant :"
-
-msgid "User name:"
-msgstr "Nom d’utilisateur :"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Seulement ceux de l’utilisateur suivant"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "Seulement ceux de l’utilisateur suivant"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Seulement mes groupes de modifications (désactivé. JOSM est actuellement "
-"exécuté par un utilisateur anonyme)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Impossible de limiter la requête du groupe de modifications à l’utilisateur "
-"actuel car il est anonyme"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr ""
-"La valeur actuelle ''{0}'' de l’identifiant utilisateur n’est pas valide"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"Impossible de limiter la requête du groupe de modifications à l’utilisateur "
-"''{0}''"
-
-msgid "Please enter a valid user ID"
-msgstr "Veuillez entrer un identifiant utilisateur valide"
-
-msgid "Invalid user ID"
-msgstr "L’identifiant utilisateur n’est pas valide"
-
-msgid "Please enter a non-empty user name"
-msgstr "Veuillez entrer un nom d’utilisateur non vide"
-
-msgid "Invalid user name"
-msgstr "Le nom d’utilisateur n’est pas valide"
-
-msgid "Date: "
-msgstr "Date : "
-
-msgid "Time:"
-msgstr "Heure :"
-
-msgid "Closed after - "
-msgstr "Fermé après - "
-
-msgid "Date:"
-msgstr "Date :"
-
-msgid "Created before - "
-msgstr "Créé avant - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Seulement ceux fermés après la date et l’heure suivante"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-"Seulement ceux créés et fermés après les dates et les heures suivantes"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"Impossible de limiter la requête du groupe de modifications à des plages "
-"horaires. Les données ne sont pas valides."
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr ""
-"<html>Entrez des valeurs jour/heure valides pour restreindre<br>la requête à "
-"une période spécifique.</html>"
-
-msgid "Invalid date/time values"
-msgstr "Les valeurs date/temps ne sont valides"
-
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
"invalid."
@@ -7577,31 +7496,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "La zone délimitée n’est pas valide"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"La valeur n’est pas un identifiant utilisateur valide. Veuillez entrer un "
-"entier positif"
-
-msgid "Please enter an integer value > 0"
-msgstr "Veuillez entrer un entier positif"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Veuillez entrer une date dans le format de vos paramètres "
-"régionaux.<br>Exemple : {0}<br>Exemple : {1}<br>Exemple : {2}<br>Exemple : "
-"{3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Veuillez entrer un horodatage dans le format de vos paramètres "
-"régionaux.<br>Exemple : {0}<br>Exemple : {1}<br>Exemple : {2}<br>Exemple : "
-"{3}<br>"
-
msgid "Download my changesets only"
msgstr "Télécharger mes groupes de modifications"
@@ -7692,6 +7586,79 @@ msgstr "Cette adresse web est erronée"
msgid "Close the dialog and abort querying of changesets"
msgstr "Abandonner la requête et fermer la fenêtre"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Veuillez entrer une date dans le format de vos paramètres "
+"régionaux.<br>Exemple : {0}<br>Exemple : {1}<br>Exemple : {2}<br>Exemple : "
+"{3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Seulement les groupes ouverts"
+
+msgid "Query closed changesets only"
+msgstr "Seulement les groupes fermés"
+
+msgid "Query both open and closed changesets"
+msgstr "Tous les groupes"
+
+msgid "Date: "
+msgstr "Date : "
+
+msgid "Time:"
+msgstr "Heure :"
+
+msgid "Closed after - "
+msgstr "Fermé après - "
+
+msgid "Date:"
+msgstr "Date :"
+
+msgid "Created before - "
+msgstr "Créé avant - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Seulement ceux fermés après la date et l’heure suivante"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+"Seulement ceux créés et fermés après les dates et les heures suivantes"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Impossible de limiter la requête du groupe de modifications à des plages "
+"horaires. Les données ne sont pas valides."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Entrez des valeurs jour/heure valides pour restreindre<br>la requête à "
+"une période spécifique.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Les valeurs date/temps ne sont valides"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Veuillez entrer un horodatage dans le format de vos paramètres "
+"régionaux.<br>Exemple : {0}<br>Exemple : {1}<br>Exemple : {2}<br>Exemple : "
+"{3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"La valeur n’est pas un identifiant utilisateur valide. Veuillez entrer un "
+"entier positif"
+
+msgid "Please enter an integer value > 0"
+msgstr "Veuillez entrer un entier positif"
+
msgid "URL: "
msgstr "Adresse web : "
@@ -7713,6 +7680,56 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Cette adresse web n’est pas valide"
+msgid "Only changesets owned by myself"
+msgstr "Seulement ceux que je possède"
+
+msgid "User ID:"
+msgstr "Identifiant :"
+
+msgid "User name:"
+msgstr "Nom d’utilisateur :"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Seulement ceux de l’utilisateur suivant"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "Seulement ceux de l’utilisateur suivant"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Seulement mes groupes de modifications (désactivé. JOSM est actuellement "
+"exécuté par un utilisateur anonyme)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Impossible de limiter la requête du groupe de modifications à l’utilisateur "
+"actuel car il est anonyme"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr ""
+"La valeur actuelle ''{0}'' de l’identifiant utilisateur n’est pas valide"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"Impossible de limiter la requête du groupe de modifications à l’utilisateur "
+"''{0}''"
+
+msgid "Please enter a valid user ID"
+msgstr "Veuillez entrer un identifiant utilisateur valide"
+
+msgid "Invalid user ID"
+msgstr "L’identifiant utilisateur n’est pas valide"
+
+msgid "Please enter a non-empty user name"
+msgstr "Veuillez entrer un nom d’utilisateur non vide"
+
+msgid "Invalid user name"
+msgstr "Le nom d’utilisateur n’est pas valide"
+
msgid "Activate"
msgstr "Activer"
@@ -8916,6 +8933,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9315,6 +9335,7 @@ msgstr ""
msgid "Unsaved changes - Save/Upload before restarting?"
msgstr ""
+"Modifications non enregistrées − Enregistrer/Envoyer avant le redémarrage ?"
msgid "Uploading and saving modified layers ..."
msgstr "Envoi et enregistrement des calques modifiés…"
@@ -9388,10 +9409,10 @@ msgstr ""
"perdues)"
msgid "Restart now!"
-msgstr ""
+msgstr "Redémarrer maintenant !"
msgid "Restart JOSM without saving. Unsaved changes are lost."
-msgstr ""
+msgstr "Redémarrer JOSM sans enregistrer. Les modifications seront perdues."
msgid "Delete now!"
msgstr "Supprimer maintenant !"
@@ -10614,6 +10635,9 @@ msgstr "Sens"
msgid "Velocity, {0}"
msgstr "Vélocité, {0}"
+msgid "Wave Audio files (*.wav)"
+msgstr "Fichiers audio Wave (*.wav)"
+
msgid "Import Audio"
msgstr "Importer des sons"
@@ -10629,9 +10653,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Importation impossible"
-msgid "Wave Audio files (*.wav)"
-msgstr "Fichiers audio Wave (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Marqueurs audio de {0}"
@@ -10747,17 +10768,6 @@ msgstr "(L’adresse web était : "
msgid "Select the map painting styles"
msgstr "Sélectionner les styles de rendu de carte"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-"Échec du chargement des styles de rendu de ''{0}''. Lʼexception était : {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-"JOSM n''accepte plus les styles de rendu écrits à l''ancien format XML.\n"
-"Veuillez mettre à jour ''{0}'' avec MapCSS"
-
msgid "loading style ''{0}''..."
msgstr "Chargement du modèle ''{0}''…"
@@ -10774,6 +10784,10 @@ msgstr[1] ""
"Il y a eu {0} erreurs durant le chargement du modèle. Cliquez sur "
"\"Informations\" pour plus de détails."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+"Échec du chargement des styles de rendu de ''{0}''. Lʼexception était : {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
"Echec de lʼanalyse des styles Mappaint de ''{0}''. Lʼerreur était: {1}"
@@ -11897,6 +11911,9 @@ msgstr ""
msgid "Track date"
msgstr "La date"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Une seule couleur (personnalisable)"
@@ -11909,6 +11926,18 @@ msgstr "Vélos"
msgid "Foot"
msgstr "Piétons"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Bois"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Créer des marqueurs lors de la lecture de fichier GPX"
@@ -11921,6 +11950,9 @@ msgstr "Ajuster avec les limites des données"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "LIsser les graphiques GPX (anti-crènelage)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11992,6 +12024,11 @@ msgstr ""
"lisse."
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -12014,9 +12051,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "Colorier les traces et les points en fonction de l’’horodatage."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr "Colorier les traces et les points en fonction du type de véhicule."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Colorier les traces et les points selon :"
@@ -12640,29 +12684,31 @@ msgid "Configure the list of sites where plugins are downloaded from"
msgstr "Configurer les sites de téléchargement des greffons"
msgid "Load from list..."
-msgstr ""
+msgstr "Téléchargement depuis la liste…"
msgid "Load plugins from a list of plugins"
-msgstr ""
+msgstr "Téléchargement des plugins depuis une liste de plugins"
msgid "Disable all other plugins"
msgstr ""
msgid "Enter a list of plugins you want to download."
-msgstr ""
+msgstr "Entrez une liste de plugins que vous voulez télécharger."
msgid ""
"You should add one plugin id per line, version information is ignored."
msgstr ""
+"Ajoutez un identifiant de plugin par ligne, l''information sur la version "
+"est ignorée."
msgid "You can copy+paste the list of a status report here."
-msgstr ""
+msgstr "Vous pouvez copier/coller la liste d''un rapport de statut ici."
msgid "Load plugins from list"
-msgstr ""
+msgstr "Téléchargement des plugins depuis la liste"
msgid "The following plugins were not found. Continue anyway?"
-msgstr ""
+msgstr "Les plugins suivants n''ont pas été trouvés. Continuer quand même ?"
msgid "Add JOSM Plugin description URL."
msgstr "Ajouter une adresse web de téléchargement des greffons :"
@@ -13322,6 +13368,12 @@ msgstr "Vérifier les erreurs sur les objets religieux"
msgid "Checks for errors on relations"
msgstr "Vérifier les erreurs sur les relations"
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr "Attributs inutiles"
@@ -14520,6 +14572,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Enregistrer le nom d’utilisateur et le mot de passe"
+msgid "Assume"
+msgstr "Supposer"
+
+msgid "Existing values"
+msgstr "Valeurs existantes"
+
msgid "<delete from {0} objects>"
msgstr "<supprimé de {0} objets>"
@@ -14541,12 +14599,6 @@ msgstr "Ajouter les attributs vérifiés aux objets sélectionnés."
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Enter : Ajouter tous les attributs aux objets sélectionnés"
-msgid "Assume"
-msgstr "Supposer"
-
-msgid "Existing values"
-msgstr "Valeurs existantes"
-
msgid "Enable the checkbox to accept the value"
msgstr "Autoriser la checkbox à prendre la valeur"
@@ -15758,6 +15810,9 @@ msgstr ""
"Conflit silencieux de raccourci clavier: ''{0}''déplacé par ''{1}'' vers "
"''{2}''."
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "Il y a eu {0} attribut trouvé dans le buffer, c’est suspect!"
@@ -15856,18 +15911,21 @@ msgid ""
"This is always a coding error. If you are running the latest version of "
"JOSM, please consider being kind and file a bug report."
msgstr ""
+"Une erreur inattendue est survenue.\n"
+"Il s''agit toujours d''une erreur de codage. Si vous utilisez la dernière "
+"version de JOSM, merci de compléter un rapport d''erreur."
msgid "Debug information"
msgstr "Information de débogage"
msgid "Manually report at:"
-msgstr ""
+msgstr "Reporter manuellement à :"
msgid "Is JOSM up to date?"
msgstr "JOSM est-il à jour ?"
msgid "Send bug report"
-msgstr ""
+msgstr "Envoyer le rapport de bogue"
msgid ""
"If you are running the latest version of JOSM and the plugins, please file a "
@@ -15876,6 +15934,10 @@ msgid ""
"include information on how to reproduce the error and try to supply as much "
"detail as possible."
msgstr ""
+"Si JOSM et ses greffons sont à jour, veuillez créer un ticket sur notre "
+"plateforme.\n"
+"Le rapport d''erreur sera pré-rempli. Merci d''indiquer comment reproduire "
+"ce problème tout en fournissant un maximum de détails."
msgid "Report Bug"
msgstr "Rapporter l’erreur"
@@ -15887,7 +15949,7 @@ msgid "Suppress further error dialogs for this session."
msgstr "Masquer les prochaines fenêtres d’erreur pour cette session."
msgid "Ignore this error."
-msgstr ""
+msgstr "Ignorer cette erreur."
msgid ""
"Opening the bug report failed. Please report manually using this website:"
@@ -15900,6 +15962,8 @@ msgstr "Joindre un rapport d''état du système."
msgid "Include information about the data you were working on."
msgstr ""
+"Inclure des informations sur les données sur lesquelles vous étiez en train "
+"de travailler."
msgid "Include all stack traces."
msgstr ""
@@ -15923,6 +15987,8 @@ msgid ""
"Before you file a bug report make sure you have updated to the latest "
"version of JOSM here:"
msgstr ""
+"Avant de compléter un rapport d''erreur, assurez-vous d''utiliser la "
+"dernière version de JOSM disponible ici :"
msgid "Update JOSM"
msgstr "Mise à jour de JOSM"
@@ -16277,14 +16343,17 @@ msgstr "Satellite Mapbox"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr "OpenSeaMap"
-msgid "OpenStreetMap Carto (Standard layer)"
-msgstr "OpenStreetMap Carto (couche standard)"
+msgid "OpenStreetMap Carto (Standard)"
+msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik noir et blanc)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr "OpenStreetMap (Standard noir et blanc)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, sans étiquettes)"
@@ -16307,8 +16376,11 @@ msgstr "Hike & Bike"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Cambodge, Laos, Thaïlande, Vietnam bilingues"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "Surcouche OpenPT Map"
@@ -16320,13 +16392,13 @@ msgid "Strava running heatmap"
msgstr "Carte de chaleur piéton de Strava"
msgid "Strava cycling and running heatmap"
-msgstr ""
+msgstr "Strava − Carte de chaleur vélo et course à pied"
msgid "Locator Overlay"
msgstr "Surcouche Localisation"
msgid "QA No Address"
-msgstr ""
+msgstr "QA Pas d''adresse"
msgid "Waymarked Trails: Hiking"
msgstr "Waymarked Trails : Randonnée"
@@ -16358,8 +16430,8 @@ msgstr "OSM Inspector: Lieux"
msgid "OSM Inspector: Highways"
msgstr "OSM Inspector : Routes"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM Inspector : Multipolygone"
+msgid "OSM Inspector: Area"
+msgstr "OSM Inspector : Surfaces"
msgid "OSM Inspector: Routing"
msgstr "OSM Inspector : Routage"
@@ -16367,11 +16439,23 @@ msgstr "OSM Inspector : Routage"
msgid "OSM Inspector: Addresses"
msgstr "OSM Inspector : Adresses"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM Inspector : Frontières (Europe)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr "OSM Inspector : Ligne de côte (UE)"
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
-msgid "IGN Argentina (WMTS)"
-msgstr "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
+msgstr ""
msgid "IGN Argentina (WMS)"
msgstr "IGN Argentina (WMS)"
@@ -16406,6 +16490,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -16425,7 +16515,7 @@ msgid "Tiris: DOM (Surface model)"
msgstr "Tiris : DOM (modèle de surface)"
msgid "Tiris: contour lines"
-msgstr ""
+msgstr "Tiris : Courbes de niveau"
msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr "Vienne : Mehrzweckkarte (cadre général)"
@@ -16451,10 +16541,16 @@ msgstr "VoGIS : Plan de zonage"
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
+msgstr ""
+
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -16490,8 +16586,17 @@ msgstr "Imagerie aérienne SPW(allonie) 2009-2010"
msgid "TEC bus lines (2014)"
msgstr "Lignes du réseau TEC (2014)"
-msgid "Benin:cotonou_pleiade_2016"
-msgstr "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr "Benin : Cotonou Pleiade 2016"
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
msgid "IBGE Mapa de Setores Urbanos"
msgstr "IBGE Carte des secteurs urbains"
@@ -16499,6 +16604,15 @@ msgstr "IBGE Carte des secteurs urbains"
msgid "IBGE Mapa de Setores Rurais"
msgstr "IBGE Carte des secteurs ruraux"
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Hydrographie Geobase"
@@ -16511,12 +16625,34 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "Mosaïque de la Colombie Britannique"
+msgid "Latest southwest British Columbia Landsat"
+msgstr ""
+
msgid "Kelowna 2012"
msgstr "Kelowna 2012"
msgid "Kelowna Roads overlay"
msgstr "Surcouche Routes Kelowna"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr ""
+
msgid "Czech CUZK:KM"
msgstr "République tchèque CUZK:KM"
@@ -16553,6 +16689,12 @@ msgstr "Stevns (Danemark)"
msgid "Vejmidte (Denmark)"
msgstr "Vejmidte (Danemark)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Carte de base estonienne (Maaamet)"
@@ -16586,9 +16728,6 @@ msgstr "Cadastre"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr "CRAIG - Auvergne 2013 - 25 cm"
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "GrandNancy Orthophotographie 2012"
@@ -16647,9 +16786,6 @@ msgstr ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
"- 1 m"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Langue Sorabe)"
-
msgid "Hamburg (40 cm)"
msgstr "Hambourg (40 cm)"
@@ -16675,19 +16811,16 @@ msgid "Berlin aerial photograph 2015"
msgstr "Imagerie aérienne Berlin 2015"
msgid "Berlin aerial photograph 2016"
-msgstr ""
-
-msgid "Stuttgart (aerial imagery)"
-msgstr "Stuttgart (imagerie aérienne)"
+msgstr "Berlin Photographie aérienne 2016"
msgid "Erlangen aerial imagery (2016 5.0 cm)"
-msgstr ""
+msgstr "Erlangen imagerie aérienne (2016 5.0 cm)"
msgid "Erlangen aerial imagery (2013 6.25 cm)"
msgstr "Imagerie aérienne d''Erlangue (2013 6,25 cm)"
msgid "Erlangen aerial imagery (2011 5.0 cm)"
-msgstr ""
+msgstr "Erlangen imagerie aérienne (2011 5.0 cm)"
msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
@@ -16715,9 +16848,54 @@ msgstr "NRW-Atlas : Carte topographique 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Imagerie drone (Haïti)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Imagerie drone 2014 (Haïti)"
@@ -16754,19 +16932,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
+msgstr "OpenStreetMap Hongrie (chemins de randonnée)"
+
+msgid "Hillshade Hungary"
+msgstr "Ombrage Hongrie"
+
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -16829,9 +17016,21 @@ msgstr "PCN 2012 - Italie"
msgid "South Tyrol Orthofoto 2011"
msgstr "Orthophotographie Sud Tyrol 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr "Carte topographique Sud Tyrol"
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "USSR - Lettonie"
@@ -16865,12 +17064,34 @@ msgstr "Delta du Niger Oct 2012 Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Bande de Gaza - Pléiades - 2014/07/06"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Bande de Gaza - Pléiades - 2014/07/06 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Pangasinan/Bulacan (Phillippines HiRes)"
@@ -16997,9 +17218,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Zabrze: Ortofotomapa 2011 (image aérienne)"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Szlaki (chemins)"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr "Wrocław : Orthophotographie 2015 (imagerie aérienne)"
@@ -17009,6 +17227,20 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Voiture"
@@ -17030,12 +17262,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr "Métropole du Cap 2013 aérien"
+
msgid "City of Cape Town 2015 Aerial"
-msgstr ""
+msgstr "Métropole du Cap 2015 aérien"
msgid "South Africa CD:NGI Aerial"
msgstr "Afrique du Sud CD:NGI Aérien"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr "Cadastre de l’Espagne"
@@ -17057,6 +17307,9 @@ msgstr "IDEIB - Îles Baléares"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Îles Canaries"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Canton d''Argovie 25 cm (AGIS 2011)"
@@ -17099,6 +17352,9 @@ msgstr "Canton de Fribourg 50 cm (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Ville de Berne 10cm/25cm (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25 cm (2007)"
@@ -17120,6 +17376,12 @@ msgstr "Bonvillars Orthophoto 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Fiez Orthophoto 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -17135,6 +17397,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -17162,12 +17427,57 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr "Service forestier des routes (États-Unis)"
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr "Texas Orthophoto"
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ukraine - Orthophoto 2012"
-msgid "Ukraine - Kyiv 2014 (DZK)"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
msgstr ""
+msgid "Ukraine - Kyiv 2014 (DZK)"
+msgstr "Ukraine - Kiev 2014 (DZK)"
+
msgid "7th Series (OS7)"
msgstr ""
@@ -17186,9 +17496,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1res Séries 1937-61"
@@ -17198,9 +17505,6 @@ msgstr "NLS - OS 1-inch 7e Séries 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25k historique (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -17543,8 +17847,8 @@ msgstr ""
msgid "Create a grid of ways."
msgstr "Crée un réseau de chemins."
-msgid "Customization of public transport stops."
-msgstr "Personnalisation des arrêts des transports publics"
+msgid "Customization of public public transport stops."
+msgstr ""
msgid ""
"Creating and handling address nodes and buildings within Czech Republic."
@@ -17653,6 +17957,9 @@ msgstr ""
"Génère les limites au format XML d’une source d’imagerie à partir d’un "
"multipolygone"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18310,15 +18617,15 @@ msgstr ""
msgctxt "electrified"
msgid "no"
-msgstr ""
+msgstr "non"
msgctxt "electrified"
msgid "yes"
-msgstr ""
+msgstr "oui"
msgctxt "electrified"
msgid "rail"
-msgstr ""
+msgstr "rail"
msgid "Voltage in Volts (V)"
msgstr "Voltage en Volts (V)"
@@ -20171,6 +20478,9 @@ msgstr "Ruisseau"
msgid "River"
msgstr "Fleuve, rivière"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Canal"
@@ -20817,22 +21127,22 @@ msgid "Truck"
msgstr "Camion"
msgid "Number of Sockets:"
-msgstr ""
+msgstr "Nombre de prises :"
msgid "Type 1 (Yazaki)"
-msgstr ""
+msgstr "Type 1 (Yazaki)"
msgid "Type 1 Combo"
msgstr ""
msgid "Type 2 (Mennekes)"
-msgstr ""
+msgstr "Type 2 (Mennekes)"
msgid "Type 2 Combo"
msgstr ""
msgid "Type 3 (SCAME)"
-msgstr ""
+msgstr "Type 3 (SCAME)"
msgid "CHAdeMO"
msgstr "CHAdeMO"
@@ -20859,19 +21169,19 @@ msgid "NEMA 5-20"
msgstr "NEMA 5-20"
msgid "Authentication:"
-msgstr ""
+msgstr "Authentification :"
msgid "Phone call"
-msgstr ""
+msgstr "Appel téléphonique"
msgid "Short message"
-msgstr ""
+msgstr "Message court"
msgid "NFC"
msgstr "NFC"
msgid "Membership card"
-msgstr ""
+msgstr "Carte de membre"
msgid "Wash"
msgstr "Lavage"
@@ -21232,6 +21542,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr "Chambre d’hôtes/Bed & Breakfast"
+msgid "Apartment"
+msgstr "Appartement"
+
+msgid "Number of apartments"
+msgstr "Nombre d''appartements"
+
msgid "Chalet"
msgstr "Meublé de tourisme"
@@ -21298,6 +21614,12 @@ msgstr "terrasse"
msgid "Takeaway"
msgstr "Plat à emporter"
+msgid "Delivery"
+msgstr "Livraison"
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast-food"
@@ -22246,31 +22568,19 @@ msgstr "observation"
msgid "Hunting Stand"
msgstr "Abri de chasse"
-msgid "Height"
-msgstr "Hauteur"
-
-msgctxt "height"
-msgid "low"
-msgstr "bas"
-
-msgctxt "height"
-msgid "half"
-msgstr "moyen"
-
-msgctxt "height"
-msgid "full"
-msgstr "haut"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr "Dissimulé"
-msgid "Lock"
-msgstr "Verrouillé"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr "Point d''eau"
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr "Air comprimé"
@@ -22832,7 +23142,7 @@ msgstr "bâtiment public"
msgctxt "building"
msgid "ruins"
-msgstr ""
+msgstr "ruines"
msgctxt "building"
msgid "Levels"
@@ -22862,6 +23172,10 @@ msgid "hut"
msgstr "refuge"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr "résidence dortoire"
@@ -24162,14 +24476,17 @@ msgstr "Boucherie"
msgid "Seafood"
msgstr "Poissonnerie"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Épicerie fine"
msgid "Pastry"
-msgstr ""
+msgstr "Pâtisserie"
msgid "Confectionery"
-msgstr ""
+msgstr "Confiserie"
msgid "Tea"
msgstr "Thé"
@@ -24334,10 +24651,10 @@ msgid "Hairdresser/Barber"
msgstr "Coiffeur/Barbier"
msgid "Female"
-msgstr ""
+msgstr "Féminin"
msgid "Male"
-msgstr ""
+msgstr "Masculin"
msgid "Unisex"
msgstr "Unisexe"
@@ -24979,9 +25296,6 @@ msgstr "Rangée d''arbres"
msgid "A line of trees."
msgstr "Une ligne d’arbres."
-msgid "Wood"
-msgstr "Bois"
-
msgid "Woodland where timber production does not dominate use."
msgstr "Zone boisée où l’exploitation forestière n’est pas prédominante."
@@ -25058,7 +25372,7 @@ msgid "An accumulation of loose angular rocks."
msgstr ""
msgid "Shingle"
-msgstr ""
+msgstr "Galet"
msgid "An accumulation of loose rounded rocks on a beach or riverbed."
msgstr ""
@@ -25224,13 +25538,13 @@ msgid "Plant Nursery"
msgstr "Pépinière"
msgid "Aquaculture"
-msgstr ""
+msgstr "Aquaculture"
msgid "shrimp"
-msgstr ""
+msgstr "crevette"
msgid "mussels"
-msgstr ""
+msgstr "moules"
msgid "Allotments"
msgstr "Jardins familiaux"
@@ -26047,6 +26361,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0} est déprécié"
@@ -26125,7 +26442,7 @@ msgid "Definition of {0} is unclear"
msgstr "La définition de {0} n’est pas claire"
msgid "{0} + {1} + {2}"
-msgstr ""
+msgstr "{0} + {1} + {2}"
msgid ""
"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
@@ -26133,7 +26450,7 @@ msgstr ""
"{0} est déconseillé. Utilisez la fonction Inverser le chemin du menu Outils."
msgid "{0}"
-msgstr ""
+msgstr "{0}"
msgid "key with uncommon character"
msgstr "clé avec un caractère non usuel"
@@ -26156,6 +26473,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr "La clé {0} possède une valeur peu courante."
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} sur un nœud. Devrait être employé sur un chemin."
@@ -26196,7 +26519,7 @@ msgid "Overlapping Identical Landuses"
msgstr "Terrains identiques se chevauchant"
msgid "isolated node which must be connected to a way"
-msgstr ""
+msgstr "nœud isolé qui doit être connecté à un chemin"
msgid "node connects waterway and bridge"
msgstr "le noeud est à l’intersection d’un cours d’eau et d’un pont"
@@ -26235,6 +26558,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} devrait être sur le nœud où {1} et {2} se croisent"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "abbréviation du nom de rue"
@@ -26259,6 +26587,9 @@ msgstr "{0} utilisé avec {1}"
msgid "street name contains ss"
msgstr "le nom de rue contient ss"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -26645,7 +26976,7 @@ msgstr ""
"Veuillez ouvrir ou créer un calque de données avant de faire l’importation."
msgid "Import dxf"
-msgstr ""
+msgstr "Import dxf"
msgid "Scale:"
msgstr "Échelle :"
@@ -27089,6 +27420,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr "Envoi de photographies"
@@ -27131,7 +27472,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -28054,6 +28395,9 @@ msgstr ""
msgid "Area Selector"
msgstr "Sélecteur d’aire"
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr "Zone créée"
@@ -28102,11 +28446,9 @@ msgid "Algorithm"
msgstr "Algorithme"
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
-"Éloignement maximum en pixels entre un point et une ligne pour qu’il soit "
-"quand même considéré sur cette ligne (par défault : {0})."
msgid "Distance Tolerance"
msgstr "Tolérance de distance"
@@ -28180,7 +28522,7 @@ msgid "There is no frame loaded !"
msgstr ""
msgid "Alert Message"
-msgstr ""
+msgstr "Message d’alerte"
msgid "Street Name:"
msgstr "Nom de la rue :"
@@ -29845,6 +30187,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Ouvrir un fichier d’’imagerie XML"
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr "Calque de calibration"
@@ -32161,9 +32562,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -32323,9 +32721,6 @@ msgstr "[Id] {0}"
msgid "[gap]"
msgstr "[écart]"
-msgid " [ID] {0}"
-msgstr " [Id] {0}"
-
msgid "Route patterns ..."
msgstr "Dessins de l’itinéraire…"
@@ -32383,6 +32778,9 @@ msgstr "côté de la main gauche"
msgid "Maximum distance from route"
msgstr "Distance maximale depuis la route"
+msgid " [ID] {0}"
+msgstr " [Id] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "Transport public : modifier le type d’arrêt"
@@ -32588,11 +32986,6 @@ msgstr "Reconstruire le polygone"
msgid "Multipolygon must consist only of ways"
msgstr "Le multipolygone ne doit être constitué que de chemins"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-"La reconstruction de polygones ne peut se faire que depuis des chemins "
-"extérieurs"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Reconstruire les polygones de la relation {0}"
@@ -33023,25 +33416,25 @@ msgid "Shape mode control panel"
msgstr ""
msgid "Rotate Mode:"
-msgstr ""
+msgstr "Mode rotation :"
msgid "Clockwise"
-msgstr ""
+msgstr "Sens horaire"
msgid "Counter Clockwise"
-msgstr ""
+msgstr "Sens anti-horaire"
msgid "Input angle here"
-msgstr ""
+msgstr "Entrer l''angle ici"
msgid "Rotate"
-msgstr ""
+msgstr "Pivoter"
msgid "Align building "
-msgstr ""
+msgstr "Aligner le batiment "
msgid "Select building"
-msgstr ""
+msgstr "Selectionner un bâtiment"
msgid "Select road"
msgstr ""
@@ -33050,13 +33443,13 @@ msgid "Select none"
msgstr ""
msgid "Min Distance:"
-msgstr ""
+msgstr "Distance minimale :"
msgid "Input min distance"
msgstr ""
msgid "Align all buildings"
-msgstr ""
+msgstr "Aligner tous les bâtiments"
msgid "Delete overlay"
msgstr ""
@@ -33377,7 +33770,7 @@ msgid "Pass over element without marking it"
msgstr ""
msgid "Mark element done"
-msgstr ""
+msgstr "Marquer l''élément comme fait"
msgid "Todo list"
msgstr ""
@@ -33482,10 +33875,10 @@ msgid "Tasks"
msgstr ""
msgid "Config"
-msgstr ""
+msgstr "Configurer"
msgid "Activation"
-msgstr ""
+msgstr "Activer"
msgid "tofix:Skip item"
msgstr "À réparer:Passer l''élément"
@@ -33497,7 +33890,7 @@ msgid "tofix:Not a Error item"
msgstr "À réparer:Élément sans erreur"
msgid "Activate to-fix plugin."
-msgstr ""
+msgstr "Activer le plugin to-fix"
msgid "Maintenance server"
msgstr "Serveur de maintenance"
@@ -33513,10 +33906,10 @@ msgid "Something went wrong, try again"
msgstr "Quelque chose a mal tourné, essayez à nouveau"
msgid "No change to upload!"
-msgstr ""
+msgstr "Pas de modification à envoyer"
msgid "The bounding box is too big."
-msgstr ""
+msgstr "La Bbox est trop grande."
msgid "Cannot place a node outside of the world."
msgstr "Impossible de placer un nœud hors du monde."
@@ -35497,10 +35890,10 @@ msgid "Not linked yet"
msgstr "Pas encore lié"
msgid "{0}: {1}"
-msgstr ""
+msgstr "{0} : {1}"
msgid "Wikidata"
-msgstr ""
+msgstr "Wikidata"
msgid "Fetches all coordinates from Wikidata in the current view"
msgstr ""
diff --git a/i18n/po/ga.po b/i18n/po/ga.po
index 01ef2d3..6a5c4f9 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:45+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:50+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -63,9 +63,15 @@ msgstr ""
msgid "Help"
msgstr "Cabhair"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -200,6 +206,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -221,12 +233,6 @@ msgstr "Earráid"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -707,6 +713,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -728,9 +737,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -781,6 +787,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -930,16 +939,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -948,6 +957,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -963,12 +978,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1761,9 +1770,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3949,9 +3955,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3981,12 +3984,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4679,12 +4697,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4701,8 +4725,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5023,9 +5047,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5164,82 +5185,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5405,6 +5350,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5464,7 +5485,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6856,212 +6877,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8167,6 +8188,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9653,6 +9677,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9665,9 +9692,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9764,14 +9788,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9784,6 +9800,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10772,6 +10791,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10784,6 +10806,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10796,6 +10830,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10855,6 +10892,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10873,9 +10915,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12070,6 +12119,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13105,6 +13160,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13126,12 +13187,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14091,6 +14146,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14579,13 +14637,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14609,7 +14670,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14660,7 +14724,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14669,10 +14733,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14708,6 +14784,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14753,10 +14835,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14789,34 +14877,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14855,6 +14983,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14888,9 +15022,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14947,9 +15078,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14977,9 +15105,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15013,9 +15138,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15052,19 +15222,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15127,9 +15306,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15163,12 +15354,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15295,9 +15508,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15307,6 +15517,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15328,12 +15552,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15355,6 +15597,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15397,6 +15642,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15418,6 +15666,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15433,6 +15687,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15460,9 +15717,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15484,9 +15786,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15496,9 +15795,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15810,7 +16106,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15898,6 +16194,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18294,6 +18593,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19342,6 +19644,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19408,6 +19716,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20351,31 +20665,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20967,6 +21269,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22260,6 +22566,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23073,9 +23382,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24120,6 +24426,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24211,6 +24520,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24287,6 +24602,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24311,6 +24631,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25084,6 +25407,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25126,7 +25459,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25929,6 +26262,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25970,8 +26306,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27569,6 +27905,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29730,9 +30125,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29890,9 +30282,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29950,6 +30339,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30147,9 +30539,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/gl.po b/i18n/po/gl.po
index 0f551dd..f7797e0 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:46+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:51+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: gl\n"
"X-Poedit-Language: Galician\n"
@@ -67,9 +67,15 @@ msgstr "Construindo o menú principal"
msgid "Help"
msgstr "Axuda"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Inicializando API de OSM"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Inicializando validador"
@@ -210,6 +216,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr "Escoller no mapa os elementos escollidoss na lista superior."
+msgid "Select WMS layers"
+msgstr "Seleccionar capas WMS"
+
+msgid "Add layers"
+msgstr "Engadir capas"
+
msgid "Add imagery layer {0}"
msgstr "Engadir capa de imaxes {0}"
@@ -231,12 +243,6 @@ msgstr "Erro"
msgid "Select image format for WMS layer"
msgstr "Seleccionar un formato de imaxe para a capa WMS"
-msgid "Select WMS layers"
-msgstr "Seleccionar capas WMS"
-
-msgid "Add layers"
-msgstr "Engadir capas"
-
msgid "Add Node..."
msgstr "Engadir un nodo…"
@@ -759,6 +765,9 @@ msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
"Abre un diálogo que che permite saltar a unha localización específica"
+msgid "Jump to Position"
+msgstr "Saltar a posición"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Introduce Lat/Lon para saltar á posición"
@@ -780,9 +789,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Saltar ahi"
-msgid "Jump to Position"
-msgstr "Saltar a posición"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Non foi posíbel analizar a latitude, lonxitude e/ou o zoom. Comprobeo"
@@ -838,6 +844,9 @@ msgstr "Combinar a capa"
msgid "Merge the current layer into another layer"
msgstr "Combinar a capa actual con outra capa"
+msgid "{0} completed in {1}"
+msgstr "{0} completado en {1}"
+
msgid "Merging layers with different upload policies"
msgstr "A combinar capas con diferentes políticas de carga"
@@ -1010,24 +1019,30 @@ msgstr[1] "Abrindo {0} ficheiros"
msgid "Opening file ''{0}'' ..."
msgstr "Abrindo o ficheiro «{0}»…"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Ok"
+
msgid "Open Location..."
msgstr "Abrir Lugar…"
msgid "Open an URL."
msgstr "Abrir un URL."
-msgid "Separate Layer"
-msgstr "Capa separada"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Escoller se o dato debería estar nunha nova capa"
-
msgid "Enter URL to download:"
msgstr "Introducir o URL a descargar:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Introduce un URL desde o cal os datos deberían ser descargados"
+msgid "Separate Layer"
+msgstr "Capa separada"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Escoller se o dato debería estar nunha nova capa"
+
msgid "Download Location"
msgstr "Descargar Lugar"
@@ -1043,12 +1058,6 @@ msgstr "Pecha o diálogo e cancela a descarga"
msgid "Download Data"
msgstr "Descargar datos"
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr "Ok"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1902,9 +1911,6 @@ msgstr "Pedir e descargar conxuntos de cambios…"
msgid "Errors during download"
msgstr "Erros durante a descarga"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -4157,9 +4163,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -4189,12 +4192,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr "O multipolígono non está pechado"
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4892,12 +4910,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr "opción dadas polas propiedades do sistema de Java"
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4914,8 +4938,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5244,9 +5268,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr "{0} completado en {1}"
-
msgid "Enlarge"
msgstr ""
@@ -5388,86 +5409,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr "O meu deles"
-
-msgid "My with Merged"
-msgstr "O meu co combinado"
-
-msgid "Their with Merged"
-msgstr "O deles co combinado"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "A regra {0} non está a participar na comparación do par {1}."
-
-msgid "Properties"
-msgstr "Propiedades"
-
-msgid "Tags"
-msgstr "Etiquetas"
-
-msgid "Nodes"
-msgstr "Nodos"
-
-msgid "Members"
-msgstr "Membros"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Ningún hai ningún conflito de etiquetas pendente de ser resolto"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Etiquetas({0} conflito)"
-msgstr[1] "Etiquetas({0} conflitos)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} etiqueta pendente de resolver conflito"
-msgstr[1] "{0} etiquetas pendentes de resolver conflitos"
-
-msgid "Nodes(resolved)"
-msgstr "Nodos(resolto)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Lista de nodos combinados conxelada. Non hai conflitos pendentes na lista de "
-"nodos desta vía."
-
-msgid "Nodes(with conflicts)"
-msgstr "Nodos(con conflitos)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Conflitos pendentes na lista de nodos desta vía"
-
-msgid "Members(resolved)"
-msgstr "Membros(resolto)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Lista de membros combinados conxelada. Non hai conflitos pendentes na lista "
-"de membros desta relación."
-
-msgid "Members(with conflicts)"
-msgstr "Membros (con conflitos)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Conflitos pendentes na lista de membros desta relación"
-
-msgid "No pending property conflicts"
-msgstr "Ningún conflito de propiedades pendente"
-
-msgid "Properties(with conflicts)"
-msgstr "Propiedades(con conflitos)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Conflitos de propiedades pendentes de resolver"
-
-msgid "Conflict Resolution"
-msgstr "Resolución de conflitos"
-
msgid "{0} more..."
msgstr "{0} mais…"
@@ -5655,6 +5596,86 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "A version de eles({0} entrada)"
msgstr[1] "A version de eles({0} entradas)"
+msgid "My with Their"
+msgstr "O meu deles"
+
+msgid "My with Merged"
+msgstr "O meu co combinado"
+
+msgid "Their with Merged"
+msgstr "O deles co combinado"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "A regra {0} non está a participar na comparación do par {1}."
+
+msgid "Properties"
+msgstr "Propiedades"
+
+msgid "Tags"
+msgstr "Etiquetas"
+
+msgid "Nodes"
+msgstr "Nodos"
+
+msgid "Members"
+msgstr "Membros"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Ningún hai ningún conflito de etiquetas pendente de ser resolto"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Etiquetas({0} conflito)"
+msgstr[1] "Etiquetas({0} conflitos)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} etiqueta pendente de resolver conflito"
+msgstr[1] "{0} etiquetas pendentes de resolver conflitos"
+
+msgid "Nodes(resolved)"
+msgstr "Nodos(resolto)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Lista de nodos combinados conxelada. Non hai conflitos pendentes na lista de "
+"nodos desta vía."
+
+msgid "Nodes(with conflicts)"
+msgstr "Nodos(con conflitos)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Conflitos pendentes na lista de nodos desta vía"
+
+msgid "Members(resolved)"
+msgstr "Membros(resolto)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Lista de membros combinados conxelada. Non hai conflitos pendentes na lista "
+"de membros desta relación."
+
+msgid "Members(with conflicts)"
+msgstr "Membros (con conflitos)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Conflitos pendentes na lista de membros desta relación"
+
+msgid "No pending property conflicts"
+msgstr "Ningún conflito de propiedades pendente"
+
+msgid "Properties(with conflicts)"
+msgstr "Propiedades(con conflitos)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Conflitos de propiedades pendentes de resolver"
+
+msgid "Conflict Resolution"
+msgstr "Resolución de conflitos"
+
msgid "Node"
msgstr "Nodo"
@@ -5719,10 +5740,8 @@ msgstr "Rol"
msgid "Primitive"
msgstr "Primitiva"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"Os nodos combinados aínda non están conxelados. Non é posíbel construír a "
-"orde de resolución."
msgid "<undefined>"
msgstr "<indefinido>"
@@ -7150,109 +7169,14 @@ msgstr ""
"Escolle os conxuntos de cambios dependendo de quen as abrira ou pechara"
msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr ""
-"Escoller conxuntos de cambios baseándose na data/tempo que foron creados ou "
-"pechados"
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr ""
-"Escoller só os conxuntos de cambios relativos a un recuadro de selección"
-
-msgid "Query open changesets only"
-msgstr "Pedir só conxuntos de cambios abertos"
-
-msgid "Query closed changesets only"
-msgstr "Pedir só conxuntos de cambios pechados"
-
-msgid "Query both open and closed changesets"
-msgstr "Pedir tanto conxuntos de cambios abertos coma pechados"
-
-msgid "Only changesets owned by myself"
-msgstr "Só conxuntos de cambios que me pertencen a min mismo"
-
-msgid "User ID:"
-msgstr "ID do usuario:"
-
-msgid "User name:"
-msgstr "Nome de usuario:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Só conxuntos de cambios que lle pertencen ao seguinte ID de usuario"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-"Só conxuntos de cambios que lle pertencen ao seguinte nome de usuario"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Non se pode restrinxir a petición ao usuario actual porque o usuario actual "
-"e anónimo"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "O valor actual «{0}» para o identificador de usuario non é válido."
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"Non é posíbel restrinxir a petición de conxuntos de cambios ao nome de "
-"usuario «{0}»"
-
-msgid "Please enter a valid user ID"
-msgstr "Introduza un ID de usuario válido"
-
-msgid "Invalid user ID"
-msgstr "ID de usuario inválido"
-
-msgid "Please enter a non-empty user name"
-msgstr "Introduza un nome de usuario non baleiro"
-
-msgid "Invalid user name"
-msgstr "O nome do usuario non é válido"
-
-msgid "Date: "
-msgstr "Data: "
-
-msgid "Time:"
-msgstr ""
-
-msgid "Closed after - "
-msgstr "Pechado despois - "
-
-msgid "Date:"
-msgstr "Data:"
-
-msgid "Created before - "
-msgstr "Creado antes - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Só conxuntos de cambios pechados despois da seguinte data/tempo"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-"Só conxuntos de cambios pechados despois e creados antes de unha data/tempo "
-"específica."
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"Non foi posíbel construír a petición de conxunto de cambios coas restrición "
-"baseadas no tempo. A entrada non é válida."
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Select changesets based on the date/time they have been created or closed"
msgstr ""
+"Escoller conxuntos de cambios baseándose na data/tempo que foron creados ou "
+"pechados"
-msgid "Invalid date/time values"
-msgstr "Valores data/tempo inválidas"
+msgid "Select only changesets related to a specific bounding box"
+msgstr ""
+"Escoller só os conxuntos de cambios relativos a un recuadro de selección"
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
@@ -7269,29 +7193,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Xanela de selección incorrecta"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"O valor actual non é unha ID válida de usuario. Introduza un valor enteiro "
-"maior que cero"
-
-msgid "Please enter an integer value > 0"
-msgstr "Introduza un enteiro de valor > 0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Introduce unha data na forma usual para a túa rexión.<br>Exemplo: "
-"{0}<br>Exemplo: {1}<br>Exemplo: {2}<br>Exemplo: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Introduce un tempo válido na forma usual para a túa rexión.<br>Exemplo: "
-"{0}<br>Exemplo: {1}<br>Exemplo: {2}<br>Exemplo: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Descargar só as miñas modificacións"
@@ -7370,6 +7271,76 @@ msgstr "URL de consulta de conxuntos de cambios incorrecto"
msgid "Close the dialog and abort querying of changesets"
msgstr ""
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Introduce unha data na forma usual para a túa rexión.<br>Exemplo: "
+"{0}<br>Exemplo: {1}<br>Exemplo: {2}<br>Exemplo: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Pedir só conxuntos de cambios abertos"
+
+msgid "Query closed changesets only"
+msgstr "Pedir só conxuntos de cambios pechados"
+
+msgid "Query both open and closed changesets"
+msgstr "Pedir tanto conxuntos de cambios abertos coma pechados"
+
+msgid "Date: "
+msgstr "Data: "
+
+msgid "Time:"
+msgstr ""
+
+msgid "Closed after - "
+msgstr "Pechado despois - "
+
+msgid "Date:"
+msgstr "Data:"
+
+msgid "Created before - "
+msgstr "Creado antes - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Só conxuntos de cambios pechados despois da seguinte data/tempo"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+"Só conxuntos de cambios pechados despois e creados antes de unha data/tempo "
+"específica."
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Non foi posíbel construír a petición de conxunto de cambios coas restrición "
+"baseadas no tempo. A entrada non é válida."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+
+msgid "Invalid date/time values"
+msgstr "Valores data/tempo inválidas"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Introduce un tempo válido na forma usual para a túa rexión.<br>Exemplo: "
+"{0}<br>Exemplo: {1}<br>Exemplo: {2}<br>Exemplo: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"O valor actual non é unha ID válida de usuario. Introduza un valor enteiro "
+"maior que cero"
+
+msgid "Please enter an integer value > 0"
+msgstr "Introduza un enteiro de valor > 0"
+
msgid "URL: "
msgstr "URL: "
@@ -7387,6 +7358,54 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Esta petición de conxunto de cambios non é válida"
+msgid "Only changesets owned by myself"
+msgstr "Só conxuntos de cambios que me pertencen a min mismo"
+
+msgid "User ID:"
+msgstr "ID do usuario:"
+
+msgid "User name:"
+msgstr "Nome de usuario:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Só conxuntos de cambios que lle pertencen ao seguinte ID de usuario"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+"Só conxuntos de cambios que lle pertencen ao seguinte nome de usuario"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Non se pode restrinxir a petición ao usuario actual porque o usuario actual "
+"e anónimo"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "O valor actual «{0}» para o identificador de usuario non é válido."
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"Non é posíbel restrinxir a petición de conxuntos de cambios ao nome de "
+"usuario «{0}»"
+
+msgid "Please enter a valid user ID"
+msgstr "Introduza un ID de usuario válido"
+
+msgid "Invalid user ID"
+msgstr "ID de usuario inválido"
+
+msgid "Please enter a non-empty user name"
+msgstr "Introduza un nome de usuario non baleiro"
+
+msgid "Invalid user name"
+msgstr "O nome do usuario non é válido"
+
msgid "Activate"
msgstr "Activar"
@@ -8518,6 +8537,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10030,6 +10052,9 @@ msgstr "Dirección"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "Ficheiros Wave Audio (*.wav)"
+
msgid "Import Audio"
msgstr "Importar son"
@@ -10042,9 +10067,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr "Ficheiros Wave Audio (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Marcas de son de {0}"
@@ -10151,14 +10173,6 @@ msgstr "(o URL era: "
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -10171,6 +10185,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -11192,6 +11209,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Color simple (pode ser personalizado para as capas con nome)"
@@ -11204,6 +11224,18 @@ msgstr "Bicicleta"
msgid "Foot"
msgstr "Pé"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Madeira"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -11216,6 +11248,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11287,6 +11322,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11307,10 +11347,17 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
"Permite afinar o coloreado de camiños para diferentes velocidades medias."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Coloreado de camiños e puntos"
@@ -12514,6 +12561,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13592,6 +13645,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Gardar usuario e contrasinal (sen encriptar)"
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13613,12 +13672,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14614,6 +14667,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -15104,13 +15160,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -15134,7 +15193,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -15185,7 +15247,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -15194,10 +15256,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -15233,6 +15307,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -15278,10 +15358,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -15314,34 +15400,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -15380,6 +15506,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -15413,9 +15545,6 @@ msgstr "Catastro"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -15472,9 +15601,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15502,9 +15628,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15538,9 +15661,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15577,19 +15745,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15652,9 +15829,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15688,12 +15877,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15820,9 +16031,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15832,6 +16040,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15853,12 +16075,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15880,6 +16120,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15922,6 +16165,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15943,6 +16189,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15958,6 +16210,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15985,9 +16240,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -16009,9 +16309,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -16021,9 +16318,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -16335,7 +16629,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr "Crea unha cuadrícula de vías."
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -16426,6 +16720,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18852,6 +19149,9 @@ msgstr "Arroio ou riachuelo"
msgid "River"
msgstr "Río"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Canal"
@@ -19900,6 +20200,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Cabaña ou bungalow"
@@ -19966,6 +20272,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Comida rápida"
@@ -20909,31 +21221,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr "Apostadeiro de caza"
-msgid "Height"
-msgstr "Alto"
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
-msgstr "Bloquear"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -21525,6 +21825,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22818,6 +23122,9 @@ msgstr "Carnicería"
msgid "Seafood"
msgstr "Pescado"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Deli (Boa comida)"
@@ -23631,9 +23938,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr "Madeira"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24678,6 +24982,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24769,6 +25076,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24845,6 +25158,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24869,6 +25187,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25642,6 +25963,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25684,7 +26015,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -26488,6 +26819,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26529,8 +26863,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -28146,6 +28480,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -30315,9 +30708,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -30475,9 +30865,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -30535,6 +30922,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30732,9 +31122,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/he.po b/i18n/po/he.po
index fe18b17..a95ae16 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
"PO-Revision-Date: 2013-03-30 13:38+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\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: 2016-11-07 04:48+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:53+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: he\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr "עזרה"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr "הגדר את הפריטים הנבחרים שעל המפה לפריטים הנבחרים ברשימה שלהלן."
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr "שגיאה"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr "הוסף נקודה..."
@@ -711,6 +717,9 @@ msgstr "קפוץ למיקום"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "פותח דיאלוג שמאפשר לך לקפוץ למיקום מסויים"
+msgid "Jump to Position"
+msgstr "קפוץ למיקום"
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -732,9 +741,6 @@ msgstr "כתובת"
msgid "Jump there"
msgstr "קפוץ לשם"
-msgid "Jump to Position"
-msgstr "קפוץ למיקום"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -785,6 +791,9 @@ msgstr "אחד שכבה"
msgid "Merge the current layer into another layer"
msgstr "מזג את השכבה הנוכחית לתוך שכבה אחרת"
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -934,24 +943,30 @@ msgstr[1] "פותח {0} קבצים..."
msgid "Opening file ''{0}'' ..."
msgstr "פותח קובץ ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid "Open Location..."
msgstr "פתח מיקום..."
msgid "Open an URL."
msgstr "פתח URL"
-msgid "Separate Layer"
-msgstr "שכבה נפרדת"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr ""
-
msgid "Enter URL to download:"
msgstr "הזן כתובת להורדה:"
msgid "Enter an URL from where data should be downloaded"
msgstr "הקלד כתובת URL ממנה ניתן להוריד את המידע"
+msgid "Separate Layer"
+msgstr "שכבה נפרדת"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr "מיקום ההורדה"
@@ -967,12 +982,6 @@ msgstr "סגור את הדיאלוג ובטל את ההורדה"
msgid "Download Data"
msgstr "הורד מידע"
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1766,9 +1775,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3965,9 +3971,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3997,12 +4000,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4697,12 +4715,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4719,8 +4743,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5041,9 +5065,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5182,82 +5203,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr "שלי עם שלהם"
-
-msgid "My with Merged"
-msgstr "שלי עם המיזוג"
-
-msgid "Their with Merged"
-msgstr "שלהם עם המיזוג"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr "תכונות"
-
-msgid "Tags"
-msgstr "תוויות"
-
-msgid "Nodes"
-msgstr "נקודות"
-
-msgid "Members"
-msgstr "חברים"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr "נקודות (פתורות)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr "נקודות (עם התנגשויות)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr "חברים (פתורים)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr "חברים (עם התנגשויות)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr "תכונות (עם התנגשויות)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr "פתרון התנגשות"
-
msgid "{0} more..."
msgstr ""
@@ -5431,6 +5376,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr "שלי עם שלהם"
+
+msgid "My with Merged"
+msgstr "שלי עם המיזוג"
+
+msgid "Their with Merged"
+msgstr "שלהם עם המיזוג"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr "תכונות"
+
+msgid "Tags"
+msgstr "תוויות"
+
+msgid "Nodes"
+msgstr "נקודות"
+
+msgid "Members"
+msgstr "חברים"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr "נקודות (פתורות)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr "נקודות (עם התנגשויות)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr "חברים (פתורים)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr "חברים (עם התנגשויות)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr "תכונות (עם התנגשויות)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr "פתרון התנגשות"
+
msgid "Node"
msgstr "נקודה"
@@ -5490,7 +5511,7 @@ msgstr "תפקיד"
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6883,212 +6904,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
+msgstr "בסיסי"
+
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "From URL"
msgstr ""
-msgid "Invalid user name"
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Date: "
+msgid "Advanced"
msgstr ""
-msgid "Time:"
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Closed after - "
+msgid "Query changesets"
msgstr ""
-msgid "Date:"
+msgid "Query and download changesets"
msgstr ""
-msgid "Created before - "
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+msgid "Query open changesets only"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query both open and closed changesets"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Date: "
msgstr ""
-msgid "Invalid bounding box"
+msgid "Time:"
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid "Invalid date/time values"
msgstr ""
msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
-msgstr ""
-
-msgid "<html>Download my open changesets</html>"
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
-msgstr "בסיסי"
+msgid "Examples"
+msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8195,6 +8216,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9689,6 +9713,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "קובץ שמע (wav.*)"
+
msgid "Import Audio"
msgstr "ייבא שמע"
@@ -9701,9 +9728,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr "קובץ שמע (wav.*)"
-
msgid "Audio markers from {0}"
msgstr "סמן שמע מ {0}"
@@ -9802,14 +9826,6 @@ msgstr "(הכתובת היתה: "
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9822,6 +9838,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10810,6 +10829,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10822,6 +10844,18 @@ msgstr "אופניים"
msgid "Foot"
msgstr "רגל"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "חורש"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10834,6 +10868,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10893,6 +10930,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10911,9 +10953,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12108,6 +12157,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13145,6 +13200,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "שמור את המשתמש והסיסמא (לא מוצפנים)"
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13166,12 +13227,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14131,6 +14186,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14621,13 +14679,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14651,7 +14712,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14702,7 +14766,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14711,10 +14775,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14750,6 +14826,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14795,10 +14877,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14831,34 +14919,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14897,6 +15025,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14930,9 +15064,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14989,9 +15120,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15019,9 +15147,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15055,9 +15180,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15094,19 +15264,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15169,9 +15348,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15205,12 +15396,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15337,9 +15550,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15349,6 +15559,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15370,12 +15594,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15397,6 +15639,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15439,6 +15684,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15460,6 +15708,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15475,6 +15729,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15502,9 +15759,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15526,9 +15828,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15538,9 +15837,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15852,7 +16148,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15940,6 +16236,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18336,6 +18635,9 @@ msgstr "נחל"
msgid "River"
msgstr "נהר"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "תעלה"
@@ -19384,6 +19686,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19450,6 +19758,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "מזון מהיר"
@@ -20393,31 +20707,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -21009,6 +21311,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22302,6 +22608,9 @@ msgstr "קצבייה"
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23115,9 +23424,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr "חורש"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24162,6 +24468,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24253,6 +24562,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24329,6 +24644,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24353,6 +24673,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25126,6 +25449,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25168,7 +25501,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25971,6 +26304,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26012,8 +26348,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27611,6 +27947,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29776,9 +30171,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29936,9 +30328,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29996,6 +30385,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30193,9 +30585,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/hi.po b/i18n/po/hi.po
index b446a31..a6ae718 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:49+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:53+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: hi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr "सहायता"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr "गलती"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -708,6 +714,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -729,9 +738,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -782,6 +788,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -931,16 +940,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -949,6 +958,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -964,12 +979,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1762,9 +1771,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3950,9 +3956,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3982,12 +3985,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4680,12 +4698,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4702,8 +4726,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5024,9 +5048,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5165,82 +5186,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5406,6 +5351,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5465,7 +5486,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6857,212 +6878,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8168,6 +8189,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9654,6 +9678,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9666,9 +9693,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9765,14 +9789,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9785,6 +9801,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10773,6 +10792,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10785,6 +10807,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10797,6 +10831,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10856,6 +10893,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10874,9 +10916,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12071,6 +12120,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13106,6 +13161,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13127,12 +13188,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14092,6 +14147,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14580,13 +14638,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14610,7 +14671,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14661,7 +14725,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14670,10 +14734,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14709,6 +14785,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14754,10 +14836,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14790,34 +14878,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14856,6 +14984,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14889,9 +15023,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14948,9 +15079,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14978,9 +15106,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15014,9 +15139,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15053,19 +15223,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15128,9 +15307,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15164,12 +15355,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15296,9 +15509,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15308,6 +15518,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15329,12 +15553,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15356,6 +15598,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15398,6 +15643,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15419,6 +15667,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15434,6 +15688,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15461,9 +15718,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15485,9 +15787,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15497,9 +15796,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15811,7 +16107,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15899,6 +16195,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18295,6 +18594,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19343,6 +19645,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19409,6 +19717,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20352,31 +20666,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20968,6 +21270,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22261,6 +22567,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23074,9 +23383,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24121,6 +24427,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24212,6 +24521,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24288,6 +24603,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24312,6 +24632,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25085,6 +25408,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25127,7 +25460,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25930,6 +26263,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25971,8 +26307,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27570,6 +27906,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29731,9 +30126,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29891,9 +30283,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29951,6 +30340,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30148,9 +30540,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/hr.po b/i18n/po/hr.po
index c4417ab..3866c01 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:06+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:12+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: hr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -65,9 +65,15 @@ msgstr ""
msgid "Help"
msgstr "Pomoć"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Inicijaliziram OSM API"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Inicijaliziram validator"
@@ -205,6 +211,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr "Dodaj slikovni sloj {0}"
@@ -226,12 +238,6 @@ msgstr "Greška"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr "Dodaj točku..."
@@ -727,6 +733,9 @@ msgstr "Skok na poziciju"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Otvoriti dijaloški okvir, koji omogućuje skok na određenu lokaciju."
+msgid "Jump to Position"
+msgstr "Skoči na poziciju"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Unesi Širinu/Dužinu za skok na relaciju"
@@ -748,9 +757,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Skoši tamo"
-msgid "Jump to Position"
-msgstr "Skoči na poziciju"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr "Ne mogu vidjeti geografsku širinu, dužinu, zoom. Molim provjerite."
@@ -801,6 +807,9 @@ msgstr "Spoji sloj"
msgid "Merge the current layer into another layer"
msgstr "Spoji trenutni sloj u drugi sloj"
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -970,24 +979,30 @@ msgstr[2] "Otvaram {0} datoteke..."
msgid "Opening file ''{0}'' ..."
msgstr "Otvaram datoteku ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "U redu"
+
msgid "Open Location..."
msgstr "Otvori lokaciju..."
msgid "Open an URL."
msgstr "Otvori URL."
-msgid "Separate Layer"
-msgstr "Razdjeli sloj (layer)"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr ""
-
msgid "Enter URL to download:"
msgstr "Ukucaj URL za preuzimanje:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Unesite URL adresu s koje se podaci trebaju preuzeti"
+msgid "Separate Layer"
+msgstr "Razdjeli sloj (layer)"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr "Preuzmi lokaciju"
@@ -1003,12 +1018,6 @@ msgstr "Zatvori dijalog i poništi preuzimanje"
msgid "Download Data"
msgstr "Preuzimanje podataka"
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr "U redu"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1841,9 +1850,6 @@ msgstr ""
msgid "Errors during download"
msgstr "Pogreške tijekom preuzimanja"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -4058,9 +4064,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -4090,12 +4093,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4789,12 +4807,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4811,8 +4835,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5133,9 +5157,6 @@ msgstr ""
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5274,82 +5295,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr "Tagovi"
-
-msgid "Nodes"
-msgstr "Točke"
-
-msgid "Members"
-msgstr "Članovi"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr "{0} više..."
@@ -5515,6 +5460,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr "Tagovi"
+
+msgid "Nodes"
+msgstr "Točke"
+
+msgid "Members"
+msgstr "Članovi"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr "Točka"
@@ -5574,7 +5595,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6935,161 +6956,58 @@ msgstr "Datum"
msgid "{0} [incomplete]"
msgstr ""
-msgid "open"
-msgstr "otvori"
-
-msgid "closed"
-msgstr "zatvoreni"
-
-msgid "Download content"
-msgstr ""
-
-msgid "Download the changeset content from the OSM server"
-msgstr ""
-
-msgid "Update content"
-msgstr ""
-
-msgid "Update the changeset content from the OSM server"
-msgstr ""
-
-msgid "Changeset ID: "
-msgstr ""
-
-msgid "Enter a changeset id"
-msgstr ""
-
-msgid ""
-"Download the changeset with the specified id, including the changeset content"
-msgstr ""
-
-msgid "Select changesets owned by specific users"
-msgstr ""
-
-msgid "Select changesets depending on whether they are open or closed"
-msgstr ""
-
-msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr ""
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr ""
-
-msgid "Query open changesets only"
-msgstr ""
-
-msgid "Query closed changesets only"
-msgstr ""
-
-msgid "Query both open and closed changesets"
-msgstr ""
-
-msgid "Only changesets owned by myself"
-msgstr ""
-
-msgid "User ID:"
-msgstr "Korisnički ID:"
-
-msgid "User name:"
-msgstr "Korisničko ime:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr ""
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-
-msgid "Please enter a valid user ID"
-msgstr ""
-
-msgid "Invalid user ID"
-msgstr "Pogrešan korisnički ID:"
-
-msgid "Please enter a non-empty user name"
-msgstr ""
-
-msgid "Invalid user name"
-msgstr "Pogrešno korisničko ime:"
-
-msgid "Date: "
-msgstr "Datum: "
-
-msgid "Time:"
-msgstr "Vrijeme:"
-
-msgid "Closed after - "
-msgstr ""
+msgid "open"
+msgstr "otvori"
-msgid "Date:"
-msgstr "Datum:"
+msgid "closed"
+msgstr "zatvoreni"
-msgid "Created before - "
+msgid "Download content"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Download the changeset content from the OSM server"
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Update content"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+msgid "Changeset ID: "
msgstr ""
-msgid "Invalid date/time values"
+msgid "Enter a changeset id"
msgstr ""
msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+"Download the changeset with the specified id, including the changeset content"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Select changesets owned by specific users"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Select changesets depending on whether they are open or closed"
msgstr ""
msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+"Select changesets based on the date/time they have been created or closed"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Select only changesets related to a specific bounding box"
msgstr ""
msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
+msgstr ""
+
+msgid "Invalid bounding box"
msgstr ""
msgid "Download my changesets only"
@@ -7167,6 +7085,66 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid "Query open changesets only"
+msgstr ""
+
+msgid "Query closed changesets only"
+msgstr ""
+
+msgid "Query both open and closed changesets"
+msgstr ""
+
+msgid "Date: "
+msgstr "Datum: "
+
+msgid "Time:"
+msgstr "Vrijeme:"
+
+msgid "Closed after - "
+msgstr ""
+
+msgid "Date:"
+msgstr "Datum:"
+
+msgid "Created before - "
+msgstr ""
+
+msgid "Only changesets closed after the following date/time"
+msgstr ""
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+
+msgid "Invalid date/time values"
+msgstr ""
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+
+msgid "Please enter an integer value > 0"
+msgstr ""
+
msgid "URL: "
msgstr "URL: "
@@ -7184,6 +7162,49 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Only changesets owned by myself"
+msgstr ""
+
+msgid "User ID:"
+msgstr "Korisnički ID:"
+
+msgid "User name:"
+msgstr "Korisničko ime:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr ""
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr ""
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+
+msgid "Please enter a valid user ID"
+msgstr ""
+
+msgid "Invalid user ID"
+msgstr "Pogrešan korisnički ID:"
+
+msgid "Please enter a non-empty user name"
+msgstr ""
+
+msgid "Invalid user name"
+msgstr "Pogrešno korisničko ime:"
+
msgid "Activate"
msgstr ""
@@ -8290,6 +8311,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9804,6 +9828,9 @@ msgstr "Smjer"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audio datoteke (*.wav)"
+
msgid "Import Audio"
msgstr ""
@@ -9816,9 +9843,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Uvoz nije moguć"
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audio datoteke (*.wav)"
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9915,14 +9939,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9935,6 +9951,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10923,6 +10942,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10935,6 +10957,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10947,6 +10981,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11006,6 +11043,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11024,9 +11066,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12221,6 +12270,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13256,6 +13311,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13277,12 +13338,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14242,6 +14297,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14730,13 +14788,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14760,7 +14821,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14811,7 +14875,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14820,10 +14884,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14859,6 +14935,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14904,10 +14986,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14940,34 +15028,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -15006,6 +15134,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -15039,9 +15173,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -15098,9 +15229,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15128,9 +15256,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15164,9 +15289,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15203,19 +15373,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15278,9 +15457,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15314,12 +15505,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15446,9 +15659,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15458,6 +15668,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15479,12 +15703,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15506,6 +15748,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15548,6 +15793,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15569,6 +15817,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15584,6 +15838,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15611,9 +15868,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15635,9 +15937,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15647,9 +15946,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15961,7 +16257,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -16049,6 +16345,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18445,6 +18744,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19493,6 +19795,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19559,6 +19867,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20502,31 +20816,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -21118,6 +21420,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22411,6 +22717,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23224,9 +23533,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24271,6 +24577,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24362,6 +24671,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24438,6 +24753,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24462,6 +24782,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25235,6 +25558,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25277,7 +25610,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -26080,6 +26413,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26121,8 +26457,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27720,6 +28056,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29885,9 +30280,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -30045,9 +30437,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr ""
@@ -30105,6 +30494,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30302,9 +30694,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/ht.po b/i18n/po/ht.po
index 166cbc0..5d18d78 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:48+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:52+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr ""
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr ""
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -708,6 +714,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -729,9 +738,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -782,6 +788,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -931,16 +940,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -949,6 +958,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -964,12 +979,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1762,9 +1771,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3950,9 +3956,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3982,12 +3985,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4680,12 +4698,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4702,8 +4726,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5024,9 +5048,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5165,82 +5186,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5406,6 +5351,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5465,7 +5486,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6857,212 +6878,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8168,6 +8189,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9654,6 +9678,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9666,9 +9693,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9765,14 +9789,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9785,6 +9801,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10773,6 +10792,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10785,6 +10807,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10797,6 +10831,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10856,6 +10893,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10874,9 +10916,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12071,6 +12120,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13106,6 +13161,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13127,12 +13188,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14092,6 +14147,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14580,13 +14638,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14610,7 +14671,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14661,7 +14725,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14670,10 +14734,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14709,6 +14785,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14754,10 +14836,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14790,34 +14878,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14856,6 +14984,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14889,9 +15023,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14948,9 +15079,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14978,9 +15106,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15014,9 +15139,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15053,19 +15223,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15128,9 +15307,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15164,12 +15355,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15296,9 +15509,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15308,6 +15518,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15329,12 +15553,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15356,6 +15598,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15398,6 +15643,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15419,6 +15667,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15434,6 +15688,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15461,9 +15718,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15485,9 +15787,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15497,9 +15796,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15811,7 +16107,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15899,6 +16195,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18295,6 +18594,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19343,6 +19645,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19409,6 +19717,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20352,31 +20666,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20968,6 +21270,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22261,6 +22567,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23074,9 +23383,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24121,6 +24427,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24212,6 +24521,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24288,6 +24603,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24312,6 +24632,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25085,6 +25408,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25127,7 +25460,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25930,6 +26263,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25971,8 +26307,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27570,6 +27906,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29731,9 +30126,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29891,9 +30283,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29951,6 +30340,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30148,9 +30540,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/hu.po b/i18n/po/hu.po
index b37f5b5..0b8c032 100644
--- a/i18n/po/hu.po
+++ b/i18n/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
"PO-Revision-Date: 2016-10-07 10:56+0000\n"
"Last-Translator: AndreasTUHU <poggyasz at gmail.com>\n"
"Language-Team: Hungarian <kde-l10n-hu at kde.org>\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: 2016-11-07 04:49+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:54+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: hu\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -66,9 +66,15 @@ msgstr "Főmenü felépítése"
msgid "Help"
msgstr "Súgó"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "OSM API előkészítése"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Ellenőrző előkészítése"
@@ -211,6 +217,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr "Kiválasztja a térképen a fenti listában kijelölt elemeket."
+msgid "Select WMS layers"
+msgstr "Válassz WMS réteget"
+
+msgid "Add layers"
+msgstr "Rétegek hozzáadása"
+
msgid "Add imagery layer {0}"
msgstr "Légifelvétel réteg hozzáadása: {0}"
@@ -232,12 +244,6 @@ msgstr "Hiba"
msgid "Select image format for WMS layer"
msgstr "Válassz képformátumot a WMS réteghez"
-msgid "Select WMS layers"
-msgstr "Válassz WMS réteget"
-
-msgid "Add layers"
-msgstr "Rétegek hozzáadása"
-
msgid "Add Node..."
msgstr "Pont hozzáadása..."
@@ -757,6 +763,9 @@ msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
"Megnyit egy párbeszédablakot amelyben egy megadott 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"
@@ -778,9 +787,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Ugrás oda"
-msgid "Jump to Position"
-msgstr "Ugrás a Pozícióra"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Nem lehet feldolgozni a szélesség, hosszúság vagy a nagyítási értéket. "
@@ -837,6 +843,9 @@ msgstr "Réteg egyesítése"
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"
+
msgid "Merging layers with different upload policies"
msgstr "Különböző feltöltési szabályú rétegek egyesítése"
@@ -1006,24 +1015,30 @@ msgstr[1] "{0} fájlok megnyitása..."
msgid "Opening file ''{0}'' ..."
msgstr "\"{0}\" fájl megnyitása..."
+msgid "Which tasks to perform?"
+msgstr "Melyik feladatokat kívánod végrehajtani?"
+
+msgid "Ok"
+msgstr "OK"
+
msgid "Open Location..."
msgstr "Hely megnyitása…"
msgid "Open an URL."
msgstr "URL megnyitása."
-msgid "Separate Layer"
-msgstr "Külön rétegen"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Jelöld be, ha az adatokat egy új rétegre szeretnéd letölteni"
-
msgid "Enter URL to download:"
msgstr "Add meg a letöltendő URL-t:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Adj meg egy URL-t, ahonnan az adatok letöltendők"
+msgid "Separate Layer"
+msgstr "Külön rétegen"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Jelöld be, ha az adatokat egy új rétegre szeretnéd letölteni"
+
msgid "Download Location"
msgstr "Letöltési hely"
@@ -1039,12 +1054,6 @@ msgstr "Párbeszédablak bezárása és a letöltés megszakítása"
msgid "Download Data"
msgstr "Adatok letöltése"
-msgid "Which tasks to perform?"
-msgstr "Melyik feladatokat kívánod végrehajtani?"
-
-msgid "Ok"
-msgstr "OK"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1911,9 +1920,6 @@ msgstr "Módosításcsomag lekérdezés és letöltés"
msgid "Errors during download"
msgstr "Hibák letöltés közben"
-msgid "Download Geo URL"
-msgstr "Geo URL letöltése"
-
msgid "Download GPS"
msgstr "GPS letöltése"
@@ -4271,9 +4277,6 @@ msgstr "Terület típusú vonal nincs bezárva"
msgid "No outer way for multipolygon"
msgstr "Nincs külső vonala a multipoligonnak"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "''{0}'' szerepe ''{1}'' kéne legyen"
-
msgid "No area style for multipolygon"
msgstr "Nincs terület típus a multipoligonban"
@@ -4311,12 +4314,27 @@ msgstr "Terület típus van a külső vonalon"
msgid "Multipolygon is not closed"
msgstr "A multipoligon nem zárt"
-msgid "Multipolygon inner way is outside"
-msgstr "A multipoligon belső vonala kívül van"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "Multipoligon vonalak keresztezik egymást"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "''{0}'' szerepe ''{1}'' kéne legyen"
+
+msgid "Multipolygon inner way is outside"
+msgstr "A multipoligon belső vonala kívül van"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "Nincs használható szerepe a multipoligon tagnak"
@@ -5031,12 +5049,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr "Java rendszerbeállítások által nyújtott kapcsolók"
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/PATH/TO/JOSM/PREF "
msgid "Set the preferences directory"
msgstr "Beállítások könyvtár beállítása"
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/PATH/TO/JOSM/USERDATA"
@@ -5053,11 +5077,9 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/PATH/TO/JOSM/HOMEDIR "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Mindhárom könyvtár áthelyezése a homedir-ba. A gyorsítótár könyvtár a "
-"homedir/cache-ba kerül"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5404,9 +5426,6 @@ msgstr "Kattints a művelet háttérben futtatásához"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} elkészült {1} alatt"
-
msgid "Enlarge"
msgstr "Nagyít"
@@ -5551,86 +5570,6 @@ msgstr "Ütközés háttér: tag eltávolítása"
msgid "Conflict foreground: remove member"
msgstr "Ütközés előtér: tag eltávolítása"
-msgid "My with Their"
-msgstr "Enyém az Övével"
-
-msgid "My with Merged"
-msgstr "Enyém az egybevonttal"
-
-msgid "Their with Merged"
-msgstr "Övé az egybevonttal"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "{0} szerep nem vesz részt az összehasonlítási párban {1}."
-
-msgid "Properties"
-msgstr "Tulajdonságok"
-
-msgid "Tags"
-msgstr "Címkék"
-
-msgid "Nodes"
-msgstr "Pontok"
-
-msgid "Members"
-msgstr "Tagok"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Nincs megoldandó ütközés függőben"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Címkék ({0} ütközés)"
-msgstr[1] "Címkék ({0} ütközés)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} megoldandó címkeütközés függőben"
-msgstr[1] "{0} megoldandó címkeütközés függőben"
-
-msgid "Nodes(resolved)"
-msgstr "Pontok (megoldva)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Összevonandó pontlista fagyasztva. Nincsenek ütközések függőben a vonal "
-"pontlistájában"
-
-msgid "Nodes(with conflicts)"
-msgstr "Pontok (ütközéssel)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Függőben lévő ütközések a vonal pontlistájában"
-
-msgid "Members(resolved)"
-msgstr "Tagok (megoldva)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Összevonandó taglista fagyasztva. Nincsenek ütközések függőben a kapcsolat "
-"taglistájában"
-
-msgid "Members(with conflicts)"
-msgstr "Tagok (ütközéssel)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Függőben lévő ütközések a kapcsolat taglistájában"
-
-msgid "No pending property conflicts"
-msgstr "Nincsenek függőben tulajdonságütközések"
-
-msgid "Properties(with conflicts)"
-msgstr "Tulajdonságok (ütközéssel)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Függőben lévő megoldatlan tulajdonságütközések"
-
-msgid "Conflict Resolution"
-msgstr "Ütközés Megoldás"
-
msgid "{0} more..."
msgstr "még {0} ..."
@@ -5812,6 +5751,86 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Ő változata ({0} bejegyzés)"
msgstr[1] "Ő változata ({0} bejegyzés)"
+msgid "My with Their"
+msgstr "Enyém az Övével"
+
+msgid "My with Merged"
+msgstr "Enyém az egybevonttal"
+
+msgid "Their with Merged"
+msgstr "Övé az egybevonttal"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "{0} szerep nem vesz részt az összehasonlítási párban {1}."
+
+msgid "Properties"
+msgstr "Tulajdonságok"
+
+msgid "Tags"
+msgstr "Címkék"
+
+msgid "Nodes"
+msgstr "Pontok"
+
+msgid "Members"
+msgstr "Tagok"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Nincs megoldandó ütközés függőben"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Címkék ({0} ütközés)"
+msgstr[1] "Címkék ({0} ütközés)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} megoldandó címkeütközés függőben"
+msgstr[1] "{0} megoldandó címkeütközés függőben"
+
+msgid "Nodes(resolved)"
+msgstr "Pontok (megoldva)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Összevonandó pontlista fagyasztva. Nincsenek ütközések függőben a vonal "
+"pontlistájában"
+
+msgid "Nodes(with conflicts)"
+msgstr "Pontok (ütközéssel)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Függőben lévő ütközések a vonal pontlistájában"
+
+msgid "Members(resolved)"
+msgstr "Tagok (megoldva)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Összevonandó taglista fagyasztva. Nincsenek ütközések függőben a kapcsolat "
+"taglistájában"
+
+msgid "Members(with conflicts)"
+msgstr "Tagok (ütközéssel)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Függőben lévő ütközések a kapcsolat taglistájában"
+
+msgid "No pending property conflicts"
+msgstr "Nincsenek függőben tulajdonságütközések"
+
+msgid "Properties(with conflicts)"
+msgstr "Tulajdonságok (ütközéssel)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Függőben lévő megoldatlan tulajdonságütközések"
+
+msgid "Conflict Resolution"
+msgstr "Ütközés Megoldás"
+
msgid "Node"
msgstr "Pont"
@@ -5875,10 +5894,8 @@ msgstr "Szerep"
msgid "Primitive"
msgstr "Elem"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"Az összevont pontok még nincsenek rögzítve. Nem lehet kiadni a megoldás "
-"parancsot."
msgid "<undefined>"
msgstr "<nincs megadva>"
@@ -7367,113 +7384,17 @@ msgstr ""
msgid "Select changesets owned by specific users"
msgstr "Adott felhasználó módosításcsomagjai"
-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"
-
-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"
-
-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"
-
-msgid "Query open changesets only"
-msgstr "Csak a nyitott módosításcsomagok lekérdezése"
-
-msgid "Query closed changesets only"
-msgstr "Csak a lezárt módosításcsomagok lekérdezése"
-
-msgid "Query both open and closed changesets"
-msgstr "Nyitott és lezárt módosításcsomagok lekérdezése"
-
-msgid "Only changesets owned by myself"
-msgstr "Csak a saját módosításcsomagjaim"
-
-msgid "User ID:"
-msgstr "Felhasználói azonosító:"
-
-msgid "User name:"
-msgstr "Felhasználónév:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Csak a következő azonosítójú felhasználó módosításcsomagjai"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "Csak a következő nevű felhasználó módosításcsomagjai"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Csak a saját módosításcsomagjaim (nem elérhető. A JOSM-t jelenleg névtelen "
-"felhasználó futtatja)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Nem korlátozható a módosításcsomag lekérés a jelenlegi felhasználóra, mert "
-"az névtelen."
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "A jelenlegi ''{0}'' érték nem érvényes felhasználói azonosító"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"Nem korlátozható a módosításcsomag lekérés ''{0}'' nevű felhasználóra"
-
-msgid "Please enter a valid user ID"
-msgstr "Kérlek adj meg egy érvényes felhasználói azonosítót"
-
-msgid "Invalid user ID"
-msgstr "Érvénytelen felhasználói azonosító"
-
-msgid "Please enter a non-empty user name"
-msgstr "Kérlek adj meg egy nem üres felhasználónevet"
-
-msgid "Invalid user name"
-msgstr "Érvénytelen felhasználói név"
-
-msgid "Date: "
-msgstr "Dátum: "
-
-msgid "Time:"
-msgstr "Idő:"
-
-msgid "Closed after - "
-msgstr "Lezárva ez után - "
-
-msgid "Date:"
-msgstr "Dátum:"
-
-msgid "Created before - "
-msgstr "Létrehozva ez előtt - "
-
-msgid "Only changesets closed after the following date/time"
-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"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Select changesets depending on whether they are open or closed"
msgstr ""
-"Nem lehet lekérdezést készíteni ezzel az időkorlátozással. Az érték "
-"érvénytelen."
+"Módosításcsomagok kiválasztása aszerint, hogy megnyitva, vagy lezárva vannak"
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Select changesets based on the date/time they have been created or closed"
msgstr ""
-"<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>"
+"Módosításcsomagok kiválasztása megnyitás, vagy lezárás dátuma/ideje szerint"
-msgid "Invalid date/time values"
-msgstr "Érvénytelen dátum/idő értékek"
+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"
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
@@ -7492,29 +7413,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Érvénytelen határolónégyzet"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"A megadott érték nem egy érvényes felhasználói azonosító. Kérlek adj meg egy "
-"nullánál nagyobb egész számot."
-
-msgid "Please enter an integer value > 0"
-msgstr "Adj meg egy nullánál nagyobb egész számot"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Kérlek adj meg egy dátumot a helyi időformátumban.<br>Példa: {0}<br>Példa: "
-"{1}<br>Példa: {2}<br>Példa: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Kérlek adj meg egy időpontot a helyi időformátumban.<br>Példa: {0}<br>Példa: "
-"{1}<br>Példa: {2}<br>Példa: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Csak a saját módosításcsomagjaim letöltése"
@@ -7605,6 +7503,77 @@ msgstr "Érvénytelen módosításcsomag-lekérdezés URL"
msgid "Close the dialog and abort querying of changesets"
msgstr "Dialógusablak bezárása és a módosításcsomag-lekérdezés megszakítása"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Kérlek adj meg egy dátumot a helyi időformátumban.<br>Példa: {0}<br>Példa: "
+"{1}<br>Példa: {2}<br>Példa: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Csak a nyitott módosításcsomagok lekérdezése"
+
+msgid "Query closed changesets only"
+msgstr "Csak a lezárt módosításcsomagok lekérdezése"
+
+msgid "Query both open and closed changesets"
+msgstr "Nyitott és lezárt módosításcsomagok lekérdezése"
+
+msgid "Date: "
+msgstr "Dátum: "
+
+msgid "Time:"
+msgstr "Idő:"
+
+msgid "Closed after - "
+msgstr "Lezárva ez után - "
+
+msgid "Date:"
+msgstr "Dátum:"
+
+msgid "Created before - "
+msgstr "Létrehozva ez előtt - "
+
+msgid "Only changesets closed after the following date/time"
+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"
+
+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."
+
+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 "
+"vonatkozó korlátozásához.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Érvénytelen dátum/idő értékek"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Kérlek adj meg egy időpontot a helyi időformátumban.<br>Példa: {0}<br>Példa: "
+"{1}<br>Példa: {2}<br>Példa: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"A megadott érték nem egy érvényes felhasználói azonosító. Kérlek adj meg egy "
+"nullánál nagyobb egész számot."
+
+msgid "Please enter an integer value > 0"
+msgstr "Adj meg egy nullánál nagyobb egész számot"
+
msgid "URL: "
msgstr "URL: "
@@ -7627,6 +7596,54 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Ez a módosításcsomag-lekérdezés URL érvénytelen"
+msgid "Only changesets owned by myself"
+msgstr "Csak a saját módosításcsomagjaim"
+
+msgid "User ID:"
+msgstr "Felhasználói azonosító:"
+
+msgid "User name:"
+msgstr "Felhasználónév:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Csak a következő azonosítójú felhasználó módosításcsomagjai"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "Csak a következő nevű felhasználó módosításcsomagjai"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Csak a saját módosításcsomagjaim (nem elérhető. A JOSM-t jelenleg névtelen "
+"felhasználó futtatja)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Nem korlátozható a módosításcsomag lekérés a jelenlegi felhasználóra, mert "
+"az névtelen."
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "A jelenlegi ''{0}'' érték nem érvényes felhasználói azonosító"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"Nem korlátozható a módosításcsomag lekérés ''{0}'' nevű felhasználóra"
+
+msgid "Please enter a valid user ID"
+msgstr "Kérlek adj meg egy érvényes felhasználói azonosítót"
+
+msgid "Invalid user ID"
+msgstr "Érvénytelen felhasználói azonosító"
+
+msgid "Please enter a non-empty user name"
+msgstr "Kérlek adj meg egy nem üres felhasználónevet"
+
+msgid "Invalid user name"
+msgstr "Érvénytelen felhasználói név"
+
msgid "Activate"
msgstr "Aktiválás"
@@ -8829,6 +8846,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10496,6 +10516,9 @@ msgstr "Irány"
msgid "Velocity, {0}"
msgstr "Sebesség, {0}"
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave audio fájlok (*.wav)"
+
msgid "Import Audio"
msgstr "Audio importálása"
@@ -10511,9 +10534,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Importálás nem lehetséges"
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave audio fájlok (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Hangjelölők innen: {0}"
@@ -10626,17 +10646,6 @@ msgstr "(Az URL: "
msgid "Select the map painting styles"
msgstr "Térképrajz stílusának kiválasztása"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-"Nem sikerült betölteni a térképstílusokat innen: \"{0}\". Kivétel: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-"A JOSM többé nem támogatja a régi XML formátumú térképstílusokat.\n"
-"Kérlek frissítsd a(z) „{0}” stílust MapCSS-re"
-
msgid "loading style ''{0}''..."
msgstr "stílus betöltése: ''{0}''..."
@@ -10653,6 +10662,10 @@ msgstr[1] ""
"{0} hiba történt a stílus betöltésekor. További információkért kattints az "
"\"Infó\" elemre a jobb egérgomb menüből."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+"Nem sikerült betölteni a térképstílusokat innen: \"{0}\". Kivétel: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Nem sikerült értelmezni a térképstílusokat itt: \"{0}\". Hiba: {1}"
@@ -11766,6 +11779,9 @@ msgstr "Pozíció pontossága (piros=gyenge, zöld=magas, ha elérhető)"
msgid "Track date"
msgstr "Nyomvonal dátuma"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Egyszínű (testre szabható az egyes rétegekhez)"
@@ -11778,6 +11794,18 @@ msgstr "Kerékpár"
msgid "Foot"
msgstr "Gyalogos"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Őserdő"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Helyjelzők készítése a GPS olvasásakor"
@@ -11790,6 +11818,9 @@ msgstr "Dinamikus színtartomány az adathatárok alapján"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Sima GPX grafika (antialias)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11862,6 +11893,11 @@ msgstr ""
"eredményezve."
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11884,9 +11920,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "Pontok és útszakaszok színezése az időbélyegük alapján."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
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 ""
+
msgid "Track and Point Coloring"
msgstr "Nyomvonal és pontok színezése"
@@ -13191,6 +13234,12 @@ msgstr "Vallási objektumok hibáinak keresése"
msgid "Checks for errors on relations"
msgstr "Kapcsolatok hibáinak keresése"
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr "Fölösleges tagok"
@@ -14350,6 +14399,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Felhasználónév és jelszó mentése (tikosítatlanul)"
+msgid "Assume"
+msgstr "Feltételezés"
+
+msgid "Existing values"
+msgstr "Meglévő értékek"
+
msgid "<delete from {0} objects>"
msgstr "<törlés a(z) {0} objektumból>"
@@ -14371,12 +14426,6 @@ msgstr "A kijelölt címkék hozzáadása a kiválasztott objektumokhoz"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Enter: Minden címke hozzáadása a kiválasztott objektumokhoz"
-msgid "Assume"
-msgstr "Feltételezés"
-
-msgid "Existing values"
-msgstr "Meglévő értékek"
-
msgid "Enable the checkbox to accept the value"
msgstr "Fogadd el az értéket a jelölődoboz engedélyezésével"
@@ -15568,6 +15617,9 @@ msgstr ""
"Csendes gyorsbillentyű konfliktus: ''{0}'' átmozgatásra került ''{1}''-ről "
"''{2}''-re."
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "A pufferben egy {0} cimke volt található, ez gyanús!"
@@ -16092,14 +16144,17 @@ msgstr "Mapbox műholdkép"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr "OpenSeaMap"
-msgid "OpenStreetMap Carto (Standard layer)"
-msgstr "OpenStreetMap Carto (Alapértelmezett réteg)"
+msgid "OpenStreetMap Carto (Standard)"
+msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap Mapnik (fekete-fehér)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, felirat nélkül)"
@@ -16122,8 +16177,11 @@ msgstr "Túra és kerékpár"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Cambodia, Laos, Thailand, Vietnam kétnyelvű"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPT map (fedettség)"
@@ -16173,8 +16231,8 @@ msgstr "OSM Inspector: helyek"
msgid "OSM Inspector: Highways"
msgstr "OSM Inspector: utak"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM Inspector: multipoligon"
+msgid "OSM Inspector: Area"
+msgstr ""
msgid "OSM Inspector: Routing"
msgstr "OSM Inspector: útvonaltervezés"
@@ -16182,11 +16240,23 @@ msgstr "OSM Inspector: útvonaltervezés"
msgid "OSM Inspector: Addresses"
msgstr "OSM Inspector: lakcímek"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM Inspector: közigazgatási határok (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
-msgid "IGN Argentina (WMTS)"
-msgstr "IGN Argentína (WMTS)"
+msgid "IGN Argentina (TMS)"
+msgstr ""
msgid "IGN Argentina (WMS)"
msgstr "IGN Argentína (WMS)"
@@ -16221,6 +16291,12 @@ msgstr "LPI NSW közigazgatási határ állami erdő"
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr "LPI NSW közigazgatási határ NPWS rezervátum"
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -16266,11 +16342,17 @@ msgstr "VoGIS: Flächenwidmungsplan"
msgid "VoGIS: Höhen und Gelände"
msgstr "VoGIS: Höhen und Gelände"
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
-msgstr "AGIV (Vlaanderen / Flanders) legfrissebb légifotó (téli)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
+msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
-msgstr "AGIV légifotó 10cm 2013-15"
+msgid "AGIV Flanders GRB"
+msgstr ""
msgid "URBISfr numerical imagery (2013)"
msgstr "URBISfr numerical imagery (2013)"
@@ -16305,14 +16387,32 @@ msgstr "SPW(allonie) 2009-2010 légifelvétel"
msgid "TEC bus lines (2014)"
msgstr "TEC busz útvonalak (2014)"
-msgid "Benin:cotonou_pleiade_2016"
-msgstr "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
msgid "IBGE Mapa de Setores Urbanos"
msgstr "IBGE Mapa de Setores Urbanos"
-msgid "IBGE Mapa de Setores Rurais"
-msgstr "IBGE Mapa de Setores Rurais"
+msgid "IBGE Mapa de Setores Rurais"
+msgstr "IBGE Mapa de Setores Rurais"
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
msgid "Geobase Hydrography"
msgstr "Geobase Hidrológiai"
@@ -16326,12 +16426,34 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "British Columbia Mosaic"
+msgid "Latest southwest British Columbia Landsat"
+msgstr ""
+
msgid "Kelowna 2012"
msgstr "Kelowna 2012"
msgid "Kelowna Roads overlay"
msgstr "Kelowna utak rátét"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr ""
+
msgid "Czech CUZK:KM"
msgstr "Czech CUZK:KM"
@@ -16368,6 +16490,12 @@ msgstr "Stevns (Denmark)"
msgid "Vejmidte (Denmark)"
msgstr "Vejmidte (Denmark)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Estonia Alaptérkép (Maaamet)"
@@ -16401,9 +16529,6 @@ msgstr "Cadastre"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr "RAIG - Auvergne 2013 - 25 cm"
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "GrandNancy Orthophotographie 2012"
@@ -16462,9 +16587,6 @@ msgstr ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Ortofotók 1999 - "
"1 m"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Szorb nyelvű)"
-
msgid "Hamburg (40 cm)"
msgstr "Hamburg (40 cm)"
@@ -16492,9 +16614,6 @@ msgstr "Berlin légifotó 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Berlin légifotó 2016"
-msgid "Stuttgart (aerial imagery)"
-msgstr "Stuttgart (légifelvétel)"
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Erlangen légifotó (2016. 5,0 cm)"
@@ -16528,9 +16647,54 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Drón ábrázolás (Haiti)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drón ábrázolás 2014 (Haiti)"
@@ -16567,14 +16731,8 @@ msgstr "Dunai árvízi ortofotó 2013"
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Dunapart budapesti, szentendrei és szigetmonostori szakasza"
-msgid "Budapest district XII ortophoto 2013"
-msgstr "Budapest XII. kerület ortofotó 2013"
-
-msgid "Interspect Budapest ortophoto 2014"
-msgstr "Interspect Budapest ortofotó 2014"
-
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
-msgstr "Budapest öt kerülete: III, IV, XIII, XIV, XV"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Magyarország (turistautak)"
@@ -16582,6 +16740,21 @@ msgstr "OpenStreetMap Magyarország (turistautak)"
msgid "Hillshade Hungary"
msgstr "Domborzatárnyékolás, Magyarország"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -16642,9 +16815,21 @@ msgstr "PCN 2012 - Italy"
msgid "South Tyrol Orthofoto 2011"
msgstr "Dél-Tirol ortofotó 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr "Dél-Tirol topográfiai térkép"
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "USSR - Latvia"
@@ -16678,12 +16863,34 @@ msgstr "Niger Delta Oct 2012 Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard -ortofotó 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Gaza Strip - Pléiades - 2014/07/06"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
@@ -16810,9 +17017,6 @@ msgstr "Świętochłowice: Ortofotomapa 2012 (légifelvétel)"
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Zabrze: Ortofotomapa 2011 (légifelvétel)"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Szlaki (útvonalak)"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr "Wrocław: Ortofotomapa 2015 (légifelvétel)"
@@ -16822,6 +17026,20 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Autó"
@@ -16843,12 +17061,30 @@ msgstr "RABA-KGZ: Szlovénia szántóföld"
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr "RABA-KGZ: Szlovénia beépített területek"
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr "City of Cape Town 2015 Aerial"
msgid "South Africa CD:NGI Aerial"
msgstr "South Africa CD:NGI Aerial"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr "Catastro Spain"
@@ -16870,6 +17106,9 @@ msgstr "IDEIB - Balearic Islands"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Canary Islands"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Kanton Aargau 25cm (AGIS 2011)"
@@ -16912,6 +17151,9 @@ msgstr "Canton de Fribourg 50cm (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Stadt Bern 10cm/25cm (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Ortofotó Yverdon-les-Bains 25cm (2007)"
@@ -16933,6 +17175,12 @@ msgstr "Bonvillars Ortofotó 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Fiez Ortofotó 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr "Taiwan e-Map Open Data"
@@ -16948,6 +17196,9 @@ msgstr "Taiwan Land-Section Data"
msgid "NLSC Open Data WMTS"
msgstr "NLSC Open Data WMTS"
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "MSR Topográfiai Térképek"
@@ -16975,9 +17226,54 @@ msgstr "NC Latest Ortofotó"
msgid "U.S. Forest Service roads"
msgstr "U.S. erdőgazdasági utak"
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ukraine - Ortofotó térkép 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr "Ukrajna - Kijev 2014 (DZK)"
@@ -16999,9 +17295,6 @@ msgstr "Surrey Légifelmérés"
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Scotland 1842-82"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr "NLS - OS 6-inch megye sorozat 1888-1913"
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -17011,9 +17304,6 @@ msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr "NLS - OS 25-inch (Skócia) 1892-1905"
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25k historic (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "OS 1:25k történelmi (OSM-Limited)"
@@ -17354,8 +17644,8 @@ msgstr "Új adatokat tölt le amikor mozgatod a térképet vagy zoomolsz"
msgid "Create a grid of ways."
msgstr "Vonalak hálózatát hozza létre."
-msgid "Customization of public transport stops."
-msgstr "Tömegközlekedési megállók testreszabása."
+msgid "Customization of public public transport stops."
+msgstr ""
msgid ""
"Creating and handling address nodes and buildings within Czech Republic."
@@ -17467,6 +17757,9 @@ msgstr "Egyszerűsítő eszköz a házszámok címkézéséhez."
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "Légifelvétel XML határvonalakat generál multipoligonból"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -19982,6 +20275,9 @@ msgstr "Patak"
msgid "River"
msgstr "Folyam"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Csatorna"
@@ -21032,6 +21328,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr "Vendégház/ Szállás és reggeli"
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Apartman"
@@ -21099,6 +21401,12 @@ msgstr "Szabadtéri asztalok"
msgid "Takeaway"
msgstr "Elvitelre"
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Gyorsétterem"
@@ -22047,31 +22355,19 @@ msgstr "állatmegfigyelő rejtekhely"
msgid "Hunting Stand"
msgstr "Magasles"
-msgid "Height"
-msgstr "Magasság"
-
-msgctxt "height"
-msgid "low"
-msgstr "alacsony"
-
-msgctxt "height"
-msgid "half"
-msgstr "fél"
-
-msgctxt "height"
-msgid "full"
-msgstr "teljes"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr "Rejtek"
-msgid "Lock"
-msgstr "Zárható"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr "Vízcsap"
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr "Sűrített levegő/kerékfújó"
@@ -22664,6 +22960,10 @@ msgid "hut"
msgstr "kunyhó"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr "kollégium"
@@ -23962,6 +24262,9 @@ msgstr "Hentes"
msgid "Seafood"
msgstr "Halárus"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Delikatesz bolt"
@@ -24777,9 +25080,6 @@ msgstr "Fasor"
msgid "A line of trees."
msgstr "Fák egyvonalban."
-msgid "Wood"
-msgstr "Őserdő"
-
msgid "Woodland where timber production does not dominate use."
msgstr "Erdőség, ahol a fa előállítás nem uralja a használatot."
@@ -25858,6 +26158,9 @@ msgstr "Sávok száma eltér {0} és {1} kulcsokban"
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0} elavult"
@@ -25967,6 +26270,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr "{0} kulcs értéke szokatlan."
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} egy ponton. Vonalon kellene használni."
@@ -26047,6 +26356,11 @@ msgstr "Partvonal ezen belül: {1}"
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} azon a ponton kellene legyen ahol {1} és {2} kereszteződnek"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "rövidített utca név"
@@ -26071,6 +26385,9 @@ msgstr "{0} együtt használva {1}-el"
msgid "street name contains ss"
msgstr "az utcanév ss-t tartalmaz"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -26884,6 +27201,16 @@ msgstr "A jelenlegi módosításcsomag beküldése"
msgid "Submit the current changeset to Mapillary"
msgstr "A jelenlegi módosításcsomag beküldése Mapillary-re"
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr "Képek feltöltése"
@@ -26926,8 +27253,8 @@ msgstr "Mapillary módosításcsomag dialógusablak megnyitása"
msgid "Mapillary changeset"
msgstr "Mapillary módosításcsomag"
-msgid "Submit"
-msgstr "Beküldés"
+msgid "Submitting changeset to server…"
+msgstr ""
msgid "Export all images"
msgstr "Összes kép exportálása"
@@ -27746,6 +28073,9 @@ msgstr ""
msgid "Area Selector"
msgstr "Területválasztó"
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr "Létrehozott terület"
@@ -27787,8 +28117,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -29408,6 +29738,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Légifelvétel XML fájl megnyitása"
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr "Kalibrációs réteg"
@@ -31694,9 +32083,6 @@ msgstr "PT: az útvonal stop_position taggal kell kezdődjön és végződjön"
msgid "PT: First or last way needs to be split"
msgstr "PT: az első vagy utolsó vonalat el kell vágni"
-msgid "PT: Problem in the route segment"
-msgstr "PT: probléma az útszakaszban"
-
msgid "PT: Stop not served"
msgstr "PT: a megálló nincs kiszolgálva"
@@ -31860,9 +32246,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr "[eltérés]"
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "Útvonal minták..."
@@ -31920,6 +32303,9 @@ msgstr "bal oldali"
msgid "Maximum distance from route"
msgstr "Maximális távolság az úttól"
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "Tömegközlekedés: Megállótípus módosítása"
@@ -32121,9 +32507,6 @@ msgstr "Poligon rekonstruálása"
msgid "Multipolygon must consist only of ways"
msgstr "A multipoligon csak vonalakból állhat"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr "A poligonok rekonstruálása csak külső vonalakból lehetséges"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Poligonok rekonstruálása {0} kapcsolatból"
diff --git a/i18n/po/hy.po b/i18n/po/hy.po
index f00167e..179d2da 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:33+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:36+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: hy\n"
msgid "Cancel"
@@ -67,9 +67,15 @@ msgstr ""
msgid "Help"
msgstr "Օգնություն"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr ""
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -708,6 +714,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -729,9 +738,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -782,6 +788,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -931,16 +940,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -949,6 +958,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -964,12 +979,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1762,9 +1771,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3950,9 +3956,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3982,12 +3985,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4680,12 +4698,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4702,8 +4726,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5024,9 +5048,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5165,82 +5186,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5406,6 +5351,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5465,7 +5486,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6857,212 +6878,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8168,6 +8189,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9654,6 +9678,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9666,9 +9693,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9765,14 +9789,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9785,6 +9801,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10773,6 +10792,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10785,6 +10807,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10797,6 +10831,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10856,6 +10893,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10874,9 +10916,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12071,6 +12120,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13106,6 +13161,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13127,12 +13188,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14092,6 +14147,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14580,13 +14638,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14610,7 +14671,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14661,7 +14725,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14670,10 +14734,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14709,6 +14785,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14754,10 +14836,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14790,34 +14878,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14856,6 +14984,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14889,9 +15023,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14948,9 +15079,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14978,9 +15106,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15014,9 +15139,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15053,19 +15223,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15128,9 +15307,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15164,12 +15355,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15296,9 +15509,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15308,6 +15518,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15329,12 +15553,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15356,6 +15598,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15398,6 +15643,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15419,6 +15667,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15434,6 +15688,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15461,9 +15718,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15485,9 +15787,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15497,9 +15796,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15811,7 +16107,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15899,6 +16195,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18295,6 +18594,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19343,6 +19645,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19409,6 +19717,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20352,31 +20666,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20968,6 +21270,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22261,6 +22567,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23074,9 +23383,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24121,6 +24427,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24212,6 +24521,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24288,6 +24603,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24312,6 +24632,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25085,6 +25408,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25127,7 +25460,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25930,6 +26263,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25971,8 +26307,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27570,6 +27906,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29731,9 +30126,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29891,9 +30283,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29951,6 +30340,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30148,9 +30540,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/ia.po b/i18n/po/ia.po
index 2ec7aa3..559e1b9 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:51+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:55+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: ia\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr "Adjuta"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr ""
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -708,6 +714,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -729,9 +738,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -782,6 +788,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -931,16 +940,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -949,6 +958,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -964,12 +979,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1762,9 +1771,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3950,9 +3956,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3982,12 +3985,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4680,12 +4698,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4702,8 +4726,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5024,9 +5048,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5165,82 +5186,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5406,6 +5351,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5465,7 +5486,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6857,212 +6878,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8168,6 +8189,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9654,6 +9678,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9666,9 +9693,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9765,14 +9789,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9785,6 +9801,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10773,6 +10792,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10785,6 +10807,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10797,6 +10831,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10856,6 +10893,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10874,9 +10916,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12071,6 +12120,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13106,6 +13161,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13127,12 +13188,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14092,6 +14147,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14580,13 +14638,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14610,7 +14671,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14661,7 +14725,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14670,10 +14734,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14709,6 +14785,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14754,10 +14836,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14790,34 +14878,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14856,6 +14984,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14889,9 +15023,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14948,9 +15079,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14978,9 +15106,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15014,9 +15139,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15053,19 +15223,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15128,9 +15307,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15164,12 +15355,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15296,9 +15509,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15308,6 +15518,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15329,12 +15553,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15356,6 +15598,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15398,6 +15643,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15419,6 +15667,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15434,6 +15688,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15461,9 +15718,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15485,9 +15787,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15497,9 +15796,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15811,7 +16107,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15899,6 +16195,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18295,6 +18594,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19343,6 +19645,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19409,6 +19717,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20352,31 +20666,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20968,6 +21270,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22261,6 +22567,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23074,9 +23383,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24121,6 +24427,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24212,6 +24521,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24288,6 +24603,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24312,6 +24632,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25085,6 +25408,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25127,7 +25460,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25930,6 +26263,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25971,8 +26307,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27570,6 +27906,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29731,9 +30126,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29891,9 +30283,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29951,6 +30340,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30148,9 +30540,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/id.po b/i18n/po/id.po
index 5932240..72a1a7d 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:51+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:56+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: id\n"
"X-Language: id_ID\n"
@@ -65,9 +65,15 @@ msgstr "Membangun menu utama"
msgid "Help"
msgstr "Bantuan"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Menginisialisasi OSM API"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Menginisialisasi alat validasi"
@@ -207,6 +213,12 @@ msgstr ""
"mengatur elemen yang dipilih pada peta untuk item yang dipilih dari daftar "
"diatas"
+msgid "Select WMS layers"
+msgstr "Pilih layer WMS"
+
+msgid "Add layers"
+msgstr "Tambahkan layer"
+
msgid "Add imagery layer {0}"
msgstr "Menambahkan Layer Citra {0}"
@@ -228,12 +240,6 @@ msgstr "Kesalahan"
msgid "Select image format for WMS layer"
msgstr "Pilih format gambar untuk layer WMS"
-msgid "Select WMS layers"
-msgstr "Pilih layer WMS"
-
-msgid "Add layers"
-msgstr "Tambahkan layer"
-
msgid "Add Node..."
msgstr "Tambahkan Node..."
@@ -744,6 +750,9 @@ msgstr "Pndah ke Posisi"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Buka dialog yang mengizinkan untuk pindah ke suatu lokasi spesifik"
+msgid "Jump to Position"
+msgstr "Pindah ke posisi"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Masukkan lintang/derajat bujur untuk pindah posisi"
@@ -765,9 +774,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Lompat kesana"
-msgid "Jump to Position"
-msgstr "Pindah ke posisi"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr "Tidak dapat mengurai Lintang, Bujur atau Perbesaran. Mohon periksa."
@@ -820,6 +826,9 @@ msgstr "Gabungkan layer"
msgid "Merge the current layer into another layer"
msgstr "Gabungkan layer ini ke dalam layer lainnya"
+msgid "{0} completed in {1}"
+msgstr "{0} dirampungkan dalam {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Menggabungkan layer dengan kebijakan mengunggah yang berbeda"
@@ -985,24 +994,30 @@ msgstr[0] "Membuka {0} berkas..."
msgid "Opening file ''{0}'' ..."
msgstr "Membuka berkas \"{0}\" ..."
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Ok"
+
msgid "Open Location..."
msgstr "Membuka lokasi..."
msgid "Open an URL."
msgstr "Buka sebuah URL"
-msgid "Separate Layer"
-msgstr "Memisahkan layer"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Pilih jika data yang seharusnya didownload ke dalam layer baru"
-
msgid "Enter URL to download:"
msgstr "Masukkan URLuntuk didownload:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Masukkan sebuah URL dimana data seharusnya didownload"
+msgid "Separate Layer"
+msgstr "Memisahkan layer"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Pilih jika data yang seharusnya didownload ke dalam layer baru"
+
msgid "Download Location"
msgstr "Download Lokasi"
@@ -1018,12 +1033,6 @@ msgstr "Tutup dialog dan batalkan download"
msgid "Download Data"
msgstr "Download Data"
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr "Ok"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1881,9 +1890,6 @@ msgstr "query dan download set perubahan ..."
msgid "Errors during download"
msgstr "Gangguan saat mendownload"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr "Download GPS"
@@ -4183,9 +4189,6 @@ msgstr "Model area garis tidak menutup"
msgid "No outer way for multipolygon"
msgstr "Tidak ada garis terluar untuk multipoligon"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -4215,12 +4218,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr "Multipoligon tidak menutup"
-msgid "Multipolygon inner way is outside"
-msgstr "Garis terdalam multipoligon di luar"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "Persimpangan antara garis-garis multipoligon"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr "Garis terdalam multipoligon di luar"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "Peran tidak berguna untuk anggota multipoligon"
@@ -4932,12 +4950,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr "Pilihan disediakan sebagai sistem properti Java"
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4954,8 +4978,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5285,9 +5309,6 @@ msgstr "Klik untuk menjalankan pekerjaan di latar belakang"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} dirampungkan dalam {1}"
-
msgid "Enlarge"
msgstr ""
@@ -5429,84 +5450,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr "Milik saya dengan mereka"
-
-msgid "My with Merged"
-msgstr "Milik saya dengan hasil gabungan"
-
-msgid "Their with Merged"
-msgstr "Milik mereka dengan hasil gabungan"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "Peran {0} tidak terlibat dalam perbandingan {1}."
-
-msgid "Properties"
-msgstr "Properti"
-
-msgid "Tags"
-msgstr "Tag"
-
-msgid "Nodes"
-msgstr "Node"
-
-msgid "Members"
-msgstr "Anggota"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Tidak ada konflik tag yang tertunda untuk diselesaikan"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Tags({0} konflik)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} konflik tag yang tertunda untuk diselesaikan"
-
-msgid "Nodes(resolved)"
-msgstr "Node/titik (diselesaikan)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Gabungkan node/titik pada daftar frozen. Tidak ada konflik yang tertunda "
-"pada daftar node/titik di way/garis ini"
-
-msgid "Nodes(with conflicts)"
-msgstr "Node (dengan konflik)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Konflik yang tertunda pada daftar node/titik di way/garis ini"
-
-msgid "Members(resolved)"
-msgstr "Anggota (terselesaikan)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Menggabungkan daftar anggota yang frozen. Tidak ada konflik yang tertunda "
-"pada daftar anggota dari relasi anak"
-
-msgid "Members(with conflicts)"
-msgstr "Member(memiliki konflik)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Konflik yang tertunda pada daftar member dari relasi"
-
-msgid "No pending property conflicts"
-msgstr "Tidak ada properti konflik yang tertunda"
-
-msgid "Properties(with conflicts)"
-msgstr "Properti (dengan konflik)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Konflik yang tertunda yang perlu untuk diselesaikan"
-
-msgid "Conflict Resolution"
-msgstr "Penyelesaian Konflik"
-
msgid "{0} more..."
msgstr "{0} lebih..."
@@ -5689,6 +5632,84 @@ msgid "Their version ({0} entry)"
msgid_plural "Their version ({0} entries)"
msgstr[0] "Versi mereka ({0} entries)"
+msgid "My with Their"
+msgstr "Milik saya dengan mereka"
+
+msgid "My with Merged"
+msgstr "Milik saya dengan hasil gabungan"
+
+msgid "Their with Merged"
+msgstr "Milik mereka dengan hasil gabungan"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "Peran {0} tidak terlibat dalam perbandingan {1}."
+
+msgid "Properties"
+msgstr "Properti"
+
+msgid "Tags"
+msgstr "Tag"
+
+msgid "Nodes"
+msgstr "Node"
+
+msgid "Members"
+msgstr "Anggota"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Tidak ada konflik tag yang tertunda untuk diselesaikan"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Tags({0} konflik)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} konflik tag yang tertunda untuk diselesaikan"
+
+msgid "Nodes(resolved)"
+msgstr "Node/titik (diselesaikan)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Gabungkan node/titik pada daftar frozen. Tidak ada konflik yang tertunda "
+"pada daftar node/titik di way/garis ini"
+
+msgid "Nodes(with conflicts)"
+msgstr "Node (dengan konflik)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Konflik yang tertunda pada daftar node/titik di way/garis ini"
+
+msgid "Members(resolved)"
+msgstr "Anggota (terselesaikan)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Menggabungkan daftar anggota yang frozen. Tidak ada konflik yang tertunda "
+"pada daftar anggota dari relasi anak"
+
+msgid "Members(with conflicts)"
+msgstr "Member(memiliki konflik)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Konflik yang tertunda pada daftar member dari relasi"
+
+msgid "No pending property conflicts"
+msgstr "Tidak ada properti konflik yang tertunda"
+
+msgid "Properties(with conflicts)"
+msgstr "Properti (dengan konflik)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Konflik yang tertunda yang perlu untuk diselesaikan"
+
+msgid "Conflict Resolution"
+msgstr "Penyelesaian Konflik"
+
msgid "Node"
msgstr "Node"
@@ -5752,10 +5773,8 @@ msgstr "Peran"
msgid "Primitive"
msgstr "Primitif"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"Gabungkan node/titik yang belum frozen. Tidak dapat digabungkan perintah "
-"resolusi"
msgid "<undefined>"
msgstr "<tidak terdefinisi>"
@@ -7179,108 +7198,9 @@ msgid ""
msgstr ""
"Pilih set perubahan berdasarkan tanggal/waktu mereka saat dibuat atau ditutup"
-msgid "Select only changesets related to a specific bounding box"
-msgstr "Pilih set perubahan terkait kotak pembatasan tertentu"
-
-msgid "Query open changesets only"
-msgstr "Buka query set perubahan"
-
-msgid "Query closed changesets only"
-msgstr "Query tertutup hanya pada set perubahan"
-
-msgid "Query both open and closed changesets"
-msgstr "Query baik set perubahan terbuka dan tertutup"
-
-msgid "Only changesets owned by myself"
-msgstr "Hanya set perubahan yang dimiliki sendiri"
-
-msgid "User ID:"
-msgstr "ID pengguna:"
-
-msgid "User name:"
-msgstr "Nama Pengguna:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
-"Hanya set perubahan yang dimiliki pengguna dengan ID pengguna yang mengikuti"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-"Hanya set perubahan yang dimiliki pengguna dengan nama pengguna yang "
-"mengikuti"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Hanya set perubahan yang dimiliki sendiri (menonaktifkan. JOSM yang dibuka "
-"oleh user anonim"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Tidak dapat membatasi query pengguna saat ini karena pengguna lain adalah "
-"anonim"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "Nilai saat ini ''{0}'' untuk ID pengguna yang tidak valid"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"Tidak dapat membatasi permintaan set perubahan untuk nama pengguna ''{0}''"
-
-msgid "Please enter a valid user ID"
-msgstr "Silahkan masukkan user ID yang benar"
-
-msgid "Invalid user ID"
-msgstr "UserID salah"
-
-msgid "Please enter a non-empty user name"
-msgstr "Silahkan masukkan user name yang dimiliki"
-
-msgid "Invalid user name"
-msgstr "User name salah"
-
-msgid "Date: "
-msgstr "Tanggal: "
-
-msgid "Time:"
-msgstr "Waktu:"
-
-msgid "Closed after - "
-msgstr "Tutup setelahnya - "
-
-msgid "Date:"
-msgstr "Tanggal:"
-
-msgid "Created before - "
-msgstr "Dibuat sebelumnya - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Hanya set perubahan yang ditutup setelah tanggal/waktu yang diikuti"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-"Set perubahan ditutup setelah dan dibuat sebelum tanggal/waktu tertentu"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"Tidak dapat membangun query set perubahan dengan pembatasan berbasis waktu. "
-"Input tidak valid."
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr ""
-"<html>Masukan nilai tanggal/waktu yang valid untuk membatasi<br>query untuk "
-"rentang waktu tertentu"
-
-msgid "Invalid date/time values"
-msgstr "Nilai tanggal/waktu tidak valid"
-
+msgid "Select only changesets related to a specific bounding box"
+msgstr "Pilih set perubahan terkait kotak pembatasan tertentu"
+
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
"invalid."
@@ -7298,29 +7218,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Kotak pembatas yang tidak sah"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"Value yang ada saat ini bukan ID pengguna yang sah. Silahkan masukkan sebuah "
-"integer value > 0"
-
-msgid "Please enter an integer value > 0"
-msgstr "Silahkan masukkan nilai integer > 0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Silahkan masukkan tanggal pada format biasanya digunakan pada lokal "
-"anda.<br>Contoh: {0}<br>Contoh: {1}<br>Contoh: {2}<br>Contoh: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Silahkan masukkan waktu yang sah di format yang biasanya digunakan untuk "
-"lokal anda.<br>Contoh: {0}<br>Contoh: {1}<br>Contoh: {2}<br>Contoh: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Unduh hanya untuk changeset Anda"
@@ -7409,6 +7306,77 @@ msgstr "Set perubahan ilegal query URL"
msgid "Close the dialog and abort querying of changesets"
msgstr "Tutup kotak dialog dan membatalkan query dari set perubahan"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Silahkan masukkan tanggal pada format biasanya digunakan pada lokal "
+"anda.<br>Contoh: {0}<br>Contoh: {1}<br>Contoh: {2}<br>Contoh: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Buka query set perubahan"
+
+msgid "Query closed changesets only"
+msgstr "Query tertutup hanya pada set perubahan"
+
+msgid "Query both open and closed changesets"
+msgstr "Query baik set perubahan terbuka dan tertutup"
+
+msgid "Date: "
+msgstr "Tanggal: "
+
+msgid "Time:"
+msgstr "Waktu:"
+
+msgid "Closed after - "
+msgstr "Tutup setelahnya - "
+
+msgid "Date:"
+msgstr "Tanggal:"
+
+msgid "Created before - "
+msgstr "Dibuat sebelumnya - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Hanya set perubahan yang ditutup setelah tanggal/waktu yang diikuti"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+"Set perubahan ditutup setelah dan dibuat sebelum tanggal/waktu tertentu"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Tidak dapat membangun query set perubahan dengan pembatasan berbasis waktu. "
+"Input tidak valid."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Masukan nilai tanggal/waktu yang valid untuk membatasi<br>query untuk "
+"rentang waktu tertentu"
+
+msgid "Invalid date/time values"
+msgstr "Nilai tanggal/waktu tidak valid"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Silahkan masukkan waktu yang sah di format yang biasanya digunakan untuk "
+"lokal anda.<br>Contoh: {0}<br>Contoh: {1}<br>Contoh: {2}<br>Contoh: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"Value yang ada saat ini bukan ID pengguna yang sah. Silahkan masukkan sebuah "
+"integer value > 0"
+
+msgid "Please enter an integer value > 0"
+msgstr "Silahkan masukkan nilai integer > 0"
+
msgid "URL: "
msgstr "URL: "
@@ -7429,6 +7397,57 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "URL set perubahan query tidak valid"
+msgid "Only changesets owned by myself"
+msgstr "Hanya set perubahan yang dimiliki sendiri"
+
+msgid "User ID:"
+msgstr "ID pengguna:"
+
+msgid "User name:"
+msgstr "Nama Pengguna:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr ""
+"Hanya set perubahan yang dimiliki pengguna dengan ID pengguna yang mengikuti"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+"Hanya set perubahan yang dimiliki pengguna dengan nama pengguna yang "
+"mengikuti"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Hanya set perubahan yang dimiliki sendiri (menonaktifkan. JOSM yang dibuka "
+"oleh user anonim"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Tidak dapat membatasi query pengguna saat ini karena pengguna lain adalah "
+"anonim"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "Nilai saat ini ''{0}'' untuk ID pengguna yang tidak valid"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"Tidak dapat membatasi permintaan set perubahan untuk nama pengguna ''{0}''"
+
+msgid "Please enter a valid user ID"
+msgstr "Silahkan masukkan user ID yang benar"
+
+msgid "Invalid user ID"
+msgstr "UserID salah"
+
+msgid "Please enter a non-empty user name"
+msgstr "Silahkan masukkan user name yang dimiliki"
+
+msgid "Invalid user name"
+msgstr "User name salah"
+
msgid "Activate"
msgstr "Aktifkan"
@@ -8601,6 +8620,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10198,6 +10220,9 @@ msgstr "Arah"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audio files (*.wav)"
+
msgid "Import Audio"
msgstr "Impor Audio"
@@ -10213,9 +10238,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Impor tidak memungkinkan"
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audio files (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Penanda audio dari {0}"
@@ -10326,14 +10348,6 @@ msgstr "(URL adalah: "
msgid "Select the map painting styles"
msgstr "memilih model pewarnaan peta"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr "Memual model \"{0}\"..."
@@ -10347,6 +10361,9 @@ msgstr[0] ""
"Disana terjadi kesalahan {0} ketika memuat model ini. Pilih \"Info\" dari "
"klik kanan menu untuk detail."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -11455,6 +11472,9 @@ msgstr "Dilusi dari posisi (merah = tinggi, hijau = rendah, jika tersedia)"
msgid "Track date"
msgstr "Tanggal track"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Warna tunggal (bisa menjadi customize nama layer)"
@@ -11467,6 +11487,18 @@ msgstr "Sepeda"
msgid "Foot"
msgstr "Pejalan Kaki"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Hutan"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Buat mark/tanda ketika membaca GPX"
@@ -11479,6 +11511,9 @@ msgstr "Rentang warna yang dinamis berdasarkan data batas"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Grafik GPX halus (antiliasing)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11550,6 +11585,11 @@ msgstr ""
"halus"
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11572,11 +11612,18 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "Warna titik dan segmen jalur dari timestamp."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
"Memungkinkan untuk menyesuaikan pewarnaan trek untuk kecepatan rata-rata "
"yang berbeda."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Pewarnaan Trek dan Titik"
@@ -12847,6 +12894,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13958,6 +14011,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Simpan user dan password (unencrypted)"
+msgid "Assume"
+msgstr "Menganggap"
+
+msgid "Existing values"
+msgstr "Value yang sudah ada"
+
msgid "<delete from {0} objects>"
msgstr "<hapus dari objek {0}>"
@@ -13979,12 +14038,6 @@ msgstr "Tambahkan tag yang telah diperiksa ke objek terpilih"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Enter: Tambahkan semua tag untuk objek-objek terpilih"
-msgid "Assume"
-msgstr "Menganggap"
-
-msgid "Existing values"
-msgstr "Value yang sudah ada"
-
msgid "Enable the checkbox to accept the value"
msgstr "Aktifkan kotak centang untuk menerima nilai"
@@ -15066,6 +15119,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -15577,13 +15633,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -15607,7 +15666,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -15658,7 +15720,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -15667,10 +15729,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -15706,6 +15780,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -15751,10 +15831,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -15784,37 +15870,77 @@ msgstr ""
msgid "SPW(allonie) 2012-2013 aerial imagery"
msgstr ""
-msgid "SPW(allonie) 2009-2010 aerial imagery"
+msgid "SPW(allonie) 2009-2010 aerial imagery"
+msgstr ""
+
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -15853,6 +15979,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -15886,9 +16018,6 @@ msgstr "Kadaster"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -15945,9 +16074,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15975,9 +16101,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16011,9 +16134,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -16050,19 +16218,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -16125,9 +16302,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -16161,12 +16350,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -16293,9 +16504,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -16305,6 +16513,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -16326,12 +16548,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -16353,6 +16593,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -16395,6 +16638,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -16416,6 +16662,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -16431,6 +16683,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -16458,9 +16713,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -16482,9 +16782,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -16494,9 +16791,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -16820,7 +17114,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr "Buat grid garis."
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -16920,6 +17214,9 @@ msgstr "Alat sederhana untuk tag nomor rumah"
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "Memunculkan batas Citra Satelit XML dari multipoligon"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -19385,6 +19682,9 @@ msgstr "Anak Sungai"
msgid "River"
msgstr "Sungai"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -20433,6 +20733,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Kakus"
@@ -20499,6 +20805,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Makanan Cepat Saji"
@@ -21442,31 +21754,19 @@ msgstr "wildlife_hide"
msgid "Hunting Stand"
msgstr "Stand Berburu"
-msgid "Height"
-msgstr "Tinggi"
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
-msgstr "Kunci"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -22058,6 +22358,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -23351,6 +23655,9 @@ msgstr "Pemotong Daging"
msgid "Seafood"
msgstr "Makanan Laut"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Deli (Fine Food)"
@@ -24164,9 +24471,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr "Hutan"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -25213,6 +25517,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0} sudah usang"
@@ -25304,6 +25611,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -25380,6 +25693,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "mempersingkat nama jalan"
@@ -25404,6 +25722,9 @@ msgstr ""
msgid "street name contains ss"
msgstr "nama jalan berisi ss"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -26201,6 +26522,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -26243,7 +26574,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -27132,6 +27463,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -27173,8 +27507,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -28857,6 +29191,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Buka citra satelit berkas XML"
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr "Layer Kalibrasi"
@@ -31142,9 +31535,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -31304,9 +31694,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr "[gap]"
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "Pola rute..."
@@ -31364,6 +31751,9 @@ msgstr "Kemudi sisi kiri"
msgid "Maximum distance from route"
msgstr "Jarak maksimum dari rute"
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "Transportasi umum: Uban tipe pemberhentian"
@@ -31563,9 +31953,6 @@ msgstr "Mengkonstruksi ulang polygon"
msgid "Multipolygon must consist only of ways"
msgstr "Multipoligon hanya boleh terdiri dari dari way/garis"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr "Rekonstruksi poligon hanya dapat dilakukan dari way/garis terluar"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Merekonstruksi poligon dari relasi {0}"
diff --git a/i18n/po/is.po b/i18n/po/is.po
index 3f1399c..509cbe3 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:50+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:54+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: is\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr "Hjálp"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -202,6 +208,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr "Henda hlutum út úr vallistanum sem eru ekki valdir á honum."
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -223,12 +235,6 @@ msgstr "Villa"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr "Bæta við hnút..."
@@ -711,6 +717,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -732,9 +741,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -785,6 +791,9 @@ msgstr "Sameina lag"
msgid "Merge the current layer into another layer"
msgstr "Sameina það lag sem nú er valið öðru lagi"
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -934,24 +943,30 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr "Opna skránna „{0}“..."
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid "Open Location..."
msgstr "Opna slóð..."
msgid "Open an URL."
msgstr "Opna slóð (URL)"
-msgid "Separate Layer"
-msgstr "Aðskilið lag"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Veljð hvort sótt gögn ættu að vera sett í nýtt lag."
-
msgid "Enter URL to download:"
msgstr "Sláðu inn slóð (URL) skrárinnar sem þú vilt opna:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Sláðu inn slóð (URL) hvaðan gögnin ættu að vera sótt."
+msgid "Separate Layer"
+msgstr "Aðskilið lag"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Veljð hvort sótt gögn ættu að vera sett í nýtt lag."
+
msgid "Download Location"
msgstr "Opna slóð"
@@ -967,12 +982,6 @@ msgstr "Loka glugga og hætta við að sækja gögn."
msgid "Download Data"
msgstr "Sækja gögn"
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1776,9 +1785,6 @@ msgstr ""
msgid "Errors during download"
msgstr "Villur þegar gögn voru sótt"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3969,9 +3975,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -4001,12 +4004,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4699,12 +4717,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4721,8 +4745,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5045,9 +5069,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5186,82 +5207,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr "Tögg"
-
-msgid "Nodes"
-msgstr "Hnútar"
-
-msgid "Members"
-msgstr "Stök"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5427,6 +5372,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr "Tögg"
+
+msgid "Nodes"
+msgstr "Hnútar"
+
+msgid "Members"
+msgstr "Stök"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5486,7 +5507,7 @@ msgstr "Hlutverk"
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6848,124 +6869,38 @@ msgstr ""
msgid "Download content"
msgstr "Sækja innihald"
-msgid "Download the changeset content from the OSM server"
-msgstr "Sækja innihald breytinga-setts frá OSM miðlara"
-
-msgid "Update content"
-msgstr ""
-
-msgid "Update the changeset content from the OSM server"
-msgstr ""
-
-msgid "Changeset ID: "
-msgstr ""
-
-msgid "Enter a changeset id"
-msgstr ""
-
-msgid ""
-"Download the changeset with the specified id, including the changeset content"
-msgstr ""
-"Sækja breytingar-sett með tilgreint auðkenni, ásamt innihaldi breytingar-"
-"setts"
-
-msgid "Select changesets owned by specific users"
-msgstr ""
-
-msgid "Select changesets depending on whether they are open or closed"
-msgstr ""
-
-msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr ""
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr ""
-
-msgid "Query open changesets only"
-msgstr ""
-
-msgid "Query closed changesets only"
-msgstr ""
-
-msgid "Query both open and closed changesets"
-msgstr ""
-
-msgid "Only changesets owned by myself"
-msgstr ""
-
-msgid "User ID:"
-msgstr ""
-
-msgid "User name:"
-msgstr ""
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr ""
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-
-msgid "Please enter a valid user ID"
-msgstr ""
-
-msgid "Invalid user ID"
-msgstr ""
-
-msgid "Please enter a non-empty user name"
-msgstr ""
-
-msgid "Invalid user name"
-msgstr ""
-
-msgid "Date: "
-msgstr ""
+msgid "Download the changeset content from the OSM server"
+msgstr "Sækja innihald breytinga-setts frá OSM miðlara"
-msgid "Time:"
+msgid "Update content"
msgstr ""
-msgid "Closed after - "
+msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Date:"
+msgid "Changeset ID: "
msgstr ""
-msgid "Created before - "
+msgid "Enter a changeset id"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid ""
+"Download the changeset with the specified id, including the changeset content"
msgstr ""
+"Sækja breytingar-sett með tilgreint auðkenni, ásamt innihaldi breytingar-"
+"setts"
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Select changesets owned by specific users"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Select changesets depending on whether they are open or closed"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Select changesets based on the date/time they have been created or closed"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Select only changesets related to a specific bounding box"
msgstr ""
msgid ""
@@ -6981,23 +6916,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-
-msgid "Please enter an integer value > 0"
-msgstr ""
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-
msgid "Download my changesets only"
msgstr "Sækja aðeins mín breytingar-sett"
@@ -7073,6 +6991,66 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid "Query open changesets only"
+msgstr ""
+
+msgid "Query closed changesets only"
+msgstr ""
+
+msgid "Query both open and closed changesets"
+msgstr ""
+
+msgid "Date: "
+msgstr ""
+
+msgid "Time:"
+msgstr ""
+
+msgid "Closed after - "
+msgstr ""
+
+msgid "Date:"
+msgstr ""
+
+msgid "Created before - "
+msgstr ""
+
+msgid "Only changesets closed after the following date/time"
+msgstr ""
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+
+msgid "Invalid date/time values"
+msgstr ""
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+
+msgid "Please enter an integer value > 0"
+msgstr ""
+
msgid "URL: "
msgstr ""
@@ -7090,6 +7068,49 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Only changesets owned by myself"
+msgstr ""
+
+msgid "User ID:"
+msgstr ""
+
+msgid "User name:"
+msgstr ""
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr ""
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr ""
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+
+msgid "Please enter a valid user ID"
+msgstr ""
+
+msgid "Invalid user ID"
+msgstr ""
+
+msgid "Please enter a non-empty user name"
+msgstr ""
+
+msgid "Invalid user name"
+msgstr ""
+
msgid "Activate"
msgstr ""
@@ -8196,6 +8217,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9689,6 +9713,9 @@ msgstr "Átt"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr "Flytja inn hljóð"
@@ -9701,9 +9728,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9800,14 +9824,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9820,6 +9836,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10810,6 +10829,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10822,6 +10844,18 @@ msgstr "Hjól"
msgid "Foot"
msgstr "Fótgangandi"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Skógur"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10834,6 +10868,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10897,6 +10934,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10915,9 +10957,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12116,6 +12165,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13154,6 +13209,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Vista notandanafn og lykilorð (ódulkóðað)"
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13175,12 +13236,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14143,6 +14198,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14631,13 +14689,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14661,7 +14722,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14712,7 +14776,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14721,10 +14785,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14760,6 +14836,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14805,10 +14887,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14838,37 +14926,77 @@ msgstr ""
msgid "SPW(allonie) 2012-2013 aerial imagery"
msgstr ""
-msgid "SPW(allonie) 2009-2010 aerial imagery"
+msgid "SPW(allonie) 2009-2010 aerial imagery"
+msgstr ""
+
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14907,6 +15035,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14940,9 +15074,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14999,9 +15130,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15029,9 +15157,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15065,9 +15190,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15104,19 +15274,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15179,9 +15358,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15215,12 +15406,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15347,9 +15560,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15359,6 +15569,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15380,12 +15604,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15407,6 +15649,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15449,6 +15694,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15470,6 +15718,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15485,6 +15739,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15512,9 +15769,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15536,9 +15838,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15548,9 +15847,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15862,7 +16158,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15951,6 +16247,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18347,6 +18646,9 @@ msgstr "Lækur"
msgid "River"
msgstr "Á"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Skipaskurður"
@@ -19395,6 +19697,12 @@ msgstr "Vegahótel"
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Fjallakofi (e. Chalet)"
@@ -19461,6 +19769,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Skyndibiti"
@@ -20404,31 +20718,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr "Hæð"
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -21020,6 +21322,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22313,6 +22619,9 @@ msgstr "Slátrari"
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23126,9 +23435,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr "Skógur"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24173,6 +24479,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24264,6 +24573,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24340,6 +24655,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24364,6 +24684,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25137,6 +25460,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25179,7 +25512,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25982,6 +26315,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26023,8 +26359,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27622,6 +27958,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29783,9 +30178,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29943,9 +30335,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -30003,6 +30392,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30200,9 +30592,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/it.po b/i18n/po/it.po
index a9a835d..ba398f2 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: 2016-11-06 22:51+0100\n"
-"PO-Revision-Date: 2016-11-03 13:42+0000\n"
-"Last-Translator: Simon Legner <Unknown>\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
+"PO-Revision-Date: 2016-12-31 11:55+0000\n"
+"Last-Translator: Silvio Brera <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: 2016-11-07 04:52+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:56+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: it\n"
"X-Language: it_IT\n"
"X-Source-Language: en\n"
@@ -64,9 +64,15 @@ msgstr "Creazione del menu principale"
msgid "Help"
msgstr "Aiuto"
+msgid "Initializing internal boundaries data"
+msgstr "Inizializzazione interna dati dei confini"
+
msgid "Initializing OSM API"
msgstr "Inizializzazione delle API di OSM"
+msgid "Initializing internal traffic data"
+msgstr "Inizializzazione interna dati traffico"
+
msgid "Initializing validator"
msgstr "Inizializzazione del validatore"
@@ -210,6 +216,12 @@ msgid ""
msgstr ""
"Seleziona sulla mappa gli elementi selezionati nella lista qui sopra."
+msgid "Select WMS layers"
+msgstr "Seleziona il livello WMS"
+
+msgid "Add layers"
+msgstr "Aggiungi livelli"
+
msgid "Add imagery layer {0}"
msgstr "Aggiungi livello di immagini aeree {0}"
@@ -231,12 +243,6 @@ msgstr "Errore"
msgid "Select image format for WMS layer"
msgstr "Seleziona il formato immagine per il livello WMS"
-msgid "Select WMS layers"
-msgstr "Seleziona il livello WMS"
-
-msgid "Add layers"
-msgstr "Aggiungi livelli"
-
msgid "Add Node..."
msgstr "Aggiungi nodo..."
@@ -765,6 +771,9 @@ msgstr ""
"Apre una finestra di dialogo che consente di saltare ad un indirizzo "
"specifico."
+msgid "Jump to Position"
+msgstr "Salta alla posizione"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Inserire Lat/Lon a cui andare."
@@ -786,9 +795,6 @@ msgstr "Indirizzo URL"
msgid "Jump there"
msgstr "Salta lì"
-msgid "Jump to Position"
-msgstr "Salta alla posizione"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Non è possibile interpretare la latitudine, la longitudine o "
@@ -845,6 +851,9 @@ msgstr "Unisci livello"
msgid "Merge the current layer into another layer"
msgstr "Unisci il livello corrente con un altro livello"
+msgid "{0} completed in {1}"
+msgstr "{0} completato in {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Unione dei livelli con differenti modalità di caricamento"
@@ -1015,24 +1024,30 @@ msgstr[1] "Aprendo {0} files..."
msgid "Opening file ''{0}'' ..."
msgstr "Apertura del file \"{0}\" in corso..."
+msgid "Which tasks to perform?"
+msgstr "Quale attività da svolgere?"
+
+msgid "Ok"
+msgstr "Ok"
+
msgid "Open Location..."
msgstr "Apri indirizzo URL..."
msgid "Open an URL."
msgstr "Apri un indirizzo URL."
-msgid "Separate Layer"
-msgstr "Livello separato"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Selezionare se i dati devono essere scaricati in un nuovo livello"
-
msgid "Enter URL to download:"
msgstr "Inserisci URL da scaricare:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Inserire un indirizzo URL dal quale devono essere scaricati i dati"
+msgid "Separate Layer"
+msgstr "Livello separato"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Selezionare se i dati devono essere scaricati in un nuovo livello"
+
msgid "Download Location"
msgstr "Scarica indirizzo URL"
@@ -1048,12 +1063,6 @@ msgstr "Chiudi la finestra e annulla lo scaricamento"
msgid "Download Data"
msgstr "Scarica dati"
-msgid "Which tasks to perform?"
-msgstr "Quale attività da svolgere?"
-
-msgid "Ok"
-msgstr "Ok"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1942,9 +1951,6 @@ msgstr "Interroga e scarica gruppi di modifiche ..."
msgid "Errors during download"
msgstr "Errore durante lo scaricamento"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr "Scarica GPS"
@@ -2475,6 +2481,8 @@ msgid ""
"{0}Add selection to relation{1}: Verify every single relation to avoid "
"damage!"
msgstr ""
+"{0}Aggiungere una selezione alla relazione{1}: Verificare ogni singola "
+"relazione per evitare errori o problemi o danni!"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
@@ -2818,7 +2826,7 @@ msgid "relation containing a member of role <i>stop</i>"
msgstr "relazione contenente un membro di ruolo <i>stop</i>"
msgid "objects being part of a relation as role <i>stop</i>"
-msgstr ""
+msgstr "oggetti parte di una relazione con ruolo di <i>stop</ i>"
msgid "n-th member of relation and/or n-th node of way"
msgstr "n-esimo membro della relazione e/o n-esimo nodo del percorso"
@@ -2911,7 +2919,7 @@ msgstr ""
"{1}"
msgid "Cannot parse timestamp ''{0}''"
-msgstr ""
+msgstr "Impossibile analizzare marca temporale ''{0}''"
msgid "Expecting {0} after {1}"
msgstr "E previsto {0} dopo {1}"
@@ -2945,7 +2953,7 @@ msgid "Unexpected token. Expected {0}, found {1}"
msgstr "Token inaspettato. Era atteso {0}, trovato {1}"
msgid "Failed to parse MapCSS selector"
-msgstr ""
+msgstr "Impossibile analizzare selettore MapCSS"
msgid "Unexpected token: {0}"
msgstr "Token inaspettato: {0}"
@@ -3555,7 +3563,7 @@ msgid "UNKNOWN"
msgstr "SCONOSCIUTO"
msgid "Error reading revision info from revision file: {0}"
-msgstr ""
+msgstr "Errore di lettura informazioni revisione da revisione del file: {0}"
msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
@@ -3637,6 +3645,8 @@ msgstr "Nessun livello selezionato da getCapabilities document: {0}"
msgid ""
"WMTS Parser error - start element {0} has different name than end element {2}"
msgstr ""
+"Errore di analisi WMTS - elemento di partenza {0} ha nome diverso da quello "
+"finale {2}"
msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
@@ -3965,7 +3975,7 @@ msgid "Parameter ''{0}'' required."
msgstr "Parametro ''{0}'' richiesto."
msgid "standard parallels are opposite"
-msgstr ""
+msgstr "paralleli standard sono contrari"
msgid "Cassini-Soldner"
msgstr "Cassini-Soldner"
@@ -3989,7 +3999,7 @@ msgid "Oblique Mercator"
msgstr "Obliqua di Mercatore"
msgid "Unsuitable parameters ''{0}'' and ''{1}'' for two point method."
-msgstr ""
+msgstr "Parametri non adeguati ''{0}'' e ''{1}'' per il metodo a due punti."
msgid "Illegal value for parameter ''{0}'': {1}"
msgstr "Valore non ammesso per il parametro ''{0}'': {1}"
@@ -4134,7 +4144,7 @@ msgid "Reversed coastline"
msgstr "Linea di costa invertita"
msgid "invalid coastline"
-msgstr ""
+msgstr "Linea di costa non valida"
msgid "Conditional Keys"
msgstr "Chiavi condizionali"
@@ -4173,10 +4183,10 @@ msgid "Crossing barriers"
msgstr "Barriere incrociate"
msgid "Self crossing"
-msgstr ""
+msgstr "Incrocia se stesso"
msgid "Self-crossing ways"
-msgstr ""
+msgstr "Tracciato incrocia se stesso"
msgid ""
"This test checks if two roads, railways, waterways or buildings crosses in "
@@ -4364,9 +4374,6 @@ msgstr "Percorso di tipo area non chiuso"
msgid "No outer way for multipolygon"
msgstr "Nessun percorso esterno per il multi-poligono"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "Il ruolo di ''{0}'' dovrebbe essere ''{1}''"
-
msgid "No area style for multipolygon"
msgstr "Nessuno stile di area per il multipoligono"
@@ -4395,6 +4402,8 @@ msgid ""
"With the currently used mappaint style(s) the style for outer way mismatches "
"the area style"
msgstr ""
+"Con lo stile di mappa attualmente utilizzato, lo stile del tracciato esterno "
+"non corrisponde allo stile di area"
msgid "Area style on outer way"
msgstr "Stile di area in un percorso esterno (multipoligono)"
@@ -4402,12 +4411,27 @@ msgstr "Stile di area in un percorso esterno (multipoligono)"
msgid "Multipolygon is not closed"
msgstr "Il multi-poligono non è chiuso"
-msgid "Multipolygon inner way is outside"
-msgstr "Il percorso interno del multi-poligono è esterno"
+msgid "Multipolygon rings share node(s)"
+msgstr "Anelli del Multipoligono condividono dei nodi"
msgid "Intersection between multipolygon ways"
msgstr "Intersezione tra i percorsi dei multi-poligoni"
+msgid "Multipolygon rings are equal"
+msgstr "Anelli del Multipoligono sono uguali"
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "Il ruolo di ''{0}'' dovrebbe essere ''{1}''"
+
+msgid "Multipolygon inner way is outside"
+msgstr "Il percorso interno del multi-poligono è esterno"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr "Anell0 del Multipoligono contiene segmenti doppi"
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr "Tracciato esterno del multipoligono"
+
msgid "No useful role for multipolygon member"
msgstr "Nessun ruolo utile per il membro del multi-poligono"
@@ -4415,10 +4439,10 @@ msgid "Non-Way in multipolygon"
msgstr "Nel multi-poligono è presente un elemento che non è un percorso"
msgid "Multipolygon member(s) repeated with different role"
-msgstr ""
+msgstr "Membri del multipoligono sono repetuti con ruoli differenti"
msgid "Multipolygon member(s) repeated with same role"
-msgstr ""
+msgstr "Membri del multipoligono sono ripetuti con identico ruolo"
msgid "Missing name:* translation"
msgstr "Traduzione name:* mancante"
@@ -4521,13 +4545,13 @@ msgid "Public Transport Route"
msgstr "Route per trasporto pubblico"
msgid "Route relation contains a ''{0}'' role"
-msgstr ""
+msgstr "Relazione Route contiene un ''{0}'' ruolo"
msgid "Route relation contains a gap"
-msgstr ""
+msgstr "Relazione Route contiene un salto"
msgid "Stop position not part of route"
-msgstr ""
+msgstr "Posizione Stop non è parte di Route"
msgid "Role verification problem"
msgstr "Problema nella verifica del ruolo"
@@ -5144,12 +5168,18 @@ msgstr "Disabilita accesso alle risorse specificate, separate da virgola"
msgid "options provided as Java system properties"
msgstr "opzioni fornite come proprietà di sistema Java"
+msgid "Change the JOSM directory name"
+msgstr "Cambio del nome della cartella di JOSM"
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/PERCORSO/DI/JOSM/PREFERENZE "
msgid "Set the preferences directory"
msgstr "Imposta la cartella delle preferenze"
+msgid "Default: {0}"
+msgstr "Default: {0}"
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/PERCORSO/DI/JOSM/DATIUTENTE"
@@ -5166,11 +5196,9 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/PERCORSO/DI/JOSM/CARTELLAHOME "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Riposiziona tutte e tre le cartelle in CARTELLAHOME. La cartella Cache sarà "
-"in CARTELLAHOME/CACHE"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5482,10 +5510,10 @@ msgid "Do not hide status bar"
msgstr "Non nascondere la barra di stato"
msgid "The northing at the mouse pointer."
-msgstr ""
+msgstr "Nord al puntatore del mouse"
msgid "The easting at the mouse pointer."
-msgstr ""
+msgstr "Est al puntatore del mouse"
msgid "The geographic latitude at the mouse pointer."
msgstr "La latitudine geografica del puntatore del mouse."
@@ -5523,9 +5551,6 @@ msgstr "Clicca per eseguire il processo in secondo piano"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} completato in {1}"
-
msgid "Enlarge"
msgstr "Allarga"
@@ -5668,86 +5693,6 @@ msgstr "Sfondo conflitto: elimina membro"
msgid "Conflict foreground: remove member"
msgstr "Primo piano conflitto: elimina membro"
-msgid "My with Their"
-msgstr "Il mio con il loro"
-
-msgid "My with Merged"
-msgstr "Il mio con l''unione"
-
-msgid "Their with Merged"
-msgstr "Il loro con l''unione"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "il ruolo {0} non partecipa nella comparazione {1}"
-
-msgid "Properties"
-msgstr "Proprietà"
-
-msgid "Tags"
-msgstr "Etichette"
-
-msgid "Nodes"
-msgstr "Nodi"
-
-msgid "Members"
-msgstr "Membri"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Non c''è alcun conflitto di etichette in attesa di risoluzione"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Etichette({0} conflitto)"
-msgstr[1] "Etichette({0} conflitti)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} conflitto di etichetta rimanente da risolvere"
-msgstr[1] "{0} conflitti di etichetta rimanenti da risolvere"
-
-msgid "Nodes(resolved)"
-msgstr "Nodi(risolti)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Lista di nodi uniti bloccata. Nella lista dei nodi di questo percorso non "
-"c''è alcun conflitto in attesa"
-
-msgid "Nodes(with conflicts)"
-msgstr "Nodi(con conflitti)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Conflitti in attesa nella lista di nodi di questo percorso"
-
-msgid "Members(resolved)"
-msgstr "Membri(risolti)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Lista dei membri uniti bloccata. Nella lista dei membri di questa relazione "
-"non c''è alcun conflitto in attesa"
-
-msgid "Members(with conflicts)"
-msgstr "Membri(con conflitti)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Conflitti in attesa nella lista di membri di questa relazione"
-
-msgid "No pending property conflicts"
-msgstr "Non c''è alcun conflitto di proprietà in attesa"
-
-msgid "Properties(with conflicts)"
-msgstr "Proprietà(con conflitti)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Conflitti di proprietà in attesa di essere risolti"
-
-msgid "Conflict Resolution"
-msgstr "Risoluzione conflitto"
-
msgid "{0} more..."
msgstr "{0} in più..."
@@ -5940,6 +5885,86 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Loro versione ({0} voce)"
msgstr[1] "Loro versione ({0} voci)"
+msgid "My with Their"
+msgstr "Il mio con il loro"
+
+msgid "My with Merged"
+msgstr "Il mio con l''unione"
+
+msgid "Their with Merged"
+msgstr "Il loro con l''unione"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "il ruolo {0} non partecipa nella comparazione {1}"
+
+msgid "Properties"
+msgstr "Proprietà"
+
+msgid "Tags"
+msgstr "Etichette"
+
+msgid "Nodes"
+msgstr "Nodi"
+
+msgid "Members"
+msgstr "Membri"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Non c''è alcun conflitto di etichette in attesa di risoluzione"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Etichette({0} conflitto)"
+msgstr[1] "Etichette({0} conflitti)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} conflitto di etichetta rimanente da risolvere"
+msgstr[1] "{0} conflitti di etichetta rimanenti da risolvere"
+
+msgid "Nodes(resolved)"
+msgstr "Nodi(risolti)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Lista di nodi uniti bloccata. Nella lista dei nodi di questo percorso non "
+"c''è alcun conflitto in attesa"
+
+msgid "Nodes(with conflicts)"
+msgstr "Nodi(con conflitti)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Conflitti in attesa nella lista di nodi di questo percorso"
+
+msgid "Members(resolved)"
+msgstr "Membri(risolti)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Lista dei membri uniti bloccata. Nella lista dei membri di questa relazione "
+"non c''è alcun conflitto in attesa"
+
+msgid "Members(with conflicts)"
+msgstr "Membri(con conflitti)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Conflitti in attesa nella lista di membri di questa relazione"
+
+msgid "No pending property conflicts"
+msgstr "Non c''è alcun conflitto di proprietà in attesa"
+
+msgid "Properties(with conflicts)"
+msgstr "Proprietà(con conflitti)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Conflitti di proprietà in attesa di essere risolti"
+
+msgid "Conflict Resolution"
+msgstr "Risoluzione conflitto"
+
msgid "Node"
msgstr "Nodo"
@@ -6005,10 +6030,8 @@ msgstr "Ruolo"
msgid "Primitive"
msgstr "Primitiva"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"Nodi uniti non ancora bloccati. Non è possibile costruire il comando di "
-"risoluzione"
msgid "<undefined>"
msgstr "<indefinito>"
@@ -7332,7 +7355,7 @@ msgid "Download the content of the selected changesets from the server"
msgstr "Scarica dal server il contenuto dei gruppi di modifiche selezionati"
msgid "Download changed objects"
-msgstr ""
+msgstr "Scarica oggetti modificati"
msgid ""
"Download the current version of the changed objects in the selected "
@@ -7557,62 +7580,138 @@ msgstr ""
"Seleziona solamente i gruppi di modifiche relativi ad uno specifico riquadro "
"di selezione"
-msgid "Query open changesets only"
-msgstr "Interroga solamente i gruppi di modifiche aperti"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
+msgstr ""
+"Impossibile restringere l''interrogazione sul gruppo di modifiche ad un "
+"specifico riquadro di selezione. Il valore immesso non è valido."
-msgid "Query closed changesets only"
-msgstr "Interroga solo i gruppi di modifiche che sono stati chiusi"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
+msgstr ""
+"<html>Inserire dei valori validi di longitudine/latitudine per "
+"limitare<br>l''interrogazione sui gruppi di modifiche ad uno specifico "
+"riquadro di selezione.</html>"
-msgid "Query both open and closed changesets"
-msgstr "Interroga i gruppi di modifiche aperti e chiusi"
+msgid "Invalid bounding box"
+msgstr "Riquadro di selezione non valido"
-msgid "Only changesets owned by myself"
-msgstr "Solo i miei changeset"
+msgid "Download my changesets only"
+msgstr "Scarica solamente i miei gruppi di modifiche"
-msgid "User ID:"
-msgstr "ID utente:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
+msgstr ""
+"<html>Selezionare per restringere l''interrogazione solamente ai propri "
+"gruppi di modifiche.<br>Deselezionare per includere tutti i gruppi di "
+"modifiche nell''interrogazione.</html>"
-msgid "User name:"
-msgstr "Nome utente:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
+msgstr ""
+"<html>Si prega di selezionare una delle seguenti <strong>interrogazioni "
+"standard</strong>.Selezionare <strong>Scarica solamente i miei gruppi di "
+"modifiche</strong> se si desidera scaricare solamente i propri gruppi di "
+"modifiche.<br>Si ricorda che JOSM scaricherà al massimo 100 gruppi di "
+"modifiche.</html>"
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Solo i changesets dell''utente con il seguente ID utente"
+msgid "<html>Download the latest changesets</html>"
+msgstr "<html>Scarica gli ultimi gruppi di modifiche</html>"
-msgid "Only changesets owned by the user with the following user name"
-msgstr "Solo i changeset dell''utente con il seguente user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
+msgstr ""
+"<html>Scarica i miei gruppi di modifiche aperti<br><em>Disabilitato. Si "
+"prega prima di inserire il proprio nome utente OSM nelle "
+"preferenze.</em></html>"
+
+msgid "<html>Download my open changesets</html>"
+msgstr "<html>Scarica i miei gruppi di modifiche aperti</html>"
msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-"Solo i gruppi di modifiche che mi appartengono (disabilitato. In questo "
-"momento JOSM è in esecuzione con un utente anonimo)"
+"<html>Scarica i gruppi di modifiche nella vista corrente della "
+"mappa.<br><em>Disabilitato. Al momento non c''è alcuna vista della mappa "
+"aperta.</em></html>"
+
+msgid "<html>Download changesets in the current map view</html>"
+msgstr ""
+"<html>Scarica i gruppi di modifiche nella vista corrente della mappa</html>"
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Non è possibile restringere l''interrogazione all''utente corrente perché "
-"l''attuale utente è anonimo"
+"Valore inatteso per la preferenza ''{0}'', ottenuto ''{1}''. Azzeramento con "
+"l''interrogazione predefinita."
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-"Il valore corrente ''''{0}'''' non è valido per l''identificativo utente"
+"Impossibile creare l''interrogazione del gruppo di modifiche per aprire i "
+"gruppi di modifiche dell''utente anonimo"
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr "Non è possibile restringere l''interrogazione all''utente ''{0}''"
+msgid "Basic"
+msgstr "Di base"
-msgid "Please enter a valid user ID"
-msgstr "Si prega di inserire un identificativo utente valido"
+msgid "Download changesets using predefined queries"
+msgstr ""
+"Scarica i gruppi di modifiche utilizzando delle interrogazioni predefinite"
-msgid "Invalid user ID"
-msgstr "Identificativo utente non valido"
+msgid "From URL"
+msgstr "Dall''indirizzo URL"
-msgid "Please enter a non-empty user name"
-msgstr "Si prega di inserire un nome utente non vuoto"
+msgid "Query changesets from a server URL"
+msgstr "Interroga i gruppi di modifiche da un indirizzo URL"
-msgid "Invalid user name"
-msgstr "Nome utente non valido"
+msgid "Advanced"
+msgstr "Avanzate"
+
+msgid "Use a custom changeset query"
+msgstr "Utilizza una interrogazione personalizzata sui gruppi di modifiche"
+
+msgid "Query changesets"
+msgstr "Interroga gruppi di modifiche"
+
+msgid "Query and download changesets"
+msgstr "Interroga e scarica gruppi di modifiche"
+
+msgid "Please enter a valid changeset query URL first."
+msgstr ""
+"Si prega di inserire prima un indirizzo URL valido di una interrogazione sui "
+"gruppi di modifiche."
+
+msgid "Illegal changeset query URL"
+msgstr ""
+"Indirizzo URL di una interrogazione sui gruppi di modifiche non valido"
+
+msgid "Close the dialog and abort querying of changesets"
+msgstr ""
+"Chiudi la finestra e annulla l''interrogazione sui gruppi di modifiche"
+
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Immetere una data nel formato usato dal tuo settaggio locale.<br>Esempio: "
+"{0}<br>Esempio: {1}<br>Esempio: {2}<br>Esempio: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Interroga solamente i gruppi di modifiche aperti"
+
+msgid "Query closed changesets only"
+msgstr "Interroga solo i gruppi di modifiche che sono stati chiusi"
+
+msgid "Query both open and closed changesets"
+msgstr "Interroga i gruppi di modifiche aperti e chiusi"
msgid "Date: "
msgstr "Data: "
@@ -7655,22 +7754,11 @@ msgid "Invalid date/time values"
msgstr "Valori data/ora non validi"
msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
-msgstr ""
-"Impossibile restringere l''interrogazione sul gruppo di modifiche ad un "
-"specifico riquadro di selezione. Il valore immesso non è valido."
-
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-"<html>Inserire dei valori validi di longitudine/latitudine per "
-"limitare<br>l''interrogazione sui gruppi di modifiche ad uno specifico "
-"riquadro di selezione.</html>"
-
-msgid "Invalid bounding box"
-msgstr "Riquadro di selezione non valido"
+"Si prega di inserire un''ora valida nel proprio formato locale.<br>Esempio: "
+"{0}<br>Esempio: {1}<br>Esempio: {2}<br>Esempio: {3}<br>"
msgid ""
"The current value is not a valid user ID. Please enter an integer value > 0"
@@ -7681,141 +7769,76 @@ msgstr ""
msgid "Please enter an integer value > 0"
msgstr "Inserire un valore intero > 0"
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Immetere una data nel formato usato dal tuo settaggio locale.<br>Esempio: "
-"{0}<br>Esempio: {1}<br>Esempio: {2}<br>Esempio: {3}<br>"
+msgid "URL: "
+msgstr "Indirizzo URL: "
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-"Si prega di inserire un''ora valida nel proprio formato locale.<br>Esempio: "
-"{0}<br>Esempio: {1}<br>Esempio: {2}<br>Esempio: {3}<br>"
+"Si prega di inserire o incollare un indirizzo URL per ottenere i gruppi di "
+"modifiche dalle API di OSM."
-msgid "Download my changesets only"
-msgstr "Scarica solamente i miei gruppi di modifiche"
+msgid "Examples"
+msgstr "Esempi"
msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-"<html>Selezionare per restringere l''interrogazione solamente ai propri "
-"gruppi di modifiche.<br>Deselezionare per includere tutti i gruppi di "
-"modifiche nell''interrogazione.</html>"
+"Nota che le interrogazioni sui gruppi di modifiche sono attualmente inviate "
+"sempre verso ''''{0}'''', indipendentemente dall''indirizzo URL inserito di "
+"seguito."
-msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+msgid "This changeset query URL is invalid"
msgstr ""
-"<html>Si prega di selezionare una delle seguenti <strong>interrogazioni "
-"standard</strong>.Selezionare <strong>Scarica solamente i miei gruppi di "
-"modifiche</strong> se si desidera scaricare solamente i propri gruppi di "
-"modifiche.<br>Si ricorda che JOSM scaricherà al massimo 100 gruppi di "
-"modifiche.</html>"
+"L’indirizzo URL per l’interrogazione sui gruppi di modifiche non è valido"
-msgid "<html>Download the latest changesets</html>"
-msgstr "<html>Scarica gli ultimi gruppi di modifiche</html>"
+msgid "Only changesets owned by myself"
+msgstr "Solo i miei changeset"
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
-msgstr ""
-"<html>Scarica i miei gruppi di modifiche aperti<br><em>Disabilitato. Si "
-"prega prima di inserire il proprio nome utente OSM nelle "
-"preferenze.</em></html>"
+msgid "User ID:"
+msgstr "ID utente:"
-msgid "<html>Download my open changesets</html>"
-msgstr "<html>Scarica i miei gruppi di modifiche aperti</html>"
+msgid "User name:"
+msgstr "Nome utente:"
-msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
-msgstr ""
-"<html>Scarica i gruppi di modifiche nella vista corrente della "
-"mappa.<br><em>Disabilitato. Al momento non c''è alcuna vista della mappa "
-"aperta.</em></html>"
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Solo i changesets dell''utente con il seguente ID utente"
-msgid "<html>Download changesets in the current map view</html>"
-msgstr ""
-"<html>Scarica i gruppi di modifiche nella vista corrente della mappa</html>"
+msgid "Only changesets owned by the user with the following user name"
+msgstr "Solo i changeset dell''utente con il seguente user name"
msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
-msgstr ""
-"Valore inatteso per la preferenza ''{0}'', ottenuto ''{1}''. Azzeramento con "
-"l''interrogazione predefinita."
-
-msgid "Cannot create changeset query for open changesets of anonymous user"
-msgstr ""
-"Impossibile creare l''interrogazione del gruppo di modifiche per aprire i "
-"gruppi di modifiche dell''utente anonimo"
-
-msgid "Basic"
-msgstr "Di base"
-
-msgid "Download changesets using predefined queries"
-msgstr ""
-"Scarica i gruppi di modifiche utilizzando delle interrogazioni predefinite"
-
-msgid "From URL"
-msgstr "Dall''indirizzo URL"
-
-msgid "Query changesets from a server URL"
-msgstr "Interroga i gruppi di modifiche da un indirizzo URL"
-
-msgid "Advanced"
-msgstr "Avanzate"
-
-msgid "Use a custom changeset query"
-msgstr "Utilizza una interrogazione personalizzata sui gruppi di modifiche"
-
-msgid "Query changesets"
-msgstr "Interroga gruppi di modifiche"
-
-msgid "Query and download changesets"
-msgstr "Interroga e scarica gruppi di modifiche"
-
-msgid "Please enter a valid changeset query URL first."
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-"Si prega di inserire prima un indirizzo URL valido di una interrogazione sui "
-"gruppi di modifiche."
+"Solo i gruppi di modifiche che mi appartengono (disabilitato. In questo "
+"momento JOSM è in esecuzione con un utente anonimo)"
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-"Indirizzo URL di una interrogazione sui gruppi di modifiche non valido"
+"Non è possibile restringere l''interrogazione all''utente corrente perché "
+"l''attuale utente è anonimo"
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-"Chiudi la finestra e annulla l''interrogazione sui gruppi di modifiche"
+"Il valore corrente ''''{0}'''' non è valido per l''identificativo utente"
-msgid "URL: "
-msgstr "Indirizzo URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr "Non è possibile restringere l''interrogazione all''utente ''{0}''"
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
-msgstr ""
-"Si prega di inserire o incollare un indirizzo URL per ottenere i gruppi di "
-"modifiche dalle API di OSM."
+msgid "Please enter a valid user ID"
+msgstr "Si prega di inserire un identificativo utente valido"
-msgid "Examples"
-msgstr "Esempi"
+msgid "Invalid user ID"
+msgstr "Identificativo utente non valido"
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
-msgstr ""
-"Nota che le interrogazioni sui gruppi di modifiche sono attualmente inviate "
-"sempre verso ''''{0}'''', indipendentemente dall''indirizzo URL inserito di "
-"seguito."
+msgid "Please enter a non-empty user name"
+msgstr "Si prega di inserire un nome utente non vuoto"
-msgid "This changeset query URL is invalid"
-msgstr ""
-"L’indirizzo URL per l’interrogazione sui gruppi di modifiche non è valido"
+msgid "Invalid user name"
+msgstr "Nome utente non valido"
msgid "Activate"
msgstr "Attiva"
@@ -8135,7 +8158,7 @@ msgid "Ignore tag ''{0}''"
msgstr "Ignora il tag ''{0}''"
msgid "Edit ignore list"
-msgstr ""
+msgstr "Modifica lista oggetti ignorati"
msgid "You changed the value of ''{0}'' from ''{1}'' to ''{2}''."
msgstr "E'' stato modificato il valore di ''{0}'' da ''{1}'' a ''{2}''."
@@ -9040,6 +9063,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9503,7 +9529,7 @@ msgid "Exit JOSM without saving. Unsaved changes are lost."
msgstr "Esci da JOSM senza salvare. Le modifiche non salvate saranno perse."
msgid "Restart now!"
-msgstr ""
+msgstr "È necessario riavviare!"
msgid "Restart JOSM without saving. Unsaved changes are lost."
msgstr ""
@@ -10183,8 +10209,8 @@ msgstr "Salva livello"
msgid "{0} note"
msgid_plural "{0} notes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} note"
+msgstr[1] "{0} note"
msgid "Notes layer"
msgstr "Livello note"
@@ -10737,6 +10763,9 @@ msgstr "Direzione"
msgid "Velocity, {0}"
msgstr "Velocità, {0}"
+msgid "Wave Audio files (*.wav)"
+msgstr "Files audio Wave (*.wav)"
+
msgid "Import Audio"
msgstr "Importa l''audio"
@@ -10752,9 +10781,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Importazione non possibile"
-msgid "Wave Audio files (*.wav)"
-msgstr "Files audio Wave (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Contrassegni audio da {0}"
@@ -10864,16 +10890,6 @@ msgstr "(URL: "
msgid "Select the map painting styles"
msgstr "Seleziona gli stili di disegno della mappa"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-"Fallito il caricamento degli stili Mappaint da ''{0}''. L''eccezione è "
-"stata: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr "caricamento dello stile ''{0}'' in corso..."
@@ -10892,6 +10908,11 @@ msgstr[1] ""
"Selezionare ''Informazioni'' dal menu contestuale (tasto destro del mouse) "
"per i dettagli."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+"Fallito il caricamento degli stili Mappaint da ''{0}''. L''eccezione è "
+"stata: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
"Fallita l''analisi degli stili Mappaint da ''{0}''. L''errore è stato: {1}"
@@ -10974,9 +10995,9 @@ msgid ""
"fully<br>automatically authorizes the user and retrieves an Access "
"Token.</html>"
msgstr ""
-"<html>Lanciare una procedeura automatica per ottenere un gettone di accesso "
-"dal sito OSM.<br>JOSM accede al sito OSM a nome dell’utente di JOSM e in "
-"modo<br>automatico autorizza l’utente e recupera un gettone d’accesso.</html>"
+"<html>Lanciare una procedura automatica per ottenere un token di accesso dal "
+"sito OSM.<br>JOSM accede al sito OSM a nome dell’utente di JOSM e in "
+"modo<br>automatico autorizza l’utente e recupera il token.</html>"
msgid ""
"<html>Run a semi-automatic procedure to get an access token from the OSM "
@@ -12051,6 +12072,9 @@ msgstr ""
msgid "Track date"
msgstr "data del tracciato"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Singolo colore (può essere personalizzato per i livelli con nome)"
@@ -12063,6 +12087,18 @@ msgstr "Bicicletta"
msgid "Foot"
msgstr "Pedone"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Bosco"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Crea contrassegni durante la lettura GPX"
@@ -12075,6 +12111,9 @@ msgstr "Intervallo di colore dinamico basato sui limiti dei dati"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Smussa la grafica GPX (antialiasing)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -12146,6 +12185,11 @@ msgstr ""
"Applica l''antialiasing alle linee GPX in modo da smussarne l''aspetto."
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -12170,11 +12214,18 @@ msgid "Colors points and track segments by its timestamp."
msgstr ""
"Colora i punti ed i segmenti del tracciato in base alla sua marca temporale."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
"Permette di regolare la colorazione dei tracciati in base a differenti "
"velocità medie."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Colorazione del tracciato e del punto"
@@ -13523,6 +13574,12 @@ msgstr "Ricerca gli errori sugli oggetti di culto"
msgid "Checks for errors on relations"
msgstr "Ricerca gli errori sulle relazioni"
+msgid "Territories"
+msgstr "Territori"
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr "Etichette non necessarie"
@@ -14705,6 +14762,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Salva nome utente e password (non cifrata)"
+msgid "Assume"
+msgstr "Deduci"
+
+msgid "Existing values"
+msgstr "Valori esistenti"
+
msgid "<delete from {0} objects>"
msgstr "<elimina da {0} oggetti>"
@@ -14726,12 +14789,6 @@ msgstr "Aggiungi le etichette spuntate agli oggetti selezionati"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Invio: Aggiungi tutte le etichette agli oggetti selezionati"
-msgid "Assume"
-msgstr "Deduci"
-
-msgid "Existing values"
-msgstr "Valori esistenti"
-
msgid "Enable the checkbox to accept the value"
msgstr "Abilitare la casella di spunta per accettare il valore"
@@ -15210,7 +15267,7 @@ msgstr[0] "L’estensione non sarà caricata."
msgstr[1] "Le estensioni non saranno caricate."
msgid "Determining plugins to load..."
-msgstr ""
+msgstr "Determinazione in corso dei plugin necessari..."
msgid "Removing deprecated plugins..."
msgstr "Rimozione delle estensioni deprecate..."
@@ -15954,6 +16011,9 @@ msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
"Conflitto silente sulla scorciatoia: ''{0}'' spostato da ''{1}'' a ''{2}''."
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "È stato trovato {0} etichetta nel buffer, ciò è sospetto!"
@@ -16474,14 +16534,17 @@ msgstr "Mapbox Satellite"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr "OpenSeaMap"
-msgid "OpenStreetMap Carto (Standard layer)"
-msgstr "OpenStreetMap Carto (livello Standard)"
+msgid "OpenStreetMap Carto (Standard)"
+msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik Bianco & Nero)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, senza etichette)"
@@ -16504,8 +16567,11 @@ msgstr "Hike & Bike"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Cambodia, Laos, Thailand, Vietnam bilingua"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (sovrapposta)"
@@ -16555,8 +16621,8 @@ msgstr "OSM Inspector: Luoghi"
msgid "OSM Inspector: Highways"
msgstr "OSM Inspector: Highways"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM Inspector: Multipoligono"
+msgid "OSM Inspector: Area"
+msgstr ""
msgid "OSM Inspector: Routing"
msgstr "OSM Inspector: Routing"
@@ -16564,10 +16630,22 @@ msgstr "OSM Inspector: Routing"
msgid "OSM Inspector: Addresses"
msgstr "OSM Inspector: Indirizzi"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -16603,6 +16681,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -16648,10 +16732,16 @@ msgstr "VoGIS: Piano di destinazione del terreno"
msgid "VoGIS: Höhen und Gelände"
msgstr "VoGIS: Höhen und Gelände"
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -16687,7 +16777,16 @@ msgstr ""
msgid "TEC bus lines (2014)"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
msgstr ""
msgid "IBGE Mapa de Setores Urbanos"
@@ -16696,6 +16795,15 @@ msgstr "IBGE Mappa dei Settori Urbani"
msgid "IBGE Mapa de Setores Rurais"
msgstr "IBGE Mappa dei Settori Rurali"
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Idrografia Geobase"
@@ -16708,12 +16816,34 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "Mosaico British Columbia"
+msgid "Latest southwest British Columbia Landsat"
+msgstr ""
+
msgid "Kelowna 2012"
msgstr "Kelowna 2012"
msgid "Kelowna Roads overlay"
msgstr "Kelowna strade in sovraimpressione"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr ""
+
msgid "Czech CUZK:KM"
msgstr "Rep. Ceca CUZK:KM"
@@ -16750,6 +16880,12 @@ msgstr "Stevns (Danimarca)"
msgid "Vejmidte (Denmark)"
msgstr "Vejmidte (Danimarca)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Estonia Basemap (Maaamet)"
@@ -16783,9 +16919,6 @@ msgstr "Catasto"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr "CRAIG - Auvergne 2013 - 25 cm"
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Alpei-Marittime 2009 - 40 cm"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "OrtoFoto GrandNancy 2012"
@@ -16843,9 +16976,6 @@ msgid ""
msgstr ""
"Vercors - Riserva naturale degli Altipiani di Vercors - Ortofoto 1999 - 1 m"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Lingue Sorabe)"
-
msgid "Hamburg (40 cm)"
msgstr "Amburgo (40 cm)"
@@ -16873,9 +17003,6 @@ msgstr "Foto aeree Berlino 2015"
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr "Stoccarda (immagini aeree)"
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16909,9 +17036,54 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Antenne (10 cm)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Drone Imagery (Haiti)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone Imagery 2014 (Haiti)"
@@ -16948,19 +17120,28 @@ msgstr "Alluvine del Danubio ortofoto 2013"
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -17023,9 +17204,21 @@ msgstr "PCN 2012 - Italia"
msgid "South Tyrol Orthofoto 2011"
msgstr "Alto Adige Ortofoto 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr "Topomap Alto Adige"
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "USSR - Lettonia"
@@ -17059,12 +17252,34 @@ msgstr "Delta del Niger Ott 2012 Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard -Orthofoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Gaza Strip - Pléiades - 2014/07/06"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
@@ -17191,9 +17406,6 @@ msgstr "Świętochłowice: Ortofotomapa 2012 (Immagine Aerea)"
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Zabrze: Ortofotomapa 2011 (aerial image)"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Szlaki (paths)"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -17203,6 +17415,20 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Car"
@@ -17224,12 +17450,30 @@ msgstr "RABA-KGZ: Slovenia uso terreno agricolo"
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr "RABA-KGZ: Slovenia aree edificate"
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr "South Africa CD:NGI Aerial"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr "Catastro Spain"
@@ -17251,6 +17495,9 @@ msgstr "IDEIB - Balearic Islands"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Canary Islands"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Kanton Aargau 25cm (AGIS 2011)"
@@ -17293,6 +17540,9 @@ msgstr "Canton de Fribourg 50cm (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Stadt Bern 10cm/25cm (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -17314,6 +17564,12 @@ msgstr "Bonvillars Orthophoto 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Fiez Orthophoto 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr "Taiwan e-Map Open Data"
@@ -17329,6 +17585,9 @@ msgstr "Taiwan Land-Section Data"
msgid "NLSC Open Data WMTS"
msgstr "NLSC Open Data WMTS"
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "MSR Maps Topo"
@@ -17356,9 +17615,54 @@ msgstr "NC Latest Orthoimagery"
msgid "U.S. Forest Service roads"
msgstr "U.S. Forest Service strade"
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ukraine - Orthophotomaps 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -17380,9 +17684,6 @@ msgstr "Surrey Air Survey"
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Scotland 1842-82"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -17392,9 +17693,6 @@ msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25k historic (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "OS 1:25k historic (OSM-Limited)"
@@ -17728,8 +18026,8 @@ msgstr "Scarica nuovi dati quando usi sposta/zoom"
msgid "Create a grid of ways."
msgstr "Crea un reticolo di ways"
-msgid "Customization of public transport stops."
-msgstr "Personalizzazione delle fermate del trasporto pubblico."
+msgid "Customization of public public transport stops."
+msgstr ""
msgid ""
"Creating and handling address nodes and buildings within Czech Republic."
@@ -17837,6 +18135,9 @@ msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
"Genera confini del file XML delle immagini aeree da un multi poligono"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -20356,6 +20657,9 @@ msgstr "Torrente"
msgid "River"
msgstr "Fiume"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Canale"
@@ -21413,6 +21717,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr "Pensione/Bed & Breakfast"
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Casetta (chalet)"
@@ -21479,6 +21789,12 @@ msgstr "Outdoor seating"
msgid "Takeaway"
msgstr "Per asporto"
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast food"
@@ -22423,31 +22739,19 @@ msgstr "osservazione fauna"
msgid "Hunting Stand"
msgstr "Postazione di caccia"
-msgid "Height"
-msgstr "Modifica Albero"
-
-msgctxt "height"
-msgid "low"
-msgstr "bassa"
-
-msgctxt "height"
-msgid "half"
-msgstr "piccola"
-
-msgctxt "height"
-msgid "full"
-msgstr "alta"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
-msgstr "Blocco"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr "Aria compressa"
@@ -23039,6 +23343,10 @@ msgid "hut"
msgstr "rifugio"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr "dormitorio"
@@ -24335,6 +24643,9 @@ msgstr "Macellaio"
msgid "Seafood"
msgstr "Pescheria"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Cibi e bevande pregiate"
@@ -25152,9 +25463,6 @@ msgstr "Fila di alberi"
msgid "A line of trees."
msgstr "un filare di alberi"
-msgid "Wood"
-msgstr "Bosco"
-
msgid "Woodland where timber production does not dominate use."
msgstr "Bosco la cui funzione prevalente non è la produzione di legname."
@@ -26217,6 +26525,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0} è deprecata"
@@ -26320,6 +26631,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} in un nodo. Dovrebbe essere usato in un tracciato."
@@ -26396,6 +26713,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} dovrebbe essere sul nodo dove {1} e {2} si incontrano"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "nome abbreviato della strada"
@@ -26420,6 +26742,9 @@ msgstr "{0} utilizzato con {1}"
msgid "street name contains ss"
msgstr "nome di strada contenente ss"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -27237,6 +27562,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr "Carica foto"
@@ -27279,8 +27614,8 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
-msgstr "Invia"
+msgid "Submitting changeset to server…"
+msgstr ""
msgid "Export all images"
msgstr "Esporta tutte le immagini"
@@ -28203,6 +28538,9 @@ msgstr "Selezionare un''area (es. edificio) da da un''immagine sottostante."
msgid "Area Selector"
msgstr "Selettore di area"
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr "Area creata"
@@ -28251,11 +28589,9 @@ msgid "Algorithm"
msgstr "Algoritmo"
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
-"Numero massimo di pixel un punto può essere lontano da una linea e ancora "
-"considerato come un membro di questa linea (Predefinito: {0})."
msgid "Distance Tolerance"
msgstr "Tolleranza Distanza"
@@ -29990,6 +30326,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Apri file XML delle immagini aeree"
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr "Livello di calibrazione"
@@ -32316,9 +32711,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -32478,9 +32870,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr "[lacuna]"
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "Modelli di itinerario ..."
@@ -32538,6 +32927,9 @@ msgstr "lato sinistro"
msgid "Maximum distance from route"
msgstr "Distanza massima dall''itinerario"
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "Trasporto pubblico: modifica tipo fermata"
@@ -32742,11 +33134,6 @@ msgstr "Ricostruisci poligono"
msgid "Multipolygon must consist only of ways"
msgstr "Un multi-poligono deve consistere solamente in percorsi"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-"La ricostruzione dei poligoni può essere fatta solamente partendo dai "
-"percorsi esterni"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Ricostruisci poligoni dalla relazione {0}"
diff --git a/i18n/po/ja.po b/i18n/po/ja.po
index 6869555..a1bb348 100644
--- a/i18n/po/ja.po
+++ b/i18n/po/ja.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-06 22:51+0100\n"
-"PO-Revision-Date: 2016-09-27 05:38+0000\n"
-"Last-Translator: fujimoto <fujimoto at internet.ne.jp>\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
+"PO-Revision-Date: 2016-12-30 03:12+0000\n"
+"Last-Translator: Tom Konda <tomohiro.konda at gmail.com>\n"
"Language-Team: Japanese <tr at openstreetmap.jp>\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: 2016-11-07 04:53+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:57+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"X-Poedit-Country: JAPAN\n"
"Language: ja\n"
"X-Poedit-Language: Japanese\n"
@@ -70,9 +70,15 @@ msgstr "メインメニュー作成中"
msgid "Help"
msgstr "ヘルプ"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "OSM APIを初期化中"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "妥当性検査を初期化中"
@@ -206,6 +212,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr "地図上の選択した要素を、上記リストの選択したアイテムに設定します。"
+msgid "Select WMS layers"
+msgstr "WMSレイヤーを選択"
+
+msgid "Add layers"
+msgstr "レイヤーを追加"
+
msgid "Add imagery layer {0}"
msgstr "画像レイヤー {0} を追加"
@@ -227,12 +239,6 @@ msgstr "エラー"
msgid "Select image format for WMS layer"
msgstr "WMSレイヤーの画像形式を選択してください"
-msgid "Select WMS layers"
-msgstr "WMSレイヤーを選択"
-
-msgid "Add layers"
-msgstr "レイヤーを追加"
-
msgid "Add Node..."
msgstr "ノードを追加..."
@@ -716,6 +722,9 @@ msgstr "座標へのジャンプ"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "特定の場所へジャンプできるダイアログを開始"
+msgid "Jump to Position"
+msgstr "ジャンプ先は"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "移動する位置の緯度経度を入力"
@@ -737,9 +746,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "そこへジャンプ"
-msgid "Jump to Position"
-msgstr "ジャンプ先は"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr "緯度、経度、ズームを解析することができませんでした。確認をしてください。"
@@ -790,6 +796,9 @@ msgstr "レイヤーを結合"
msgid "Merge the current layer into another layer"
msgstr "現在のレイヤーを他のレイヤーに結合"
+msgid "{0} completed in {1}"
+msgstr "{0}が{1}で完了しました"
+
msgid "Merging layers with different upload policies"
msgstr "異なるアップロードポリシーのレイヤーを結合"
@@ -943,24 +952,30 @@ msgstr[0] "{0}件のファイルを開いています..."
msgid "Opening file ''{0}'' ..."
msgstr "ファイル ''{0}''を開いています ..."
+msgid "Which tasks to perform?"
+msgstr "どちらのタスクを実行しますか？"
+
+msgid "Ok"
+msgstr "OK"
+
msgid "Open Location..."
msgstr "場所を開く..."
msgid "Open an URL."
msgstr "URL を開く。"
-msgid "Separate Layer"
-msgstr "新規レイヤーを作成"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "新しいレイヤーにデータをダウンロードするなら選択"
-
msgid "Enter URL to download:"
msgstr "ダウンロードするURL:"
msgid "Enter an URL from where data should be downloaded"
msgstr "データダウンロード先のURLを入力"
+msgid "Separate Layer"
+msgstr "新規レイヤーを作成"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "新しいレイヤーにデータをダウンロードするなら選択"
+
msgid "Download Location"
msgstr "ダウンロード先"
@@ -976,12 +991,6 @@ msgstr "ダイアログを閉じてダウンロードをキャンセル"
msgid "Download Data"
msgstr "データをダウンロード"
-msgid "Which tasks to perform?"
-msgstr "どちらのタスクを実行しますか？"
-
-msgid "Ok"
-msgstr "OK"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1783,9 +1792,6 @@ msgstr "変更セットをクエリー及びダウンロード..."
msgid "Errors during download"
msgstr "ダウンロード中にエラー"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr "GPSをダウンロード"
@@ -3631,13 +3637,13 @@ msgid "error in initialization"
msgstr "初期化時のエラー"
msgid "Polar Stereographic"
-msgstr ""
+msgstr "極平射図法"
msgid "Polar Stereographic: Parameter ''{0}'' must be 90 or -90."
-msgstr ""
+msgstr "極平射図法: 引数 ''{0}'' は90または-90でなければなりません。"
msgid "Sinusoidal"
-msgstr ""
+msgstr "サンソン図法"
msgid "Swiss Oblique Mercator"
msgstr "スイス斜軸メルカトル図法"
@@ -3762,7 +3768,7 @@ msgid "Reversed coastline"
msgstr "反転された海岸線"
msgid "invalid coastline"
-msgstr ""
+msgstr "無効な海岸線"
msgid "Conditional Keys"
msgstr "条件付きキー"
@@ -3801,10 +3807,10 @@ msgid "Crossing barriers"
msgstr "交差している柵"
msgid "Self crossing"
-msgstr ""
+msgstr "自分自身が交差しているもの"
msgid "Self-crossing ways"
-msgstr ""
+msgstr "自分自身が交差しているウェイ"
msgid ""
"This test checks if two roads, railways, waterways or buildings crosses in "
@@ -3980,9 +3986,6 @@ msgstr "エリアスタイルウェイが閉じられていません"
msgid "No outer way for multipolygon"
msgstr "マルチポリゴンに外側のウェイがありません"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "''{0}''のロールは''{1}''であるべきです"
-
msgid "No area style for multipolygon"
msgstr "マルチポリゴンのエリアスタイルがありません"
@@ -4011,12 +4014,27 @@ msgstr "outerウェイにエリアスタイルがあります"
msgid "Multipolygon is not closed"
msgstr "マルチポリゴンが閉じられていません"
-msgid "Multipolygon inner way is outside"
-msgstr "マルチポリゴンの内部ウェイが外側にあります"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "マルチポリゴンウェイ間の交差"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "''{0}''のロールは''{1}''であるべきです"
+
+msgid "Multipolygon inner way is outside"
+msgstr "マルチポリゴンの内部ウェイが外側にあります"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "マルチポリゴンメンバのための有用なロールがない"
@@ -4710,12 +4728,18 @@ msgstr "指定されたリソースへのアクセスを無効化、コンマ区
msgid "options provided as Java system properties"
msgstr "Javaシステムのプロパティとして提供されるオプション"
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/PATH/TO/JOSM/PREF "
msgid "Set the preferences directory"
msgstr "設定ディレクトリを設定"
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/PATH/TO/JOSM/USERDATA"
@@ -4732,9 +4756,9 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/PATH/TO/JOSM/HOMEDIR "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
-msgstr "全3件のディレクトリをhomedirに移動しました。キャッシュディレクトリはhomedir/cacheになります"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
+msgstr ""
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5058,9 +5082,6 @@ msgstr "バックグラウンドでジョブを動かすためにクリック"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0}が{1}で完了しました"
-
msgid "Enlarge"
msgstr "拡大"
@@ -5199,80 +5220,6 @@ msgstr "競合: メンバーを削除の背景色"
msgid "Conflict foreground: remove member"
msgstr "競合: メンバーを削除の前景色"
-msgid "My with Their"
-msgstr "自分と相手"
-
-msgid "My with Merged"
-msgstr "自分と統合版"
-
-msgid "Their with Merged"
-msgstr "相手と統合版"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "ロール {0} は比較ペア {1} に参加していません"
-
-msgid "Properties"
-msgstr "プロパティ"
-
-msgid "Tags"
-msgstr "タグ"
-
-msgid "Nodes"
-msgstr "ノード"
-
-msgid "Members"
-msgstr "メンバー"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "解決が必要な保留中のタグ競合はありません"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "タグ({0}件の競合)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "解決すべき保留されたタグの競合が{0}件あります"
-
-msgid "Nodes(resolved)"
-msgstr "ノード(解決済み)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr "結合されたノードリストを固定しました。このウェイのノードリストには保留中の競合はありません。"
-
-msgid "Nodes(with conflicts)"
-msgstr "ノード(競合あり)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "このウェイのノードリストにある保留中の競合"
-
-msgid "Members(resolved)"
-msgstr "メンバー(解決済み)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr "結合されたメンバーリストを固定しました。このリレーションのメンバーリストには保留中の競合はありません。"
-
-msgid "Members(with conflicts)"
-msgstr "メンバー(競合あり)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "このリレーションのメンバーリストにある保留中の競合"
-
-msgid "No pending property conflicts"
-msgstr "保留中のプロパティの競合はありません"
-
-msgid "Properties(with conflicts)"
-msgstr "プロパティ(競合あり)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "解決が必要なプロパティの保留中の競合"
-
-msgid "Conflict Resolution"
-msgstr "競合の解決"
-
msgid "{0} more..."
msgstr "さらに {0} 個..."
@@ -5435,6 +5382,80 @@ msgid "Their version ({0} entry)"
msgid_plural "Their version ({0} entries)"
msgstr[0] "相手のバージョン({0}項目)"
+msgid "My with Their"
+msgstr "自分と相手"
+
+msgid "My with Merged"
+msgstr "自分と統合版"
+
+msgid "Their with Merged"
+msgstr "相手と統合版"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "ロール {0} は比較ペア {1} に参加していません"
+
+msgid "Properties"
+msgstr "プロパティ"
+
+msgid "Tags"
+msgstr "タグ"
+
+msgid "Nodes"
+msgstr "ノード"
+
+msgid "Members"
+msgstr "メンバー"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "解決が必要な保留中のタグ競合はありません"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "タグ({0}件の競合)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "解決すべき保留されたタグの競合が{0}件あります"
+
+msgid "Nodes(resolved)"
+msgstr "ノード(解決済み)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr "結合されたノードリストを固定しました。このウェイのノードリストには保留中の競合はありません。"
+
+msgid "Nodes(with conflicts)"
+msgstr "ノード(競合あり)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "このウェイのノードリストにある保留中の競合"
+
+msgid "Members(resolved)"
+msgstr "メンバー(解決済み)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr "結合されたメンバーリストを固定しました。このリレーションのメンバーリストには保留中の競合はありません。"
+
+msgid "Members(with conflicts)"
+msgstr "メンバー(競合あり)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "このリレーションのメンバーリストにある保留中の競合"
+
+msgid "No pending property conflicts"
+msgstr "保留中のプロパティの競合はありません"
+
+msgid "Properties(with conflicts)"
+msgstr "プロパティ(競合あり)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "解決が必要なプロパティの保留中の競合"
+
+msgid "Conflict Resolution"
+msgstr "競合の解決"
+
msgid "Node"
msgstr "ノード"
@@ -5494,8 +5515,8 @@ msgstr "役割"
msgid "Primitive"
msgstr "プリミティブ"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
-msgstr "結合したノードはまだ固定されていません。解決コマンドをビルドできません"
+msgid "Merged members not frozen yet. Cannot build resolution command"
+msgstr ""
msgid "<undefined>"
msgstr "<未定義>"
@@ -6906,122 +6927,18 @@ msgstr "変更セットの作成もしくは保存日時によって選択"
msgid "Select only changesets related to a specific bounding box"
msgstr "指定した矩形範囲に関連する変更セットのみを選択"
-msgid "Query open changesets only"
-msgstr "開いている変更セットだけを問い合わせる"
-
-msgid "Query closed changesets only"
-msgstr "閉じている変更セットだけを問い合わせる"
-
-msgid "Query both open and closed changesets"
-msgstr "開いている及び閉じている変更セットを両方問い合わせる"
-
-msgid "Only changesets owned by myself"
-msgstr "自分が所有する変更セットのみ"
-
-msgid "User ID:"
-msgstr "ユーザー ID:"
-
-msgid "User name:"
-msgstr "ユーザー名:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "次のユーザーIDのユーザーが所有する変更セットのみ"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "次のユーザー名のユーザーが所有する変更セットのみ"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr "自分自身で所有している変更セットのみ(無効。JOSMは現在匿名ユーザーで実行中)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr "現在匿名ユーザーで編集しているため、変更セットのクエリを制限できません。"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "ユーザーID ''{0}'' は不正な値です。"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr "ユーザー名 ''{0}'' への変更セットクエリは制限できません"
-
-msgid "Please enter a valid user ID"
-msgstr "有効なユーザーIDを入力してください"
-
-msgid "Invalid user ID"
-msgstr "ユーザーIDが無効です"
-
-msgid "Please enter a non-empty user name"
-msgstr "ユーザー名には空白以外を指定してください"
-
-msgid "Invalid user name"
-msgstr "ユーザー名が無効です"
-
-msgid "Date: "
-msgstr "日付: "
-
-msgid "Time:"
-msgstr "時間:"
-
-msgid "Closed after - "
-msgstr "つぎを実行後閉じる： "
-
-msgid "Date:"
-msgstr "日付:"
-
-msgid "Created before - "
-msgstr "次の実行前に作成： "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "次の日付/時刻以降に閉じられた変更セットのみ"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr "変更セットは作成日より前の日時では保存できません。"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr "入力に間違いはありませんが、時間に基づいた変更セットクエリは生成できません。"
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr "<html>検索する時間帯を指定する際には、正しい日付・時間を<br>入力してください。</html>"
-
-msgid "Invalid date/time values"
-msgstr "不正な日付や時刻の値です"
-
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
"invalid."
msgstr "矩形範囲を指定した変更セットの検索ができません。入力値が不正です。"
msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
-msgstr "<html>矩形範囲を指定して変更セットを検索するには、<br>正しい緯度・経度を入力してください。</html>"
-
-msgid "Invalid bounding box"
-msgstr "不正な矩形範囲指定"
-
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr "不正なユーザーIDが入力されています。1以上の整数を入力してください。"
-
-msgid "Please enter an integer value > 0"
-msgstr "1以上の整数を入力してください。"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr "普段使用する日付の書式で記入してください。br>例: {0}<br>例: {1}<br>例: {2}<br>例: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"指定されたフォーマットで正しい時刻を入力してください。<br>例： {0} <br>例：{1} <br>例: {2} <br>例: {3} <br>"
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
+msgstr "<html>矩形範囲を指定して変更セットを検索するには、<br>正しい緯度・経度を入力してください。</html>"
+
+msgid "Invalid bounding box"
+msgstr "不正な矩形範囲指定"
msgid "Download my changesets only"
msgstr "自分の変更した変更セットだけダウンロード"
@@ -7105,6 +7022,67 @@ msgstr "不正な変更セットクエリーURLです"
msgid "Close the dialog and abort querying of changesets"
msgstr "ダイアログを閉じて変更セットのクエリを終了します"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr "普段使用する日付の書式で記入してください。br>例: {0}<br>例: {1}<br>例: {2}<br>例: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "開いている変更セットだけを問い合わせる"
+
+msgid "Query closed changesets only"
+msgstr "閉じている変更セットだけを問い合わせる"
+
+msgid "Query both open and closed changesets"
+msgstr "開いている及び閉じている変更セットを両方問い合わせる"
+
+msgid "Date: "
+msgstr "日付: "
+
+msgid "Time:"
+msgstr "時間:"
+
+msgid "Closed after - "
+msgstr "つぎを実行後閉じる： "
+
+msgid "Date:"
+msgstr "日付:"
+
+msgid "Created before - "
+msgstr "次の実行前に作成： "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "次の日付/時刻以降に閉じられた変更セットのみ"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr "変更セットは作成日より前の日時では保存できません。"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr "入力に間違いはありませんが、時間に基づいた変更セットクエリは生成できません。"
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr "<html>検索する時間帯を指定する際には、正しい日付・時間を<br>入力してください。</html>"
+
+msgid "Invalid date/time values"
+msgstr "不正な日付や時刻の値です"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"指定されたフォーマットで正しい時刻を入力してください。<br>例： {0} <br>例：{1} <br>例: {2} <br>例: {3} <br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr "不正なユーザーIDが入力されています。1以上の整数を入力してください。"
+
+msgid "Please enter an integer value > 0"
+msgstr "1以上の整数を入力してください。"
+
msgid "URL: "
msgstr "URL: "
@@ -7122,6 +7100,49 @@ msgstr "変更セットクエリは現状では常に ''{0}'' に投稿されま
msgid "This changeset query URL is invalid"
msgstr "この変更セットクエリURLは不正です"
+msgid "Only changesets owned by myself"
+msgstr "自分が所有する変更セットのみ"
+
+msgid "User ID:"
+msgstr "ユーザー ID:"
+
+msgid "User name:"
+msgstr "ユーザー名:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "次のユーザーIDのユーザーが所有する変更セットのみ"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "次のユーザー名のユーザーが所有する変更セットのみ"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr "自分自身で所有している変更セットのみ(無効。JOSMは現在匿名ユーザーで実行中)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr "現在匿名ユーザーで編集しているため、変更セットのクエリを制限できません。"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "ユーザーID ''{0}'' は不正な値です。"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr "ユーザー名 ''{0}'' への変更セットクエリは制限できません"
+
+msgid "Please enter a valid user ID"
+msgstr "有効なユーザーIDを入力してください"
+
+msgid "Invalid user ID"
+msgstr "ユーザーIDが無効です"
+
+msgid "Please enter a non-empty user name"
+msgstr "ユーザー名には空白以外を指定してください"
+
+msgid "Invalid user name"
+msgstr "ユーザー名が無効です"
+
msgid "Activate"
msgstr "有効化"
@@ -8244,6 +8265,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr "編集レイヤーに何も含まれていないため、ID {0} のプリミティブ更新に失敗しました。"
@@ -9777,6 +9801,9 @@ msgstr "方向"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "WAV音声ファイル(*.wav)"
+
msgid "Import Audio"
msgstr "音声のインポート"
@@ -9791,9 +9818,6 @@ msgstr ""
msgid "Import not possible"
msgstr "インポートできません"
-msgid "Wave Audio files (*.wav)"
-msgstr "WAV音声ファイル(*.wav)"
-
msgid "Audio markers from {0}"
msgstr "{0} からの音声マーカー"
@@ -9890,14 +9914,6 @@ msgstr "(URLは： "
msgid "Select the map painting styles"
msgstr "地図の描画スタイルを選択してください"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "''{0}''から地図描画スタイルの読み込みに失敗しました。例外: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr "スタイル ''{0}'' を読み込み中..."
@@ -9909,6 +9925,9 @@ msgid_plural ""
"right click menu for details."
msgstr[0] "このスタイルを読み込むのに{0}件のエラーがありました。詳細は右クリックメニューから''情報''を選択してください。"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "''{0}''から地図描画スタイルの読み込みに失敗しました。例外: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "''{0}''から地図描画スタイルの解析に失敗しました。エラー: {1}"
@@ -10940,6 +10959,9 @@ msgstr "位置精度低下率(赤=高い、緑=低い、可能な場合)"
msgid "Track date"
msgstr "記録日"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "単色(名前付きレイヤーはカスタマイズ可能)"
@@ -10952,6 +10974,18 @@ msgstr "自転車"
msgid "Foot"
msgstr "徒歩"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "自然林"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "GPXを読み込んだときにマーカーを作成"
@@ -10964,6 +10998,9 @@ msgstr "データの範囲に応じて色の範囲を調整"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "GPXグラフィックを滑らかにする(アンチエイリアス)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11023,6 +11060,11 @@ msgid ""
msgstr "GPXの線をアンチエイリアスで描画し、滑らかに見えるようにします。"
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr "全ての点とトラック区間は同じ色になります。レイヤー管理からカスタマイズ可能です。"
@@ -11041,9 +11083,16 @@ msgstr "点や区間を測定誤差(HDOP)で色分けします。測定機器で
msgid "Colors points and track segments by its timestamp."
msgstr "点や区間を測定時刻で色分けします。"
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr "平均速度の違いによって、配色の仕方を調整するようにする。"
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "トラックと点の配色"
@@ -12271,6 +12320,12 @@ msgstr "宗教関係のオブジェクトのエラーをチェックします"
msgid "Checks for errors on relations"
msgstr "リレーションのエラーをチェックします"
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr "不要なタグ"
@@ -13321,6 +13376,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "ユーザーとパスワードを保存します(暗号化されません)"
+msgid "Assume"
+msgstr "適用"
+
+msgid "Existing values"
+msgstr "既存の値"
+
msgid "<delete from {0} objects>"
msgstr "<{0}件のオブジェクトから削除>"
@@ -13342,12 +13403,6 @@ msgstr "選択されたオブジェクトにチェックされたタグを追加
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Enter: 選択されたオブジェクトにすべてのタグを追加"
-msgid "Assume"
-msgstr "適用"
-
-msgid "Existing values"
-msgstr "既存の値"
-
msgid "Enable the checkbox to accept the value"
msgstr "値を反映するにはチェックボックスを有効にしてください"
@@ -14361,6 +14416,9 @@ msgstr "{0}キーストアにJOSMのlocalhost用証明書を追加中"
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr "暗黙のショートカットが競合しました。 ''{1}'' によって ''{0}'' は ''{2}'' に変更されました。"
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "バッファに疑わしいタグが{0}件あります。"
@@ -14852,14 +14910,17 @@ msgstr "Mapbox Satellite"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr "OpenSeaMap"
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, no labels)"
@@ -14882,8 +14943,11 @@ msgstr "Hike & Bike"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
@@ -14933,8 +14997,8 @@ msgstr "OSM Inspector: Places"
msgid "OSM Inspector: Highways"
msgstr "OSM Inspector: Highways"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
+msgstr ""
msgid "OSM Inspector: Routing"
msgstr "OSM Inspector: Routing"
@@ -14942,10 +15006,22 @@ msgstr "OSM Inspector: Routing"
msgid "OSM Inspector: Addresses"
msgstr "OSM Inspector: Addresses"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14981,6 +15057,12 @@ msgstr "LPI NSW Administrative Boundaries State Forest"
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr "LPI NSW Administrative Boundaries NPWS Reserve"
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -15026,10 +15108,16 @@ msgstr "VoGIS: Flächenwidmungsplan"
msgid "VoGIS: Höhen und Gelände"
msgstr "VoGIS: Höhen und Gelände"
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
+msgstr ""
+
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -15065,7 +15153,16 @@ msgstr "SPW(allonie) 2009-2010 aerial imagery"
msgid "TEC bus lines (2014)"
msgstr "TEC bus lines (2014)"
-msgid "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
msgstr ""
msgid "IBGE Mapa de Setores Urbanos"
@@ -15074,6 +15171,15 @@ msgstr "IBGE Mapa de Setores Urbanos"
msgid "IBGE Mapa de Setores Rurais"
msgstr "IBGE Mapa de Setores Rurais"
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Geobase Hydrography"
@@ -15086,12 +15192,34 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "British Columbia Mosaic"
+msgid "Latest southwest British Columbia Landsat"
+msgstr ""
+
msgid "Kelowna 2012"
msgstr "Kelowna 2012"
msgid "Kelowna Roads overlay"
msgstr "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr ""
+
msgid "Czech CUZK:KM"
msgstr "Czech CUZK:KM"
@@ -15128,6 +15256,12 @@ msgstr "Stevns (Denmark)"
msgid "Vejmidte (Denmark)"
msgstr "Vejmidte (Denmark)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Estonia Basemap (Maaamet)"
@@ -15161,9 +15295,6 @@ msgstr "Cadastre"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr "CRAIG - Auvergne 2013 - 25 cm"
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "GrandNancy Orthophotographie 2012"
@@ -15222,9 +15353,6 @@ msgstr ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
"- 1 m"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Sorbian Language)"
-
msgid "Hamburg (40 cm)"
msgstr "Hamburg (40 cm)"
@@ -15252,9 +15380,6 @@ msgstr "Berlin aerial photograph 2015"
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr "Stuttgart (aerial imagery)"
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15270,27 +15395,72 @@ msgstr "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
-msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
+msgid "Maps4BW (LGL-BW, www.lgl-bw.de)"
+msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
+
+msgid "NRW-Atlas: ALKIS"
+msgstr "NRW-Atlas: ALKIS"
+
+msgid "NRW-Atlas: Digitale GrundKarte 1:5000"
+msgstr "NRW-Atlas: Digitale GrundKarte 1:5000"
+
+msgid "NRW-Atlas: Luftbilder"
+msgstr "NRW-Atlas: Luftbilder"
+
+msgid "NRW-Atlas: Topographische Karte 1:10000"
+msgstr "NRW-Atlas: Topographische Karte 1:10000"
+
+msgid "Metropole Ruhr: Luftbilder (10 cm)"
+msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
-msgid "NRW-Atlas: ALKIS"
-msgstr "NRW-Atlas: ALKIS"
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
-msgid "NRW-Atlas: Digitale GrundKarte 1:5000"
-msgstr "NRW-Atlas: Digitale GrundKarte 1:5000"
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
-msgid "NRW-Atlas: Luftbilder"
-msgstr "NRW-Atlas: Luftbilder"
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
-msgid "NRW-Atlas: Topographische Karte 1:10000"
-msgstr "NRW-Atlas: Topographische Karte 1:10000"
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
-msgid "Metropole Ruhr: Luftbilder (10 cm)"
-msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
msgid "Drone Imagery (Haiti)"
msgstr "Drone Imagery (Haiti)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone Imagery 2014 (Haiti)"
@@ -15327,14 +15497,8 @@ msgstr "Danube flood ortophoto 2013"
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
-msgid "Budapest district XII ortophoto 2013"
-msgstr "Budapest district XII ortophoto 2013"
-
-msgid "Interspect Budapest ortophoto 2014"
-msgstr "Interspect Budapest ortophoto 2014"
-
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
-msgstr "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Hungary (hiking routes)"
@@ -15342,6 +15506,21 @@ msgstr "OpenStreetMap Hungary (hiking routes)"
msgid "Hillshade Hungary"
msgstr "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -15402,9 +15581,21 @@ msgstr "PCN 2012 - Italy"
msgid "South Tyrol Orthofoto 2011"
msgstr "South Tyrol Orthofoto 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr "South Tyrol Topomap"
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "USSR - Latvia"
@@ -15438,12 +15629,34 @@ msgstr "Niger Delta Oct 2012 Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard -Orthophoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Gaza Strip - Pléiades - 2014/07/06"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
@@ -15570,9 +15783,6 @@ msgstr "Świętochłowice: Ortofotomapa 2012 (aerial image)"
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Zabrze: Ortofotomapa 2011 (aerial image)"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Szlaki (paths)"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr "Wrocław: Ortofotomapa 2015 (aerial image)"
@@ -15582,6 +15792,20 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Car"
@@ -15603,12 +15827,30 @@ msgstr "RABA-KGZ: Slovenia farmland use"
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr "RABA-KGZ: Slovenia built-up areas"
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr "South Africa CD:NGI Aerial"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr "Catastro Spain"
@@ -15630,6 +15872,9 @@ msgstr "IDEIB - Balearic Islands"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Canary Islands"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Kanton Aargau 25cm (AGIS 2011)"
@@ -15672,6 +15917,9 @@ msgstr "Canton de Fribourg 50cm (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Stadt Bern 10cm/25cm (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -15693,6 +15941,12 @@ msgstr "Bonvillars Orthophoto 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Fiez Orthophoto 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr "Taiwan e-Map Open Data"
@@ -15708,6 +15962,9 @@ msgstr "Taiwan Land-Section Data"
msgid "NLSC Open Data WMTS"
msgstr "NLSC Open Data WMTS"
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "MSR Maps Topo"
@@ -15735,9 +15992,54 @@ msgstr "NC Latest Orthoimagery"
msgid "U.S. Forest Service roads"
msgstr "U.S. Forest Service roads"
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ukraine - Orthophotomaps 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15759,9 +16061,6 @@ msgstr "Surrey Air Survey"
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Scotland 1842-82"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr "NLS - OS 6-inch County Series 1888-1913"
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -15771,9 +16070,6 @@ msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr "NLS - OS 25-inch (Scotland) 1892-1905"
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25k historic (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "OS 1:25k historic (OSM-Limited)"
@@ -16094,7 +16390,7 @@ msgstr "場所を移動したりズームしたりすると、新しいデータ
msgid "Create a grid of ways."
msgstr "ウェイのグリッドを作成。"
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -16190,6 +16486,9 @@ msgstr "住居番号をタグ付けするシンプルなツールです。"
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "マルチポリゴンで囲まれた画像のXMLを作る"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18611,6 +18910,9 @@ msgstr "小川"
msgid "River"
msgstr "川"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "運河"
@@ -19659,6 +19961,12 @@ msgstr "モーテル"
msgid "Guest House/Bed & Breakfast"
msgstr "ゲストハウス/B&B"
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "貸別荘"
@@ -19725,6 +20033,12 @@ msgstr "屋外席"
msgid "Takeaway"
msgstr "テイクアウト"
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "ファストフード"
@@ -19965,7 +20279,7 @@ msgid "Night Club"
msgstr "ナイトクラブ"
msgid "Casino"
-msgstr "火事の"
+msgstr "カジノ"
msgid "Strip Club"
msgstr "ストリップクラブ"
@@ -20668,31 +20982,19 @@ msgstr "野生動物観察所"
msgid "Hunting Stand"
msgstr "ハンティングスタンド"
-msgid "Height"
-msgstr "高さ"
-
-msgctxt "height"
-msgid "low"
-msgstr "低"
-
-msgctxt "height"
-msgid "half"
-msgstr "中"
-
-msgctxt "height"
-msgid "full"
-msgstr "高"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
-msgstr "ロック"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr "空気ポンプ"
@@ -21284,6 +21586,10 @@ msgid "hut"
msgstr "小屋"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr "寮"
@@ -22577,6 +22883,9 @@ msgstr "精肉店"
msgid "Seafood"
msgstr "水産物店"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "惣菜屋"
@@ -23390,9 +23699,6 @@ msgstr "並木"
msgid "A line of trees."
msgstr "木の並びです。"
-msgid "Wood"
-msgstr "自然林"
-
msgid "Woodland where timber production does not dominate use."
msgstr "木材生産が積極的に行われていない森林です。"
@@ -23571,7 +23877,7 @@ msgid "Trees"
msgstr ""
msgid "olive_trees"
-msgstr ""
+msgstr "オリーブの木"
msgid "apple_trees"
msgstr "りんご"
@@ -23601,13 +23907,13 @@ msgid "persimmon_trees"
msgstr ""
msgid "walnut_trees"
-msgstr ""
+msgstr "クルミの木"
msgid "plum_trees"
msgstr ""
msgid "peach_trees"
-msgstr ""
+msgstr "桃の木"
msgid "tea_plants"
msgstr ""
@@ -24014,7 +24320,7 @@ msgid "maritime"
msgstr ""
msgid "national_park"
-msgstr ""
+msgstr "国立公園"
msgid "political"
msgstr "選挙区・自治区"
@@ -24438,6 +24744,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0}は推奨されていません"
@@ -24529,6 +24838,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0}がノードに設定されています。ウェイに設定するべきです。"
@@ -24605,6 +24920,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0}は{1}と{2}が交差するノード上にあるべきです"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "通り名が略称になっている"
@@ -24629,6 +24949,9 @@ msgstr "{0}が{1}と一緒に使われている"
msgid "street name contains ss"
msgstr "ssが含まれている通り名"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25338,10 +25661,10 @@ msgid "Error while creating image layer: "
msgstr "イメージレイヤーを作成中にエラー: "
msgid "Mapillary Images"
-msgstr ""
+msgstr "Mapillary 画像"
msgid "Mapillary layer"
-msgstr ""
+msgstr "Mapillary レイヤ"
msgid "Total images:"
msgstr ""
@@ -25359,10 +25682,10 @@ msgid "Mapillary"
msgstr "Mapillary"
msgid "Create Mapillary layer"
-msgstr ""
+msgstr "Mapillary レイヤの作成"
msgid "Start Mapillary layer"
-msgstr ""
+msgstr "Mapillary レイヤの開始"
msgid "Download Mapillary images in current view"
msgstr ""
@@ -25412,6 +25735,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25454,7 +25787,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25557,13 +25890,13 @@ msgid "Open Mapillary main dialog"
msgstr ""
msgid "Next picture"
-msgstr ""
+msgstr "次の画像"
msgid "Shows the next picture in the sequence"
msgstr ""
msgid "Previous picture"
-msgstr ""
+msgstr "前の画像"
msgid "Shows the previous picture in the sequence"
msgstr ""
@@ -25620,7 +25953,7 @@ msgid "You are logged in as ''{0}''."
msgstr ""
msgid "You are currently not logged in."
-msgstr ""
+msgstr "ログインしていません"
msgid "Go to setting and log in to Mapillary before uploading."
msgstr ""
@@ -26338,6 +26671,9 @@ msgstr "下の画像から（建物などの）エリアを選択します。"
msgid "Area Selector"
msgstr "エリア選択ツール"
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr "作成されたエリア"
@@ -26379,8 +26715,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27336,7 +27672,7 @@ msgid ""
msgstr ""
msgid "Wait time (milliseconds)"
-msgstr ""
+msgstr "待ち時間(ms)"
msgid ""
"How much extra area around the viewport is it going to download. Setting "
@@ -28035,6 +28371,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "イメージXMLファイルを開く"
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr "位置合わせレイヤー"
@@ -29792,10 +30187,10 @@ msgid "Edit Photo GPS Data"
msgstr ""
msgid "Please select an image first."
-msgstr ""
+msgstr "先に画像を選択して下さい。"
msgid "No image selected"
-msgstr ""
+msgstr "画像が選択されていません"
msgid "(Empty values delete the according fields.)"
msgstr ""
@@ -29813,31 +30208,31 @@ msgid "Edit coordinates in separate editor"
msgstr ""
msgid "altitude"
-msgstr ""
+msgstr "高度"
msgid "Altitude:"
-msgstr ""
+msgstr "高度:"
msgid "speed"
-msgstr ""
+msgstr "速度"
msgid "positive number or empty"
msgstr ""
msgid "Speed:"
-msgstr ""
+msgstr "速度:"
msgid "direction"
-msgstr ""
+msgstr "方向"
msgid "range -360.0 .. 360.0, or empty"
msgstr ""
msgid "Direction:"
-msgstr ""
+msgstr "方向:"
msgid "°"
-msgstr ""
+msgstr "°"
msgid "Undo changes made in this dialog"
msgstr ""
@@ -30226,9 +30621,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -30386,9 +30778,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr "[端点]"
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "ルートパターン ..."
@@ -30446,6 +30835,9 @@ msgstr "左側"
msgid "Maximum distance from route"
msgstr "経路からの最大距離"
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "公共交通: 停留所のタイプを変更"
@@ -30542,7 +30934,7 @@ msgid "Visualize public transport routes"
msgstr ""
msgid "Filters"
-msgstr ""
+msgstr "フィルタ"
msgid "Choose Filter"
msgstr ""
@@ -30643,9 +31035,6 @@ msgstr "ポリゴンを再構築"
msgid "Multipolygon must consist only of ways"
msgstr "マルチポリゴンにはウェイしか含められません"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr "外部のウェイのみからできたポリゴンを再構築"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "リレーション{0}からポリゴンを再構築"
diff --git a/i18n/po/ka.po b/i18n/po/ka.po
index f0f6c62..8f87c02 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:44+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:48+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: ka\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr "დახმარება"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -203,6 +209,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -224,12 +236,6 @@ msgstr "შეცდომა"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr "დაამატე წერტილი..."
@@ -713,6 +719,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -734,9 +743,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -787,6 +793,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -936,17 +945,17 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
-msgstr "განაცალკევე ფენა."
+msgid "Open Location..."
+msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "მონიშნე მონაცემები, რომელიც უნდა იქნას გადმოქაჩული ახალ ფენაში."
+msgid "Open an URL."
+msgstr ""
msgid "Enter URL to download:"
msgstr ""
@@ -954,6 +963,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr "განაცალკევე ფენა."
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "მონიშნე მონაცემები, რომელიც უნდა იქნას გადმოქაჩული ახალ ფენაში."
+
msgid "Download Location"
msgstr ""
@@ -969,12 +984,6 @@ msgstr "დახურე დიალოგის ფანჯარა და
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1767,9 +1776,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3955,9 +3961,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3987,12 +3990,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4685,12 +4703,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4707,8 +4731,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5029,9 +5053,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5170,82 +5191,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5411,6 +5356,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5470,7 +5491,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6862,212 +6883,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8173,6 +8194,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9659,6 +9683,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9671,9 +9698,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9770,14 +9794,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9790,6 +9806,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10778,6 +10797,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10790,6 +10812,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10802,6 +10836,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10861,6 +10898,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10879,9 +10921,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12076,6 +12125,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13111,6 +13166,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13132,12 +13193,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14097,6 +14152,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14585,13 +14643,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14615,7 +14676,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14666,7 +14730,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14675,10 +14739,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14714,6 +14790,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14759,10 +14841,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14795,34 +14883,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14861,6 +14989,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14894,9 +15028,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14953,9 +15084,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14983,9 +15111,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15019,9 +15144,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15058,19 +15228,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15133,9 +15312,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15169,12 +15360,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15301,9 +15514,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15313,6 +15523,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15334,12 +15558,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15361,6 +15603,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15403,6 +15648,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15424,6 +15672,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15439,6 +15693,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15466,9 +15723,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15490,9 +15792,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15502,9 +15801,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15816,7 +16112,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15904,6 +16200,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18300,6 +18599,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19348,6 +19650,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19414,6 +19722,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20357,31 +20671,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20973,6 +21275,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22266,6 +22572,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23079,9 +23388,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24126,6 +24432,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24217,6 +24526,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24293,6 +24608,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24317,6 +24637,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25090,6 +25413,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25132,7 +25465,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25935,6 +26268,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25976,8 +26312,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27575,6 +27911,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29736,9 +30131,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29896,9 +30288,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29956,6 +30345,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30153,9 +30545,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/km.po b/i18n/po/km.po
index 1b9c6d0..a790cf2 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:53+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:57+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr "បង្កើតម៉ឺនុយមេ"
msgid "Help"
msgstr "ជំនួយ"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "ចាប់ផ្ដើម OSM API"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "ចាប់ផ្ដើមម៉ាស៊ីនពិនិត្យ"
@@ -207,6 +213,12 @@ msgstr ""
"កំណត់ធាតុដែលបានជ្រើសនៅលើផែនទី "
"ទៅធាតុដែលបានជ្រើសនៅក្នុងបញ្ជីខាងលើ។"
+msgid "Select WMS layers"
+msgstr "ជ្រើសស្រទាប់ WMS"
+
+msgid "Add layers"
+msgstr "បន្ថែមស្រទាប់"
+
msgid "Add imagery layer {0}"
msgstr "បន្ថែមស្រទាប់រូបភាព {0}"
@@ -228,12 +240,6 @@ msgstr "កំហុស"
msgid "Select image format for WMS layer"
msgstr "ជ្រើសទ្រង់ទ្រាយរូបភាពសម្រាប់ស្រទាប់ WMS"
-msgid "Select WMS layers"
-msgstr "ជ្រើសស្រទាប់ WMS"
-
-msgid "Add layers"
-msgstr "បន្ថែមស្រទាប់"
-
msgid "Add Node..."
msgstr "បន្ថែមតំណ..."
@@ -739,6 +745,9 @@ msgstr "ទៅកាន់ទីតាំង"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "បើកប្រអប់បញ្ចូលដែលអនុញ្ញាតឲ្យចូលទៅកាន់ទីតាំងជាក់លាក់"
+msgid "Jump to Position"
+msgstr "ទៅកាន់ទីតាំង"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "បញ្ចូលរយៈទទឹង/រយៈបណ្ដោយដើម្បីទៅកាន់ទីតាំង។"
@@ -760,9 +769,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "ទៅកាន់ទីនោះ"
-msgid "Jump to Position"
-msgstr "ទៅកាន់ទីតាំង"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr "មិនអាចញែករយៈទទឹង, រយៈបណ្ដោយ ឬពង្រីកបានទេ សូមពិនិត្យ។"
@@ -816,6 +822,9 @@ msgstr "បញ្ចូលស្រទាប់ចូលគ្នា"
msgid "Merge the current layer into another layer"
msgstr "បញ្ចូលស្រទាប់បច្ចុប្បន្នចូលគ្នាជាមួយស្រទាប់ផ្សេង"
+msgid "{0} completed in {1}"
+msgstr "បានបញ្ចប់ {0} នៃ {1}"
+
msgid "Merging layers with different upload policies"
msgstr "ការបញ្ចូលស្រទាប់ចូលគ្នាដោយប្រើគោលនយោបាយផ្ទុកឡើងខុសគ្នា"
@@ -979,24 +988,30 @@ msgstr[0] "កំពុងបើកឯកសារ {0}..."
msgid "Opening file ''{0}'' ..."
msgstr "កំពុងបើកឯកសារ ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "យល់ព្រម"
+
msgid "Open Location..."
msgstr "បើកទីតាំង..."
msgid "Open an URL."
msgstr "បើក URL ។"
-msgid "Separate Layer"
-msgstr "ស្រទាប់ដាច់ដោយឡែកពីគ្នា"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "ជ្រើស បើទិន្នន័យគួរត្រូវបានទាញយកនៅក្នុងស្រទាប់ថ្មី"
-
msgid "Enter URL to download:"
msgstr "បញ្ចូល URL ដើម្បីទាញយក៖"
msgid "Enter an URL from where data should be downloaded"
msgstr "បញ្ចូលទម្រង់ URL ដែលទិន្នន័យគួរត្រូវបានទាញយក"
+msgid "Separate Layer"
+msgstr "ស្រទាប់ដាច់ដោយឡែកពីគ្នា"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "ជ្រើស បើទិន្នន័យគួរត្រូវបានទាញយកនៅក្នុងស្រទាប់ថ្មី"
+
msgid "Download Location"
msgstr "ទីតាំងទាញយក"
@@ -1012,12 +1027,6 @@ msgstr "បិទប្រអប់ រួចបោះបង់កា
msgid "Download Data"
msgstr "ទាញយកទិន្នន័យ"
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr "យល់ព្រម"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1876,9 +1885,6 @@ msgstr "ជ្រើស និងទាញយកសំណុំផ
msgid "Errors during download"
msgstr "កំហុសពេលទាញយក"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr "ទាញយកជីភីអេស"
@@ -4190,9 +4196,6 @@ msgstr "ផ្លូវរចនាប័ទ្មផ្ទៃមិន
msgid "No outer way for multipolygon"
msgstr "មិនមានផ្លូវក្រៅសម្រាប់ពហុកោណចម្រុះ"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "តួនាទីរបស់ ''{0}'' គួរតែ ''{1}''"
-
msgid "No area style for multipolygon"
msgstr "មិនមានរចនាប័ទ្មផ្ទៃសម្រាប់ពហុកោណចម្រុះ"
@@ -4222,12 +4225,27 @@ msgstr "រចនាប័ទ្មផ្ទៃនៅលើផ្ល
msgid "Multipolygon is not closed"
msgstr "ពហុកោណចម្រុះគឺមិនបានបិទ"
-msgid "Multipolygon inner way is outside"
-msgstr "ពហុកោណចម្រុះខាងក្នុងគឺនៅក្រៅ"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "ចំណុចប្រសព្វរវាងផ្លូវពហុកោណចម្រុះ"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "តួនាទីរបស់ ''{0}'' គួរតែ ''{1}''"
+
+msgid "Multipolygon inner way is outside"
+msgstr "ពហុកោណចម្រុះខាងក្នុងគឺនៅក្រៅ"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "មិនមានតួនាទីចាំបាច់សម្រាប់សមាជិកពហុកោណចម្រុះ"
@@ -4946,12 +4964,18 @@ msgstr "បិទការចូលប្រើធនធានដ
msgid "options provided as Java system properties"
msgstr "ជម្រើសបានផ្ដល់ជាលក្ខណសម្បត្តិប្រព័ន្ធ Java"
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/PATH/TO/JOSM/PREF "
msgid "Set the preferences directory"
msgstr "កំណត់ថតចំណូលចិត្ត"
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/PATH/TO/JOSM/USERDATA"
@@ -4968,11 +4992,9 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/PATH/TO/JOSM/HOMEDIR "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"កំណត់ទីតាំងថតទាំងបីឡើងវិញទៅថតផ្ទះ។ ថតឃ្លាំងនឹងនៅក្នុង "
-"homedir/cache"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5313,9 +5335,6 @@ msgstr "ចុចដើម្បីដំណើរការនៅផ
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "បានបញ្ចប់ {0} នៃ {1}"
-
msgid "Enlarge"
msgstr ""
@@ -5458,84 +5477,6 @@ msgstr "ការប៉ះទង្គិចផ្ទៃខាងក្
msgid "Conflict foreground: remove member"
msgstr "ការប៉ះទង្គិចផ្ទៃខាងមុខ៖ លុបសមាជិក"
-msgid "My with Their"
-msgstr "របស់ខ្ញុំជាមួយរបស់គេ"
-
-msgid "My with Merged"
-msgstr "របស់ខ្ញុំជាមួយដែលបានបញ្ចូលគ្នា"
-
-msgid "Their with Merged"
-msgstr "របស់គេជាមួយដែលបានបញ្ចូលគ្នា"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "បញ្ជី {0} មិននៅក្នុងគូប្រៀបធៀប {1} ។"
-
-msgid "Properties"
-msgstr "លក្ខណៈសម្បត្តិ"
-
-msgid "Tags"
-msgstr "ស្លាក"
-
-msgid "Nodes"
-msgstr "តំណ"
-
-msgid "Members"
-msgstr "សមាជិក"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "មិនមានស្លាកប៉ះទង្គិចដែលត្រូវដោះស្រាយទេ"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "ស្លាក (ប៉ះទង្គិច {0})"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} ស្លាកមិនទាន់សម្រេចដែលត្រូវដោះស្រាយ"
-
-msgid "Nodes(resolved)"
-msgstr "តំណ (បានដោះស្រាយ)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"បានបញ្ចូលតំណបង្កកចូលគ្នា។ "
-"គ្មានការប៉ះទង្គិចមិនទាន់សម្រេចនៅក្នុងបញ្ជីតំណផ្លូវនេះទេ"
-
-msgid "Nodes(with conflicts)"
-msgstr "តំណ (ដែលមានការប៉ះទង្គិច)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "មានការប៉ះទង្គិចមិនទាន់សម្រេចនៅក្នុងបញ្ជីតំណផ្លូវនេះ"
-
-msgid "Members(resolved)"
-msgstr "សមាជិក (បានដោះស្រាយ)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"បានបញ្ចូលបញ្ជីសមាជិកបង្កកចូលគ្នា។ "
-"គ្មានការប៉ះទង្គិចមិនទាន់សម្រេចនៅក្នុងបញ្ជីសមាជិកផ្លូវនេះទេ"
-
-msgid "Members(with conflicts)"
-msgstr "សមាជិក (ដែលមានការប៉ះទង្គិច)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "ការប៉ះទង្គិចមិនទាន់សម្រេចនៅក្នុងបញ្ជីសមាជិកទំនាក់ទំនងនេះ"
-
-msgid "No pending property conflicts"
-msgstr "មិនមានការប៉ះទង្គិចលក្ខណសម្បត្តិមិនទាន់សម្រេច"
-
-msgid "Properties(with conflicts)"
-msgstr "លក្ខណសម្បត្តិ (ដែលមានការប៉ះទង្គិច)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "ការប៉ះទង្គិចលក្ខណសម្បត្តិមិនទាន់សម្រេចដែលត្រូវដោះស្រាយ"
-
-msgid "Conflict Resolution"
-msgstr "ប៉ះទង្គិចគុណភាពបង្ហាញ"
-
msgid "{0} more..."
msgstr "{0} ច្រើនទៀត..."
@@ -5725,6 +5666,84 @@ msgid "Their version ({0} entry)"
msgid_plural "Their version ({0} entries)"
msgstr[0] "កំណែរបស់ពួកគេ ({0} ធាតុ)"
+msgid "My with Their"
+msgstr "របស់ខ្ញុំជាមួយរបស់គេ"
+
+msgid "My with Merged"
+msgstr "របស់ខ្ញុំជាមួយដែលបានបញ្ចូលគ្នា"
+
+msgid "Their with Merged"
+msgstr "របស់គេជាមួយដែលបានបញ្ចូលគ្នា"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "បញ្ជី {0} មិននៅក្នុងគូប្រៀបធៀប {1} ។"
+
+msgid "Properties"
+msgstr "លក្ខណៈសម្បត្តិ"
+
+msgid "Tags"
+msgstr "ស្លាក"
+
+msgid "Nodes"
+msgstr "តំណ"
+
+msgid "Members"
+msgstr "សមាជិក"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "មិនមានស្លាកប៉ះទង្គិចដែលត្រូវដោះស្រាយទេ"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "ស្លាក (ប៉ះទង្គិច {0})"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} ស្លាកមិនទាន់សម្រេចដែលត្រូវដោះស្រាយ"
+
+msgid "Nodes(resolved)"
+msgstr "តំណ (បានដោះស្រាយ)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"បានបញ្ចូលតំណបង្កកចូលគ្នា។ "
+"គ្មានការប៉ះទង្គិចមិនទាន់សម្រេចនៅក្នុងបញ្ជីតំណផ្លូវនេះទេ"
+
+msgid "Nodes(with conflicts)"
+msgstr "តំណ (ដែលមានការប៉ះទង្គិច)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "មានការប៉ះទង្គិចមិនទាន់សម្រេចនៅក្នុងបញ្ជីតំណផ្លូវនេះ"
+
+msgid "Members(resolved)"
+msgstr "សមាជិក (បានដោះស្រាយ)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"បានបញ្ចូលបញ្ជីសមាជិកបង្កកចូលគ្នា។ "
+"គ្មានការប៉ះទង្គិចមិនទាន់សម្រេចនៅក្នុងបញ្ជីសមាជិកផ្លូវនេះទេ"
+
+msgid "Members(with conflicts)"
+msgstr "សមាជិក (ដែលមានការប៉ះទង្គិច)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "ការប៉ះទង្គិចមិនទាន់សម្រេចនៅក្នុងបញ្ជីសមាជិកទំនាក់ទំនងនេះ"
+
+msgid "No pending property conflicts"
+msgstr "មិនមានការប៉ះទង្គិចលក្ខណសម្បត្តិមិនទាន់សម្រេច"
+
+msgid "Properties(with conflicts)"
+msgstr "លក្ខណសម្បត្តិ (ដែលមានការប៉ះទង្គិច)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "ការប៉ះទង្គិចលក្ខណសម្បត្តិមិនទាន់សម្រេចដែលត្រូវដោះស្រាយ"
+
+msgid "Conflict Resolution"
+msgstr "ប៉ះទង្គិចគុណភាពបង្ហាញ"
+
msgid "Node"
msgstr "តំណ"
@@ -5792,10 +5811,8 @@ msgstr "តួនាទី"
msgid "Primitive"
msgstr "ព្រីមីទីវ"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"តំណដែលបានបញ្ចូលគ្នា មិនទាន់បង្កកនៅឡើយទេ។ "
-"មិនអាចបង្កើតពាក្យបញ្ជាគុណភាពបង្ហាញ"
msgid "<undefined>"
msgstr "<មិនបានកំណត់>"
@@ -7278,149 +7295,22 @@ msgid "Select only changesets related to a specific bounding box"
msgstr ""
"ជ្រើសតែសំណុំផ្លាស់ប្ដូរដែលពាក់ព័ន្ធនឹងប្រអប់ភ្ជាប់ជាក់លាក់ប៉ុណ្ណោះ"
-msgid "Query open changesets only"
-msgstr "សំណួរបើកតែសំណុំផ្លាស់ប្ដូរប៉ុណ្ណោះ"
-
-msgid "Query closed changesets only"
-msgstr "សំណួរបិទតែសំណុំផ្លាស់ប្ដូរប៉ុណ្ណោះ"
-
-msgid "Query both open and closed changesets"
-msgstr "សំណួរទាំងនិទ និងបើកសំណុំផ្លាស់ប្ដូរ"
-
-msgid "Only changesets owned by myself"
-msgstr "តែសំណុំផ្លាស់ប្ដូរដែលជាកម្មសិទ្ធិរបស់ខ្ញុំប៉ុណ្ណោះ"
-
-msgid "User ID:"
-msgstr "លេខសម្គាល់អ្នកប្រើ៖"
-
-msgid "User name:"
-msgstr "ឈ្មោះអ្នកប្រើ៖"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
-"តែសំណុំផ្លាស់ប្ដូរដែលជាកម្មសិទ្ធិរបស់អ្នកប្រើដែលមានលេខសម្គាល់ដូច"
-"ខាងក្រោមប៉ុណ្ណោះ"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-"តែសំណុំផ្លាស់ប្ដូរជាកម្មសិទ្ធិរបស់អ្នកប្រើដែលមានឈ្មោះដូចខាងក្រោមប"
-"៉ុណ្ណោះ"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"តែសំណុំផ្លាស់ប្ដូរដែលជាកម្មសិទ្ធិរបស់ខ្ញុំប៉ុណ្ណោះ (បានបិទ ហើយ JOSM "
-"កំពុងដំណើរការដោយអ្នកប្រើអនាមិក)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"មិនអាចដាក់កម្រិតសំណួរសំណុំផ្លាស់ប្ដូរទៅអ្នកប្រើបច្ចុប្បន្ន "
-"ព្រោះគាត់ជាអ្នកប្រើអនាមិក"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr ""
-"តម្លៃ ''{0}'' បច្ចុប្បន្នសម្រាប់លេខសម្គាល់អ្នកប្រើមិនត្រឹមត្រូវ"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"មិនអាចដាក់កម្រិតសំណួរសំណុំផ្លាស់ប្ដូរទៅអ្នកប្រើឈ្មោះ ''{0}''"
-
-msgid "Please enter a valid user ID"
-msgstr "សូមបញ្ចូលលេខសម្គាល់អ្នកប្រើត្រឹមត្រូវ"
-
-msgid "Invalid user ID"
-msgstr "លេខសម្គាល់អ្នកប្រើមិនត្រឹមត្រូវ"
-
-msgid "Please enter a non-empty user name"
-msgstr "សូមបញ្ចូលឈ្មោះអ្នកប្រើមិនទទេ"
-
-msgid "Invalid user name"
-msgstr "ឈ្មោះអ្នកប្រើមិនត្រឹមត្រូវ"
-
-msgid "Date: "
-msgstr "កាលបរិច្ឆេទ៖ "
-
-msgid "Time:"
-msgstr "ពេលវេលា៖"
-
-msgid "Closed after - "
-msgstr "បិទបន្ទាប់ពី - "
-
-msgid "Date:"
-msgstr "កាលបរិច្ឆេទ៖"
-
-msgid "Created before - "
-msgstr "បានបង្កើតមុន - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr ""
-"មានតែសំណុំផ្លាស់ប្ដូរដែលបានបិទបន្ទាប់ពីពេលវេលា/កាលបរិច្ឆេទដូចខាងក្រ"
-"ោមប៉ុណ្ណោះ"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-"មានតែសំណុំផ្លាស់ប្ដូរដែលបានបិទបន្ទាប់ពី "
-"និងបានបង្កើតមុនពេលវេលា/កាលបរិច្ឆេទដូចខាងក្រោមប៉ុណ្ណោះ"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"មិនអាចបង្កើតសំណួរសំណុំផ្លាស់ប្ដូរជាមួយការដាក់កម្រិតមូលដ្ឋានពេលវេលា"
-"។ ព័ត៌មានបញ្ចូលមិនត្រឹមត្រូវ។"
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr ""
-"<html>សូមបញ្ចូលតម្លៃពេលវេលា/កាលបរិច្ឆេទត្រឹមត្រូវដើម្បីដាក់កម្រិត<br>ស"
-"ំណួរទៅជួរពេលវេលាជាក់លាក់។</html>"
-
-msgid "Invalid date/time values"
-msgstr "តម្លៃពេលវេលា/កាលបរិច្ឆេទមិនត្រឹមត្រូវ"
-
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
-msgstr ""
-"មិនអាចដាក់កម្រិតសំណួរសំណុំផ្លាស់ប្ដូរទៅប្រអប់ព្រំដែន។ "
-"ព័ត៌មានបញ្ចូលមិនត្រឹមត្រូវ។"
-
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
-msgstr ""
-"<html>សូមបញ្ចូលតម្លៃរយៈបណ្ដោយ/រយៈទទឹងដើម្បីដាក់កម្រិត<br>សំណួរសំណុំផ្"
-"លាស់ប្ដូរទៅប្រអប់ព្រំដែនជាក់លាក់។</html>"
-
-msgid "Invalid bounding box"
-msgstr "ប្រអប់ព្រំដែនមិនត្រឹមត្រូវ"
-
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"តម្លៃបច្ចុប្បន្នមិនមែនជាលេខសម្គាល់អ្នកប្រើត្រឹមត្រូវ។ "
-"សូមបញ្ចូលតម្លៃចំនួនគត់ > 0"
-
-msgid "Please enter an integer value > 0"
-msgstr "សូមបញ្ចូលតម្លៃចំនួនគត់ > 0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-"សូមបញ្ចូលកាលបរិច្ឆេទក្នុងទ្រង់ទ្រាយទូទៅសម្រាប់ភាសារបស់អ្នក។<br>ឧទាហរ"
-"ណ៍៖ {0}<br>ឧទាហរណ៍៖ {1}<br>ឧទាហរណ៍៖ {2}<br>ឧទាហរណ៍៖ {3}<br>"
+"មិនអាចដាក់កម្រិតសំណួរសំណុំផ្លាស់ប្ដូរទៅប្រអប់ព្រំដែន។ "
+"ព័ត៌មានបញ្ចូលមិនត្រឹមត្រូវ។"
msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-"សូមបញ្ចូលពេលវេលាក្នុងទ្រង់ទ្រាយទូទៅសម្រាប់ភាសារបស់អ្នក។<br>ឧទាហរណ៍៖ "
-"{0}<br>ឧទាហរណ៍៖ {1}<br>ឧទាហរណ៍៖ {2}<br>ឧទាហរណ៍៖ {3}<br>"
+"<html>សូមបញ្ចូលតម្លៃរយៈបណ្ដោយ/រយៈទទឹងដើម្បីដាក់កម្រិត<br>សំណួរសំណុំផ្"
+"លាស់ប្ដូរទៅប្រអប់ព្រំដែនជាក់លាក់។</html>"
+
+msgid "Invalid bounding box"
+msgstr "ប្រអប់ព្រំដែនមិនត្រឹមត្រូវ"
msgid "Download my changesets only"
msgstr "ទាញយកតែសំណុំផ្លាស់ប្ដូររបស់ខ្ញុំប៉ុណ្ណោះ"
@@ -7513,6 +7403,80 @@ msgstr "URL ការជ្រើសសំណុំផ្លាស់
msgid "Close the dialog and abort querying of changesets"
msgstr "បិទប្រអប់ រួចបោះបង់ការជ្រើសសំណុំផ្លាស់ប្ដូរ"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"សូមបញ្ចូលកាលបរិច្ឆេទក្នុងទ្រង់ទ្រាយទូទៅសម្រាប់ភាសារបស់អ្នក។<br>ឧទាហរ"
+"ណ៍៖ {0}<br>ឧទាហរណ៍៖ {1}<br>ឧទាហរណ៍៖ {2}<br>ឧទាហរណ៍៖ {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "សំណួរបើកតែសំណុំផ្លាស់ប្ដូរប៉ុណ្ណោះ"
+
+msgid "Query closed changesets only"
+msgstr "សំណួរបិទតែសំណុំផ្លាស់ប្ដូរប៉ុណ្ណោះ"
+
+msgid "Query both open and closed changesets"
+msgstr "សំណួរទាំងនិទ និងបើកសំណុំផ្លាស់ប្ដូរ"
+
+msgid "Date: "
+msgstr "កាលបរិច្ឆេទ៖ "
+
+msgid "Time:"
+msgstr "ពេលវេលា៖"
+
+msgid "Closed after - "
+msgstr "បិទបន្ទាប់ពី - "
+
+msgid "Date:"
+msgstr "កាលបរិច្ឆេទ៖"
+
+msgid "Created before - "
+msgstr "បានបង្កើតមុន - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr ""
+"មានតែសំណុំផ្លាស់ប្ដូរដែលបានបិទបន្ទាប់ពីពេលវេលា/កាលបរិច្ឆេទដូចខាងក្រ"
+"ោមប៉ុណ្ណោះ"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+"មានតែសំណុំផ្លាស់ប្ដូរដែលបានបិទបន្ទាប់ពី "
+"និងបានបង្កើតមុនពេលវេលា/កាលបរិច្ឆេទដូចខាងក្រោមប៉ុណ្ណោះ"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"មិនអាចបង្កើតសំណួរសំណុំផ្លាស់ប្ដូរជាមួយការដាក់កម្រិតមូលដ្ឋានពេលវេលា"
+"។ ព័ត៌មានបញ្ចូលមិនត្រឹមត្រូវ។"
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>សូមបញ្ចូលតម្លៃពេលវេលា/កាលបរិច្ឆេទត្រឹមត្រូវដើម្បីដាក់កម្រិត<br>ស"
+"ំណួរទៅជួរពេលវេលាជាក់លាក់។</html>"
+
+msgid "Invalid date/time values"
+msgstr "តម្លៃពេលវេលា/កាលបរិច្ឆេទមិនត្រឹមត្រូវ"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"សូមបញ្ចូលពេលវេលាក្នុងទ្រង់ទ្រាយទូទៅសម្រាប់ភាសារបស់អ្នក។<br>ឧទាហរណ៍៖ "
+"{0}<br>ឧទាហរណ៍៖ {1}<br>ឧទាហរណ៍៖ {2}<br>ឧទាហរណ៍៖ {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"តម្លៃបច្ចុប្បន្នមិនមែនជាលេខសម្គាល់អ្នកប្រើត្រឹមត្រូវ។ "
+"សូមបញ្ចូលតម្លៃចំនួនគត់ > 0"
+
+msgid "Please enter an integer value > 0"
+msgstr "សូមបញ្ចូលតម្លៃចំនួនគត់ > 0"
+
msgid "URL: "
msgstr "URL: "
@@ -7533,6 +7497,59 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "URL ការជ្រើសសំណុំផ្លាស់ប្ដូរនេះមិនត្រឹមត្រូវ"
+msgid "Only changesets owned by myself"
+msgstr "តែសំណុំផ្លាស់ប្ដូរដែលជាកម្មសិទ្ធិរបស់ខ្ញុំប៉ុណ្ណោះ"
+
+msgid "User ID:"
+msgstr "លេខសម្គាល់អ្នកប្រើ៖"
+
+msgid "User name:"
+msgstr "ឈ្មោះអ្នកប្រើ៖"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr ""
+"តែសំណុំផ្លាស់ប្ដូរដែលជាកម្មសិទ្ធិរបស់អ្នកប្រើដែលមានលេខសម្គាល់ដូច"
+"ខាងក្រោមប៉ុណ្ណោះ"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+"តែសំណុំផ្លាស់ប្ដូរជាកម្មសិទ្ធិរបស់អ្នកប្រើដែលមានឈ្មោះដូចខាងក្រោមប"
+"៉ុណ្ណោះ"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"តែសំណុំផ្លាស់ប្ដូរដែលជាកម្មសិទ្ធិរបស់ខ្ញុំប៉ុណ្ណោះ (បានបិទ ហើយ JOSM "
+"កំពុងដំណើរការដោយអ្នកប្រើអនាមិក)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"មិនអាចដាក់កម្រិតសំណួរសំណុំផ្លាស់ប្ដូរទៅអ្នកប្រើបច្ចុប្បន្ន "
+"ព្រោះគាត់ជាអ្នកប្រើអនាមិក"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr ""
+"តម្លៃ ''{0}'' បច្ចុប្បន្នសម្រាប់លេខសម្គាល់អ្នកប្រើមិនត្រឹមត្រូវ"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"មិនអាចដាក់កម្រិតសំណួរសំណុំផ្លាស់ប្ដូរទៅអ្នកប្រើឈ្មោះ ''{0}''"
+
+msgid "Please enter a valid user ID"
+msgstr "សូមបញ្ចូលលេខសម្គាល់អ្នកប្រើត្រឹមត្រូវ"
+
+msgid "Invalid user ID"
+msgstr "លេខសម្គាល់អ្នកប្រើមិនត្រឹមត្រូវ"
+
+msgid "Please enter a non-empty user name"
+msgstr "សូមបញ្ចូលឈ្មោះអ្នកប្រើមិនទទេ"
+
+msgid "Invalid user name"
+msgstr "ឈ្មោះអ្នកប្រើមិនត្រឹមត្រូវ"
+
msgid "Activate"
msgstr "ធ្វើឲ្យសកម្ម"
@@ -8716,6 +8733,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10357,6 +10377,9 @@ msgstr "ទិស"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "ឯកសារសំឡេង Wave (*.wav)"
+
msgid "Import Audio"
msgstr "នាំចូលអូឌីយ៉ូ"
@@ -10373,9 +10396,6 @@ msgstr ""
msgid "Import not possible"
msgstr "មិនអាចនាំចូលបាន"
-msgid "Wave Audio files (*.wav)"
-msgstr "ឯកសារសំឡេង Wave (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "កម្មវិធីបង្កើតសំឡេងពី {0}"
@@ -10485,16 +10505,6 @@ msgstr "(URL គឺ៖ "
msgid "Select the map painting styles"
msgstr "ជ្រើសរចនាប័ទ្មគំនូរផែនទី"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-"បានបរាជ័យក្នុងការផ្ទុករចនាប័ទ្មគំនូរផែនទីពី ''{0}'' ។ "
-"ករណីលើកលែងគឺ៖ {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr "កំពុងផ្ទុករចនាប័ទ្ម ''{0}''..."
@@ -10508,6 +10518,11 @@ msgstr[0] ""
"មានកំហុស {0} ពេលផ្ទុករចនាប័ទ្មនេះ។ ជ្រើស ''ព័ត៌មាន'' "
"ពីការចុចកណ្ដុរស្ដាំលើម៉ឺនុយសម្រាប់ព័ត៌មានលម្អិត។"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+"បានបរាជ័យក្នុងការផ្ទុករចនាប័ទ្មគំនូរផែនទីពី ''{0}'' ។ "
+"ករណីលើកលែងគឺ៖ {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
"បានបរាជ័យក្នុងការញែករចនាប័ទ្មគំនូរផែនទីពី ''{0}'' ។ កំហុសគឺ៖ {1}"
@@ -11642,6 +11657,9 @@ msgstr "ការលាយបន្សាបនៃទីតាំង
msgid "Track date"
msgstr "កាលបរិច្ឆេទដាន"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "ពណ៌ទោល (អាចប្ដូរតាមតម្រូវការសម្រាប់ស្រទាប់ដែលបានដាក់ឈ្មោះ)"
@@ -11654,6 +11672,18 @@ msgstr "កង់"
msgid "Foot"
msgstr "ថ្មើជើង"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "បង្កើតកម្មវិធីចំណាំពេលអាន GPX"
@@ -11666,6 +11696,9 @@ msgstr "ជួរពណ៌ប្រែប្រួលផ្អែក
msgid "Smooth GPX graphics (antialiasing)"
msgstr "ក្រាហ្វិក GPX រលូន (ប្រឆាំងភាពរឆេតរឆូត)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11737,6 +11770,11 @@ msgstr ""
"ដើម្បីបានលទ្ធផលបង្ហាញរលូនជាង។"
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11759,9 +11797,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "កំណត់ពណ៌កំណាត់ដាន និងចំណុចតាមត្រាពេលវេលារបស់វា។"
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr "អនុញ្ញាតឲ្យកែតម្រូវពណ៌ដានសម្រាប់ល្បឿនមធ្យមខុសគ្នា។"
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "ការដាក់ពណ៌ចំណុច និងដាន"
@@ -13069,6 +13114,12 @@ msgstr "ពិនិត្យមើលកំហុសនៅលើវ
msgid "Checks for errors on relations"
msgstr "ពិនិត្យមើលកំហុសនៅលើទំនាក់ទំនង"
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr "ស្លាកមិនចាំបាច់"
@@ -14228,6 +14279,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "រក្សាទុកអ្នកប្រើ និងពាក្យសម្ងាត់ (មិនបានដាក់លេខកូដ)"
+msgid "Assume"
+msgstr "សន្មត"
+
+msgid "Existing values"
+msgstr "តម្លៃមានស្រាប់"
+
msgid "<delete from {0} objects>"
msgstr "<លុបចេញពីវត្ថុ {0}>"
@@ -14249,12 +14306,6 @@ msgstr "បន្ថែមស្លាកដែលបានធីក
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Enter: បន្ថែមស្លាកទាំងអស់ទៅវត្ថុដែលបានជ្រើស"
-msgid "Assume"
-msgstr "សន្មត"
-
-msgid "Existing values"
-msgstr "តម្លៃមានស្រាប់"
-
msgid "Enable the checkbox to accept the value"
msgstr "បើកប្រអប់ធីកដើម្បីព្រមទទួលតម្លៃ"
@@ -15400,6 +15451,9 @@ msgstr ""
"ផ្លូវកាត់ស្ងាត់មានការប៉ះទង្គិច៖ ''{0}'' បានផ្លាស់ទីដោយ ''{1}'' ទៅ "
"''{2}'' ។"
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "បានរកឃើញស្លាក {0} នៅក្នុងទ្រនាប់ វាគួរឲ្យសង្ស័យណាស់!"
@@ -15914,13 +15968,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -15944,7 +16001,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -15995,7 +16055,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -16004,10 +16064,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -16043,6 +16115,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -16088,10 +16166,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -16124,34 +16208,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -16190,6 +16314,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -16223,9 +16353,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -16282,9 +16409,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -16312,9 +16436,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16348,9 +16469,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -16387,19 +16553,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -16462,9 +16637,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -16498,12 +16685,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -16630,9 +16839,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -16642,6 +16848,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -16663,12 +16883,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -16690,6 +16928,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -16732,6 +16973,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -16753,6 +16997,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -16768,6 +17018,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -16795,9 +17048,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -16819,9 +17117,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -16831,9 +17126,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -17168,7 +17460,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr "បង្កើតក្រឡាផ្លូវ។"
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -17272,6 +17564,9 @@ msgstr "ឧបករណ៍ធម្មតាសម្រាប់ដា
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "បង្កើតរូបភាពព្រំដែន XML ពីពហុកោណច្រើន"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -19717,6 +20012,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -20765,6 +21063,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -20831,6 +21135,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -21774,31 +22084,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -22390,6 +22688,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -23683,6 +23985,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -24496,9 +24801,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -25543,6 +25845,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -25634,6 +25939,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -25710,6 +26021,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -25734,6 +26050,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -26507,6 +26826,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -26549,7 +26878,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -27352,6 +27681,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -27393,8 +27725,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -28992,6 +29324,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -31153,9 +31544,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -31313,9 +31701,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -31373,6 +31758,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -31570,9 +31958,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/ko.po b/i18n/po/ko.po
index e247511..e415027 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
"PO-Revision-Date: 2016-08-05 12:36+0000\n"
"Last-Translator: Myeongjin <aranet100 at gmail.com>\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: 2016-11-07 04:54+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:59+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: ko\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr "메인 메뉴 구축"
msgid "Help"
msgstr "도움말"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "OSM API 초기화 중"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "유효성 검사기 초기화 중"
@@ -200,6 +206,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr "WMS 레이어 선택"
+
+msgid "Add layers"
+msgstr "레이어 추가"
+
msgid "Add imagery layer {0}"
msgstr "영상 레이어 {0} 추가"
@@ -221,12 +233,6 @@ msgstr "오류"
msgid "Select image format for WMS layer"
msgstr "WMS 레이어에 대한 그림 형식 선택"
-msgid "Select WMS layers"
-msgstr "WMS 레이어 선택"
-
-msgid "Add layers"
-msgstr "레이어 추가"
-
msgid "Add Node..."
msgstr "노드 추가..."
@@ -706,6 +712,9 @@ msgstr "위치로 이동"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr "위치로 가기"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "위도/경도를 입력하여 위치로 이동합니다."
@@ -727,9 +736,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "거기로 이동"
-msgid "Jump to Position"
-msgstr "위치로 가기"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr "위도, 경도 또는 확대를 구문 분석할 수 없습니다. 확인해주세요."
@@ -780,6 +786,9 @@ msgstr "layer 합치기"
msgid "Merge the current layer into another layer"
msgstr "다른 layer에 현재 layer를 합치기"
+msgid "{0} completed in {1}"
+msgstr "{0}은 {1}에서 완료되었습니다"
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -925,24 +934,30 @@ msgstr[0] "{0} 파일 여는 중"
msgid "Opening file ''{0}'' ..."
msgstr "파일 ''{0}'' 여는 중..."
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "확인"
+
msgid "Open Location..."
msgstr "위치 열기..."
msgid "Open an URL."
msgstr "URL 열기"
-msgid "Separate Layer"
-msgstr "layer 분리"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "데이터가 새로운 레이어에 다운로드 되어야하는지 선택"
-
msgid "Enter URL to download:"
msgstr "다운로드할 URL 입력:"
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr "layer 분리"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "데이터가 새로운 레이어에 다운로드 되어야하는지 선택"
+
msgid "Download Location"
msgstr "위치로부터 다운로드"
@@ -958,12 +973,6 @@ msgstr "다이얼로그를 닫고 다운로드를 취소"
msgid "Download Data"
msgstr "데이터 다운로드"
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr "확인"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1754,9 +1763,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3934,9 +3940,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3966,12 +3969,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4663,12 +4681,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4685,8 +4709,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5007,9 +5031,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr "{0}은 {1}에서 완료되었습니다"
-
msgid "Enlarge"
msgstr ""
@@ -5148,82 +5169,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5389,6 +5334,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5448,7 +5469,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6838,212 +6859,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8149,6 +8170,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9640,6 +9664,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9652,9 +9679,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9751,14 +9775,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9771,6 +9787,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10759,6 +10778,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10771,6 +10793,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10783,6 +10817,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10842,6 +10879,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10860,9 +10902,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12057,6 +12106,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13092,6 +13147,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13113,12 +13174,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14078,6 +14133,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14566,13 +14624,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14596,7 +14657,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14647,7 +14711,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14656,10 +14720,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14695,6 +14771,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14740,10 +14822,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14776,34 +14864,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14842,6 +14970,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14875,9 +15009,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14934,9 +15065,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14964,9 +15092,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15000,9 +15125,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15039,19 +15209,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15114,9 +15293,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15150,12 +15341,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15282,9 +15495,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15294,6 +15504,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15315,12 +15539,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15342,6 +15584,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15384,6 +15629,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15405,6 +15653,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15420,6 +15674,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15447,9 +15704,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15471,9 +15773,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15483,9 +15782,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15797,7 +16093,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15885,6 +16181,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18281,6 +18580,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19329,6 +19631,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19395,6 +19703,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20338,31 +20652,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20954,6 +21256,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22247,6 +22553,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23060,9 +23369,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24107,6 +24413,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24198,6 +24507,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24274,6 +24589,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24298,6 +24618,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25071,6 +25394,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25113,7 +25446,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25916,6 +26249,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25957,8 +26293,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27556,6 +27892,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29717,9 +30112,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29877,9 +30269,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29937,6 +30326,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30134,9 +30526,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/ky.po b/i18n/po/ky.po
index edf484e..da7fc16 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:54+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:58+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -63,9 +63,15 @@ msgstr ""
msgid "Help"
msgstr "Жардам"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -200,6 +206,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -221,12 +233,6 @@ msgstr "Ката"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -707,6 +713,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -728,9 +737,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -781,6 +787,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -930,16 +939,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -948,6 +957,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -963,12 +978,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1761,9 +1770,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3949,9 +3955,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3981,12 +3984,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4679,12 +4697,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4701,8 +4725,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5023,9 +5047,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5164,82 +5185,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5405,6 +5350,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5464,7 +5485,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6856,212 +6877,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8167,6 +8188,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9653,6 +9677,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9665,9 +9692,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9764,14 +9788,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9784,6 +9800,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10772,6 +10791,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10784,6 +10806,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10796,6 +10830,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10855,6 +10892,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10873,9 +10915,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12070,6 +12119,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13105,6 +13160,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13126,12 +13187,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14091,6 +14146,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14579,13 +14637,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14609,7 +14670,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14660,7 +14724,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14669,10 +14733,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14708,6 +14784,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14753,10 +14835,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14789,34 +14877,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14855,6 +14983,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14888,9 +15022,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14947,9 +15078,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14977,9 +15105,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15013,9 +15138,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15052,19 +15222,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15127,9 +15306,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15163,12 +15354,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15295,9 +15508,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15307,6 +15517,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15328,12 +15552,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15355,6 +15597,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15397,6 +15642,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15418,6 +15666,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15433,6 +15687,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15460,9 +15717,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15484,9 +15786,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15496,9 +15795,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15810,7 +16106,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15898,6 +16194,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18294,6 +18593,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19342,6 +19644,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19408,6 +19716,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20351,31 +20665,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20967,6 +21269,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22260,6 +22566,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23073,9 +23382,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24120,6 +24426,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24211,6 +24520,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24287,6 +24602,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24311,6 +24631,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25084,6 +25407,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25126,7 +25459,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25929,6 +26262,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25970,8 +26306,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27569,6 +27905,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29730,9 +30125,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29890,9 +30282,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29950,6 +30339,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30147,9 +30539,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/lb.po b/i18n/po/lb.po
index 5656f18..27ab10d 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:57+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:01+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}:D''Optioun \"{1}\" ass net eendeiteg"
@@ -63,9 +63,15 @@ msgstr ""
msgid "Help"
msgstr ""
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -200,6 +206,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -221,12 +233,6 @@ msgstr ""
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -707,6 +713,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -728,9 +737,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -781,6 +787,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -930,16 +939,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -948,6 +957,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -963,12 +978,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1761,9 +1770,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3949,9 +3955,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3981,12 +3984,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4679,12 +4697,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4701,8 +4725,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5023,9 +5047,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5164,82 +5185,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5405,6 +5350,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5464,7 +5485,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6856,212 +6877,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8167,6 +8188,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9653,6 +9677,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9665,9 +9692,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9764,14 +9788,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9784,6 +9800,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10772,6 +10791,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10784,6 +10806,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10796,6 +10830,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10855,6 +10892,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10873,9 +10915,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12070,6 +12119,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13105,6 +13160,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13126,12 +13187,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14091,6 +14146,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14579,13 +14637,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14609,7 +14670,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14660,7 +14724,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14669,10 +14733,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14708,6 +14784,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14753,10 +14835,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14789,34 +14877,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14855,6 +14983,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14888,9 +15022,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14947,9 +15078,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14977,9 +15105,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15013,9 +15138,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15052,19 +15222,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15127,9 +15306,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15163,12 +15354,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15295,9 +15508,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15307,6 +15517,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15328,12 +15552,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15355,6 +15597,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15397,6 +15642,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15418,6 +15666,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15433,6 +15687,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15460,9 +15717,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15484,9 +15786,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15496,9 +15795,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15810,7 +16106,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15898,6 +16194,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18294,6 +18593,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19342,6 +19644,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19408,6 +19716,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20351,31 +20665,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20967,6 +21269,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22260,6 +22566,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23073,9 +23382,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24120,6 +24426,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24211,6 +24520,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24287,6 +24602,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24311,6 +24631,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25084,6 +25407,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25126,7 +25459,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25929,6 +26262,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25970,8 +26306,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27569,6 +27905,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29730,9 +30125,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29890,9 +30282,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29950,6 +30339,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30147,9 +30539,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/lo.po b/i18n/po/lo.po
index 153c39b..de5a189 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:55+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:59+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr "ຊ່ວຍເຫຼືອ"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr "ບັນຫາໃນການປະຕິບັດ"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr "ເພີ້ມຂໍ້"
@@ -708,6 +714,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -729,9 +738,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -782,6 +788,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -931,16 +940,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -949,6 +958,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -964,12 +979,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1762,9 +1771,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3950,9 +3956,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3982,12 +3985,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4680,12 +4698,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4702,8 +4726,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5024,9 +5048,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5165,82 +5186,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5406,6 +5351,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5465,7 +5486,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6857,212 +6878,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8168,6 +8189,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9654,6 +9678,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9666,9 +9693,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9765,14 +9789,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9785,6 +9801,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10773,6 +10792,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10785,6 +10807,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10797,6 +10831,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10856,6 +10893,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10874,9 +10916,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12071,6 +12120,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13106,6 +13161,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13127,12 +13188,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14092,6 +14147,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14580,13 +14638,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14610,7 +14671,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14661,7 +14725,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14670,10 +14734,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14709,6 +14785,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14754,10 +14836,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14790,34 +14878,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14856,6 +14984,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14889,9 +15023,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14948,9 +15079,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14978,9 +15106,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15014,9 +15139,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15053,19 +15223,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15128,9 +15307,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15164,12 +15355,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15296,9 +15509,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15308,6 +15518,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15329,12 +15553,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15356,6 +15598,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15398,6 +15643,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15419,6 +15667,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15434,6 +15688,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15461,9 +15718,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15485,9 +15787,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15497,9 +15796,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15811,7 +16107,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15899,6 +16195,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18295,6 +18594,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19343,6 +19645,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19409,6 +19717,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20352,31 +20666,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20968,6 +21270,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22261,6 +22567,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23074,9 +23383,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24121,6 +24427,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24212,6 +24521,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24288,6 +24603,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24312,6 +24632,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25085,6 +25408,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25127,7 +25460,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25930,6 +26263,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25971,8 +26307,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27570,6 +27906,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29731,9 +30126,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29891,9 +30283,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29951,6 +30340,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30148,9 +30540,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/lt.po b/i18n/po/lt.po
index 7f7e025..e808c71 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: 2016-11-06 22:51+0100\n"
-"PO-Revision-Date: 2016-09-13 19:41+0000\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
+"PO-Revision-Date: 2016-12-01 19:23+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: 2016-11-07 04:56+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:00+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: lt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -65,9 +65,15 @@ msgstr "Kuriamas pagrindinis meniu"
msgid "Help"
msgstr "Žinynas"
+msgid "Initializing internal boundaries data"
+msgstr "Inicijuojami vidiniai ribų duomenys"
+
msgid "Initializing OSM API"
msgstr "Inicijuojamas OSM API"
+msgid "Initializing internal traffic data"
+msgstr "Inicijuojami vidiniai eismo duomenys"
+
msgid "Initializing validator"
msgstr "Inicijuojamas validatorius"
@@ -213,6 +219,12 @@ msgid ""
msgstr ""
"Žemėlapyje pažymėti elementus, kurie pažymėti aukščiau esančiame sąraše."
+msgid "Select WMS layers"
+msgstr "Parinkite WMS sluoksnius"
+
+msgid "Add layers"
+msgstr "Pridėti sluoksnius"
+
msgid "Add imagery layer {0}"
msgstr "Pridėti vaizdų sluoksnį {0}"
@@ -234,12 +246,6 @@ msgstr "Klaida"
msgid "Select image format for WMS layer"
msgstr "Parinkite WMS sluoksnio piešinio formatą"
-msgid "Select WMS layers"
-msgstr "Parinkite WMS sluoksnius"
-
-msgid "Add layers"
-msgstr "Pridėti sluoksnius"
-
msgid "Add Node..."
msgstr "Pridėti tašką..."
@@ -750,6 +756,9 @@ msgstr "Eiti į poziciją"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Atveria dialogą, leidžiantį peršokti į konkrečią vietą"
+msgid "Jump to Position"
+msgstr "Eiti į poziciją"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Persikėlimui į vietą įveskite platumą/ilgumą."
@@ -771,9 +780,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Eiti čia"
-msgid "Jump to Position"
-msgstr "Eiti į poziciją"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Nepavyko išnagrinėti platumos, ilgumos ir mastelio. Prašome patikrinti."
@@ -827,6 +833,9 @@ msgstr "Sujungti sluoksnius"
msgid "Merge the current layer into another layer"
msgstr "Sujungti aktyvų sluoksnį su kitu sluoksniu"
+msgid "{0} completed in {1}"
+msgstr "{0} baigta per {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Sujungiami sluoksniai su skirtingomis išsiuntimo strategijomis"
@@ -997,24 +1006,30 @@ msgstr[2] "Atveriama {0} failų..."
msgid "Opening file ''{0}'' ..."
msgstr "Atveriamas failas „{0}“..."
+msgid "Which tasks to perform?"
+msgstr "Kurias užduotis vykdyti?"
+
+msgid "Ok"
+msgstr "Gerai"
+
msgid "Open Location..."
msgstr "Atverti vietą..."
msgid "Open an URL."
msgstr "Atverti URL."
-msgid "Separate Layer"
-msgstr "Atskirti sluoksnius"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Pasirinkite, ar duomenys turi būti parsiųsti į naują sluoksnį"
-
msgid "Enter URL to download:"
msgstr "Įveskite URL parsiuntimui:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Įveskite URL, iš kur turi būti atsiųsti duomenys"
+msgid "Separate Layer"
+msgstr "Atskirti sluoksnius"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Pasirinkite, ar duomenys turi būti parsiųsti į naują sluoksnį"
+
msgid "Download Location"
msgstr "Parsiuntimo vieta"
@@ -1030,12 +1045,6 @@ msgstr "Uždaryti dialogą ir nutraukti atsiuntimą"
msgid "Download Data"
msgstr "Atsiųsti duomenis"
-msgid "Which tasks to perform?"
-msgstr "Kurias užduotis vykdyti?"
-
-msgid "Ok"
-msgstr "Gerai"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1901,9 +1910,6 @@ msgstr "Užklausti ir atsiųsti pakeitimus..."
msgid "Errors during download"
msgstr "Klaidos atsiuntimo metu"
-msgid "Download Geo URL"
-msgstr "Atsiųsti Geo URL"
-
msgid "Download GPS"
msgstr "Atsiųsti GPS"
@@ -4298,9 +4304,6 @@ msgstr "Ploto tipo kelias neuždaras"
msgid "No outer way for multipolygon"
msgstr "Multipoligonas neturi išorinio kelio"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "„{0}“ rolė turėtų būti „{1}“"
-
msgid "No area style for multipolygon"
msgstr "Multipoligonas neturi ploto stiliaus"
@@ -4338,12 +4341,27 @@ msgstr "Ploto stilius išoriniame kelyje"
msgid "Multipolygon is not closed"
msgstr "Neuždaras multipoligonas"
-msgid "Multipolygon inner way is outside"
-msgstr "Multipoligono vidinis kelias yra išorėje"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "Multipoligono kelių susikirtimas"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "„{0}“ rolė turėtų būti „{1}“"
+
+msgid "Multipolygon inner way is outside"
+msgstr "Multipoligono vidinis kelias yra išorėje"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "Nėra naudingos multipoligono nario rolės"
@@ -5054,12 +5072,18 @@ msgstr "Išjungti prieigą prie nurodytų resursų, atskirtų kableliu"
msgid "options provided as Java system properties"
msgstr "parinktys, pateiktos kaip Java sistemos savybės"
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/KELIAS/IKI/JOSM/NUSTATYMŲ "
msgid "Set the preferences directory"
msgstr "Nurodyti nustatymų aplanką"
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/KELIAS/IKI/JOSM/NAUDOTOJO_DUOMENŲ"
@@ -5076,11 +5100,9 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/KELIAS/IKI/JOSM/NAMŲ_APLANKO "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Perkelti visus 3 aplankus į namų aplanką. Podėlio aplankas bus "
-"namų_aplankas/cache"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5430,9 +5452,6 @@ msgstr "Spauskite, kad vykdytumėte darbą fone"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} baigta per {1}"
-
msgid "Enlarge"
msgstr "Išplėsti"
@@ -5578,6 +5597,191 @@ msgstr "Konflikto fonas: išimti narį"
msgid "Conflict foreground: remove member"
msgstr "Konflikto tekstas: išimti narį"
+msgid "{0} more..."
+msgstr "{0} daugiau..."
+
+msgid ""
+"The following objects could not be copied to the target object<br>because "
+"they are deleted in the target dataset:"
+msgstr ""
+"Šių objektų nepavyko nukopijuoti į paskirties objektą,<br>nes jie pašalinti "
+"paskirties duomenų rinkinyje:"
+
+msgid "Merging deleted objects failed"
+msgstr "Nepavyko sulieti ištrintų objektų"
+
+msgid "List in role {0} is currently not participating in a compare pair."
+msgstr "Rolės {0} sąrašas šiuo metu nedalyvauja lyginimo poroje."
+
+msgid "Unexpected value of parameter ''index''. Got {0}."
+msgstr "Netikėta parametro „index“ reikšmė. Gauta {0}."
+
+msgid "Item {0} not found in list."
+msgstr "Elementas {0} nerastas sąraše."
+
+msgid "lock scrolling"
+msgstr "užrakinti prasukimą"
+
+msgid "Compare "
+msgstr "Palyginti "
+
+msgid "My version"
+msgstr "Mano versija"
+
+msgid "List of elements in my dataset, i.e. the local dataset"
+msgstr "Mano duomenų aibės elementų sąrašas, pvz. lokali duomenų aibė."
+
+msgid "Merged version"
+msgstr "Sulieta versija"
+
+msgid ""
+"List of merged elements. They will replace the list of my elements when the "
+"merge decisions are applied."
+msgstr ""
+"Sulietų elementų sąrašas. Jie pakeis mano elementų sąrašą, kai bus "
+"pritaikyti suliejimo sprendimai."
+
+msgid "Their version"
+msgstr "Jų versija"
+
+msgid "List of elements in their dataset, i.e. the server dataset"
+msgstr "Jų duomenų aibės elementų sąrašas, pvz. serverio duomenų aibė"
+
+msgid "> top"
+msgstr "> viršus"
+
+msgid "Copy my selected nodes to the start of the merged node list"
+msgstr "Kopijuoti mano pažymėtus taškus į sulieto taškų sąrašo pradžią"
+
+msgid "> bottom"
+msgstr "> apačia"
+
+msgid "Copy my selected elements to the end of the list of merged elements."
+msgstr ""
+"Kopijuoti mano pažymėtus elementus į sulieto elementų sąrašo pabaigą."
+
+msgid "> before"
+msgstr "> prieš"
+
+msgid ""
+"Copy my selected elements before the first selected element in the list of "
+"merged elements."
+msgstr ""
+"Kopijuoti mano pažymėtus elementus prieš pirmą pažymėtą elementą sulietų "
+"elementų sąraše."
+
+msgid "> after"
+msgstr "> po to"
+
+msgid ""
+"Copy my selected elements after the first selected element in the list of "
+"merged elements."
+msgstr ""
+"Kopijuoti mano pažymėtos elementus po pirmo pažymėto elemento sulietų "
+"elementų sąraše."
+
+msgid "< top"
+msgstr "< viršus"
+
+msgid ""
+"Copy their selected element to the start of the list of merged elements."
+msgstr "Kopijuoti jų pažymėtus elementus į sulietų elementų sąrašo pradžią."
+
+msgid "< bottom"
+msgstr "< apačia"
+
+msgid ""
+"Copy their selected elements to the end of the list of merged elements."
+msgstr "Kopijuoti jų parinktus elementus į sulietų elementų sąrašo pabaigą."
+
+msgid "< before"
+msgstr "< prieš"
+
+msgid ""
+"Copy their selected elements before the first selected element in the list "
+"of merged elements."
+msgstr ""
+"Kopijuoti jų pažymėtus elementus prieš pirmą pažymėta sulietų elementų "
+"sąrašo elementą."
+
+msgid "< after"
+msgstr "< po"
+
+msgid ""
+"Copy their selected element after the first selected element in the list of "
+"merged elements"
+msgstr ""
+"Kopijuoti jų pažymėtą elementą po pirmo pažymėto elemento sulietų elementų "
+"sąraše"
+
+msgid "Copy all my elements to the target"
+msgstr "Kopijuoti visus mano elementus į paskirtį"
+
+msgid "Copy all their elements to the target"
+msgstr "Kopijuoti visus jų elementus į paskirtį"
+
+msgid "Up"
+msgstr "Aukštyn"
+
+msgid "Move up the selected entries by one position."
+msgstr "Pakelti pažymėtus įrašus viena pozicija aukštyn"
+
+msgid "Down"
+msgstr "Žemyn"
+
+msgid "Move down the selected entries by one position."
+msgstr "Nuleisti pažymėtus įrašus viena pozicija žemyn"
+
+msgid "Remove"
+msgstr "Pašalinti"
+
+msgid "Remove the selected entries from the list of merged elements."
+msgstr "Išimti pažymėtus įrašus iš sulietų elementų sąrašo."
+
+msgid "Freeze"
+msgstr "Fiksuoti"
+
+msgid "Freeze the current list of merged elements."
+msgstr "Užšaldyti dabartinį sulietų elementų sąrašą."
+
+msgid "Unfreeze"
+msgstr "Nefiksuoti"
+
+msgid "Unfreeze the list of merged elements and start merging."
+msgstr "Atšaldyti sulietų elementų sąrašą ir pradėti suliejimą."
+
+msgid ""
+"<html>Click <strong>{0}</strong> to start merging my and their "
+"entries.</html>"
+msgstr ""
+"<html>Spauskite <strong>{0}</strong>, kad pradėtumėte mano ir jų įrašų "
+"suliejimą.</html>"
+
+msgid ""
+"<html>Click <strong>{0}</strong> to finish merging my and their "
+"entries.</html>"
+msgstr ""
+"<html>Spauskite <strong>{0}</strong>, kad baigtumėte mano ir jų įrašų "
+"suliejimą.</html>"
+
+msgid "My version ({0} entry)"
+msgid_plural "My version ({0} entries)"
+msgstr[0] "Mano versija ({0} įrašas)"
+msgstr[1] "Mano versija ({0} įrašai)"
+msgstr[2] "Mano versija ({0} įrašų)"
+
+msgid "Merged version ({0} entry)"
+msgid_plural "Merged version ({0} entries)"
+msgstr[0] "Sulieta versija ({0} įrašas)"
+msgstr[1] "Sulieta versija ({0} įrašai)"
+msgstr[2] "Sulieta versija ({0} įrašų)"
+
+msgid "Their version ({0} entry)"
+msgid_plural "Their version ({0} entries)"
+msgstr[0] "Jų versija ({0} įrašas)"
+msgstr[1] "Jų versija ({0} įrašai)"
+msgstr[2] "Jų versija ({0} įrašų)"
+
msgid "My with Their"
msgstr "Mano su jų"
@@ -5660,191 +5864,6 @@ msgstr "Spręstini savybių konfliktai"
msgid "Conflict Resolution"
msgstr "Konflikto sprendimas"
-msgid "{0} more..."
-msgstr "{0} daugiau..."
-
-msgid ""
-"The following objects could not be copied to the target object<br>because "
-"they are deleted in the target dataset:"
-msgstr ""
-"Šių objektų nepavyko nukopijuoti į paskirties objektą,<br>nes jie pašalinti "
-"paskirties duomenų rinkinyje:"
-
-msgid "Merging deleted objects failed"
-msgstr "Nepavyko sulieti ištrintų objektų"
-
-msgid "List in role {0} is currently not participating in a compare pair."
-msgstr "Rolės {0} sąrašas šiuo metu nedalyvauja lyginimo poroje."
-
-msgid "Unexpected value of parameter ''index''. Got {0}."
-msgstr "Netikėta parametro „index“ reikšmė. Gauta {0}."
-
-msgid "Item {0} not found in list."
-msgstr "Elementas {0} nerastas sąraše."
-
-msgid "lock scrolling"
-msgstr "užrakinti prasukimą"
-
-msgid "Compare "
-msgstr "Palyginti "
-
-msgid "My version"
-msgstr "Mano versija"
-
-msgid "List of elements in my dataset, i.e. the local dataset"
-msgstr "Mano duomenų aibės elementų sąrašas, pvz. lokali duomenų aibė."
-
-msgid "Merged version"
-msgstr "Sulieta versija"
-
-msgid ""
-"List of merged elements. They will replace the list of my elements when the "
-"merge decisions are applied."
-msgstr ""
-"Sulietų elementų sąrašas. Jie pakeis mano elementų sąrašą, kai bus "
-"pritaikyti suliejimo sprendimai."
-
-msgid "Their version"
-msgstr "Jų versija"
-
-msgid "List of elements in their dataset, i.e. the server dataset"
-msgstr "Jų duomenų aibės elementų sąrašas, pvz. serverio duomenų aibė"
-
-msgid "> top"
-msgstr "> viršus"
-
-msgid "Copy my selected nodes to the start of the merged node list"
-msgstr "Kopijuoti mano pažymėtus taškus į sulieto taškų sąrašo pradžią"
-
-msgid "> bottom"
-msgstr "> apačia"
-
-msgid "Copy my selected elements to the end of the list of merged elements."
-msgstr ""
-"Kopijuoti mano pažymėtus elementus į sulieto elementų sąrašo pabaigą."
-
-msgid "> before"
-msgstr "> prieš"
-
-msgid ""
-"Copy my selected elements before the first selected element in the list of "
-"merged elements."
-msgstr ""
-"Kopijuoti mano pažymėtus elementus prieš pirmą pažymėtą elementą sulietų "
-"elementų sąraše."
-
-msgid "> after"
-msgstr "> po to"
-
-msgid ""
-"Copy my selected elements after the first selected element in the list of "
-"merged elements."
-msgstr ""
-"Kopijuoti mano pažymėtos elementus po pirmo pažymėto elemento sulietų "
-"elementų sąraše."
-
-msgid "< top"
-msgstr "< viršus"
-
-msgid ""
-"Copy their selected element to the start of the list of merged elements."
-msgstr "Kopijuoti jų pažymėtus elementus į sulietų elementų sąrašo pradžią."
-
-msgid "< bottom"
-msgstr "< apačia"
-
-msgid ""
-"Copy their selected elements to the end of the list of merged elements."
-msgstr "Kopijuoti jų parinktus elementus į sulietų elementų sąrašo pabaigą."
-
-msgid "< before"
-msgstr "< prieš"
-
-msgid ""
-"Copy their selected elements before the first selected element in the list "
-"of merged elements."
-msgstr ""
-"Kopijuoti jų pažymėtus elementus prieš pirmą pažymėta sulietų elementų "
-"sąrašo elementą."
-
-msgid "< after"
-msgstr "< po"
-
-msgid ""
-"Copy their selected element after the first selected element in the list of "
-"merged elements"
-msgstr ""
-"Kopijuoti jų pažymėtą elementą po pirmo pažymėto elemento sulietų elementų "
-"sąraše"
-
-msgid "Copy all my elements to the target"
-msgstr "Kopijuoti visus mano elementus į paskirtį"
-
-msgid "Copy all their elements to the target"
-msgstr "Kopijuoti visus jų elementus į paskirtį"
-
-msgid "Up"
-msgstr "Aukštyn"
-
-msgid "Move up the selected entries by one position."
-msgstr "Pakelti pažymėtus įrašus viena pozicija aukštyn"
-
-msgid "Down"
-msgstr "Žemyn"
-
-msgid "Move down the selected entries by one position."
-msgstr "Nuleisti pažymėtus įrašus viena pozicija žemyn"
-
-msgid "Remove"
-msgstr "Pašalinti"
-
-msgid "Remove the selected entries from the list of merged elements."
-msgstr "Išimti pažymėtus įrašus iš sulietų elementų sąrašo."
-
-msgid "Freeze"
-msgstr "Fiksuoti"
-
-msgid "Freeze the current list of merged elements."
-msgstr "Užšaldyti dabartinį sulietų elementų sąrašą."
-
-msgid "Unfreeze"
-msgstr "Nefiksuoti"
-
-msgid "Unfreeze the list of merged elements and start merging."
-msgstr "Atšaldyti sulietų elementų sąrašą ir pradėti suliejimą."
-
-msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their "
-"entries.</html>"
-msgstr ""
-"<html>Spauskite <strong>{0}</strong>, kad pradėtumėte mano ir jų įrašų "
-"suliejimą.</html>"
-
-msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their "
-"entries.</html>"
-msgstr ""
-"<html>Spauskite <strong>{0}</strong>, kad baigtumėte mano ir jų įrašų "
-"suliejimą.</html>"
-
-msgid "My version ({0} entry)"
-msgid_plural "My version ({0} entries)"
-msgstr[0] "Mano versija ({0} įrašas)"
-msgstr[1] "Mano versija ({0} įrašai)"
-msgstr[2] "Mano versija ({0} įrašų)"
-
-msgid "Merged version ({0} entry)"
-msgid_plural "Merged version ({0} entries)"
-msgstr[0] "Sulieta versija ({0} įrašas)"
-msgstr[1] "Sulieta versija ({0} įrašai)"
-msgstr[2] "Sulieta versija ({0} įrašų)"
-
-msgid "Their version ({0} entry)"
-msgid_plural "Their version ({0} entries)"
-msgstr[0] "Jų versija ({0} įrašas)"
-msgstr[1] "Jų versija ({0} įrašai)"
-msgstr[2] "Jų versija ({0} įrašų)"
-
msgid "Node"
msgstr "Taškas"
@@ -5906,8 +5925,8 @@ msgstr "Rolė"
msgid "Primitive"
msgstr "Primityvas"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
-msgstr "Sulieti taškai dar neužšaldyti. Negalima sukurti sprendimo komandos"
+msgid "Merged members not frozen yet. Cannot build resolution command"
+msgstr ""
msgid "<undefined>"
msgstr "<neapibrėžta>"
@@ -7423,100 +7442,6 @@ msgid "Select only changesets related to a specific bounding box"
msgstr ""
"Pažymėti tik pakeitimus, susijusius su konkrečiu apimties stačiakampiu"
-msgid "Query open changesets only"
-msgstr "Ieškoti tik atvertuose pakeitimuose"
-
-msgid "Query closed changesets only"
-msgstr "Ieškoti tik užvertuose pakeitimuose"
-
-msgid "Query both open and closed changesets"
-msgstr "Ieškoti ir atvertuose, ir užvertuose pakeitimuose"
-
-msgid "Only changesets owned by myself"
-msgstr "Tik pakeitimuose, priklausančiuose man"
-
-msgid "User ID:"
-msgstr "Naudotojo ID:"
-
-msgid "User name:"
-msgstr "Naudotojo vardas:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Tik pakeitimai, priklausantys naudotojui su šiuo naudotojo ID"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "Tik pakeitimai, priklausantys naudotojui su šiuo naudotojo vardu"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Tik man priklausantys pakeitimai (išjungta. JOSM šiuo metu veikia kaip "
-"anoniminis naudotojas)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Negalima apriboti pakeitimų užklausos dabartiniu naudotoju, nes dabartinis "
-"naudotojas yra anonimas"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "Dabartinė naudotojo ID reikšmė „{0}“ yra netinkama"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr "Negalima apriboti pakeitimų užklausos naudotojo vardu „{0}“"
-
-msgid "Please enter a valid user ID"
-msgstr "Įveskite tinkamą naudotojo ID"
-
-msgid "Invalid user ID"
-msgstr "Netinkamas naudotojo ID"
-
-msgid "Please enter a non-empty user name"
-msgstr "Prašome įvesti ne tuščią naudotojo vardą"
-
-msgid "Invalid user name"
-msgstr "Klaidingas naudotojo vardas"
-
-msgid "Date: "
-msgstr "Data: "
-
-msgid "Time:"
-msgstr "Laikas:"
-
-msgid "Closed after - "
-msgstr "Užvertas po - "
-
-msgid "Date:"
-msgstr "Data:"
-
-msgid "Created before - "
-msgstr "Sukurtas prieš - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Tik pakeitimai, užverti po šios datos/laiko"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr "Tik pakeitimai, užverti po ir sukurti prieš nurodytą datą/laiką"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"Negalima sukurti pakeitimų užklausos su laiko apribojimais. Netinkama "
-"įvestis."
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr ""
-"<html>Prašome įvesti tinkamas datos/laiko reikšmes, kad "
-"apribotumėte<br>užklausą konkrečiame laiko intervale.</html>"
-
-msgid "Invalid date/time values"
-msgstr "Netinkamos datos/laiko reikšmės"
-
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
"invalid."
@@ -7534,29 +7459,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Netinkamas apribojantis stačiakampis"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"Dabartinė reikšmė netinka naudotojo ID. Prašome įvesti teigiamą sveiką "
-"skaičių"
-
-msgid "Please enter an integer value > 0"
-msgstr "Prašome įvesti teigiamą sveiką skaičių"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Prašome įvesti datą jūsų lokalei įprastu formatu.<br>Pavyzdžiui: "
-"{0}<br>Pavyzdžiui: {1}<br>Pavyzdžiui: {2}<br>Pavyzdžiui: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Prašome įvesti tinkamą laiką įprastu jūsų lokalei formatu.<br>Pavyzdys: "
-"{0}<br>Pavyzdys: {1}<br>Pavyzdys: {2}<br>Pavyzdys: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Atsiųsti tik mano pakeitimus"
@@ -7644,6 +7546,76 @@ msgstr "Netinkamas pakeitimų užklausos URL"
msgid "Close the dialog and abort querying of changesets"
msgstr "Užverti dialogo langą ir nutraukti pakeitimų užklausą"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Prašome įvesti datą jūsų lokalei įprastu formatu.<br>Pavyzdžiui: "
+"{0}<br>Pavyzdžiui: {1}<br>Pavyzdžiui: {2}<br>Pavyzdžiui: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Ieškoti tik atvertuose pakeitimuose"
+
+msgid "Query closed changesets only"
+msgstr "Ieškoti tik užvertuose pakeitimuose"
+
+msgid "Query both open and closed changesets"
+msgstr "Ieškoti ir atvertuose, ir užvertuose pakeitimuose"
+
+msgid "Date: "
+msgstr "Data: "
+
+msgid "Time:"
+msgstr "Laikas:"
+
+msgid "Closed after - "
+msgstr "Užvertas po - "
+
+msgid "Date:"
+msgstr "Data:"
+
+msgid "Created before - "
+msgstr "Sukurtas prieš - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Tik pakeitimai, užverti po šios datos/laiko"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr "Tik pakeitimai, užverti po ir sukurti prieš nurodytą datą/laiką"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Negalima sukurti pakeitimų užklausos su laiko apribojimais. Netinkama "
+"įvestis."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Prašome įvesti tinkamas datos/laiko reikšmes, kad "
+"apribotumėte<br>užklausą konkrečiame laiko intervale.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Netinkamos datos/laiko reikšmės"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Prašome įvesti tinkamą laiką įprastu jūsų lokalei formatu.<br>Pavyzdys: "
+"{0}<br>Pavyzdys: {1}<br>Pavyzdys: {2}<br>Pavyzdys: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"Dabartinė reikšmė netinka naudotojo ID. Prašome įvesti teigiamą sveiką "
+"skaičių"
+
+msgid "Please enter an integer value > 0"
+msgstr "Prašome įvesti teigiamą sveiką skaičių"
+
msgid "URL: "
msgstr "URL: "
@@ -7663,6 +7635,53 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Šis pakeitimų užklausos URL yra netinkamas"
+msgid "Only changesets owned by myself"
+msgstr "Tik pakeitimuose, priklausančiuose man"
+
+msgid "User ID:"
+msgstr "Naudotojo ID:"
+
+msgid "User name:"
+msgstr "Naudotojo vardas:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Tik pakeitimai, priklausantys naudotojui su šiuo naudotojo ID"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "Tik pakeitimai, priklausantys naudotojui su šiuo naudotojo vardu"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Tik man priklausantys pakeitimai (išjungta. JOSM šiuo metu veikia kaip "
+"anoniminis naudotojas)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Negalima apriboti pakeitimų užklausos dabartiniu naudotoju, nes dabartinis "
+"naudotojas yra anonimas"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "Dabartinė naudotojo ID reikšmė „{0}“ yra netinkama"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr "Negalima apriboti pakeitimų užklausos naudotojo vardu „{0}“"
+
+msgid "Please enter a valid user ID"
+msgstr "Įveskite tinkamą naudotojo ID"
+
+msgid "Invalid user ID"
+msgstr "Netinkamas naudotojo ID"
+
+msgid "Please enter a non-empty user name"
+msgstr "Prašome įvesti ne tuščią naudotojo vardą"
+
+msgid "Invalid user name"
+msgstr "Klaidingas naudotojo vardas"
+
msgid "Activate"
msgstr "Aktyvinti"
@@ -8854,6 +8873,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10545,6 +10567,9 @@ msgstr "Kryptis"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audio failas (*.wav)"
+
msgid "Import Audio"
msgstr "Importuoti garsą"
@@ -10559,9 +10584,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Importas neįmanomas"
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audio failas (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Garso žymekliai iš {0}"
@@ -10674,16 +10696,6 @@ msgstr "(URL buvo: "
msgid "Select the map painting styles"
msgstr "Parinkite žemėlapio paišymo stilius"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "Nepavyko įkelti žemėlapio paišymo stilių iš „{0}“. Klaida buvo: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-"JOSM nebepalaiko žemėlapių paišymo stiliaus, parašytos senu XML formatu.\n"
-"Prašome atnaujinti ''{0}'' į MapCSS"
-
msgid "loading style ''{0}''..."
msgstr "įkeliamas stilius „{0}“..."
@@ -10703,6 +10715,9 @@ msgstr[2] ""
"Įkeliant šį stilių įvyko {0} klaidų. Parinkite „Info“ iš dešinio paspaudimo "
"meniu, kad gautumėte daugiau informacijos."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "Nepavyko įkelti žemėlapio paišymo stilių iš „{0}“. Klaida buvo: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Nepavyko išnagrinėti žemėlapio paišymo stilių iš „{0}“. Klaida: {1}"
@@ -11807,6 +11822,9 @@ msgstr ""
msgid "Track date"
msgstr "Pėdsako data"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Viena spalva (gali būti adaptuota vardiniams sluoksniams)"
@@ -11819,6 +11837,18 @@ msgstr "Dviratis"
msgid "Foot"
msgstr "Pėstieji"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Medžiai"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Sukurti žymeklius skaitant GPX"
@@ -11831,6 +11861,9 @@ msgstr "Dinaminis spalvų rėžis pagal duomenų limitus"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Lyginti GPX grafiką (glodinimas)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11902,6 +11935,11 @@ msgid ""
msgstr "Naudoti GPX linijų glodinimą taip gaunant lygesnį vaizdą."
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11924,9 +11962,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "Spalvina taškus ir pėdsako segmentus pagal laiko žymą."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr "Leidžia derinti pėdsakų spalvą skirtingiems vidutiniams greičiams."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Pėdsako ir taško spalvos"
@@ -13224,6 +13269,12 @@ msgstr "Ieško klaidų religiniuose objektuose"
msgid "Checks for errors on relations"
msgstr "Ieško klaidų ryšiuose"
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr "Nereikalingos žymos"
@@ -14326,6 +14377,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Išsaugoti naudotojo vardą ir slaptažodį (nešifruotą)"
+msgid "Assume"
+msgstr "Prisiminti"
+
+msgid "Existing values"
+msgstr "Egzistuojančios vertės"
+
msgid "<delete from {0} objects>"
msgstr "<ištrinti iš {0} objectų (-o)>"
@@ -14347,12 +14404,6 @@ msgstr "Pridėti patikrintas žymas į pasirinktus objektus"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Enter: Pridėti visas žymas pažymėtiems objektams"
-msgid "Assume"
-msgstr "Prisiminti"
-
-msgid "Existing values"
-msgstr "Egzistuojančios vertės"
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14804,7 +14855,7 @@ msgstr[1] "Papildiniai nebus įkelti."
msgstr[2] "Papildiniai nebus įkelti."
msgid "Determining plugins to load..."
-msgstr ""
+msgstr "Nustatomi papildiniai įkėlimui..."
msgid "Removing deprecated plugins..."
msgstr "Šalinami pasenę papildiniai..."
@@ -15522,6 +15573,9 @@ msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
"Tylus sparčiųjų klavišų konfliktas: „{1}“ perkeltas iš „{0}“ į „{2}“."
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "Rasta {0} žyma buferyje, įtartina!"
@@ -16031,14 +16085,17 @@ msgstr "Mapbox palydovinis"
msgid "OpenCycleMap"
msgstr "OpenCycleMap (pritaikyta dviračiams)"
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik nespalvinis)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, be žymių)"
@@ -16061,8 +16118,11 @@ msgstr "Žygiams ir dviračiams"
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Kambodžos, Laoso, Tailando, Vietnamo daugiakalbinė"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPT žemėlapis (padengtis)"
@@ -16112,8 +16172,8 @@ msgstr "OSM tikrintuvė: vietos"
msgid "OSM Inspector: Highways"
msgstr "OSM tikrintuvė: keliai"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM tikrintuvė: multipoligonas"
+msgid "OSM Inspector: Area"
+msgstr ""
msgid "OSM Inspector: Routing"
msgstr "OSM tikrintuvė: maršruto parinkimas"
@@ -16121,10 +16181,22 @@ msgstr "OSM tikrintuvė: maršruto parinkimas"
msgid "OSM Inspector: Addresses"
msgstr "OSM tikrintuvė: adresai"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM tikrintuvė: ribos (ES)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -16160,6 +16232,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -16205,10 +16283,16 @@ msgstr "VoGIS: Flächenwidmungsplan"
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -16244,7 +16328,16 @@ msgstr "SPW(allonie) 2009-2010 aeronuotraukos"
msgid "TEC bus lines (2014)"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
msgstr ""
msgid "IBGE Mapa de Setores Urbanos"
@@ -16253,6 +16346,15 @@ msgstr "IBGE Mapa de Setores Urbanos"
msgid "IBGE Mapa de Setores Rurais"
msgstr "IBGE Mapa de Setores Rurais"
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Geobase hidrografija"
@@ -16265,12 +16367,34 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "British Columbia Mosaic (Britų Kolumbija)"
+msgid "Latest southwest British Columbia Landsat"
+msgstr ""
+
msgid "Kelowna 2012"
msgstr "Kelowna 2012"
msgid "Kelowna Roads overlay"
msgstr "Kelowna kelių padengtis"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr ""
+
msgid "Czech CUZK:KM"
msgstr "Čekų CUZK:KM"
@@ -16307,6 +16431,12 @@ msgstr "Stevns (Danija)"
msgid "Vejmidte (Denmark)"
msgstr "Vejmidte (Danija)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Estijos bazinis žemėlapis (Maaamet)"
@@ -16340,9 +16470,6 @@ msgstr "Cadastre"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr "CRAIG - Auvergne 2013 - 25 cm"
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "GrandNancy Orthophotographie 2012"
@@ -16401,9 +16528,6 @@ msgstr ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
"- 1 m"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Sorbų kalba)"
-
msgid "Hamburg (40 cm)"
msgstr "Hamburgas (40 cm)"
@@ -16431,9 +16555,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16469,9 +16590,54 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Rūro metropolis: Luftbilder (10 cm)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Dronų nuotraukos (Haitis)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Dronų nuotraukos 2014 (Haitis)"
@@ -16508,19 +16674,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -16583,9 +16758,21 @@ msgstr "PCN 2012 - Italija"
msgid "South Tyrol Orthofoto 2011"
msgstr "Pietų Tirolio ortoforo 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr "Pietų Tirolio topožemėlapis"
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "Sovietinis - Latvija"
@@ -16619,12 +16806,34 @@ msgstr "Nigerio delta - 2012 m. spalis - Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Gazos ruožas - Pléiades - 2014/07/06"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Gazos ruožas - Pléiades - 2014/07/06 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Pangasinán/Bulacan (Filipinų HiRes)"
@@ -16751,9 +16960,6 @@ msgstr "Šventochlovicai: Ortofotomapa 2012 (oro nuotrauka)"
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Zabžė: Ortofotomapa 2011 (oro nuotrauka)"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Szlaki (takai)"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -16763,6 +16969,20 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk automobiliams"
@@ -16784,12 +17004,30 @@ msgstr "RABA-KGZ: Slovėnijos dirbamos žemės naudojimas"
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr "RABA-KGZ: Slovėnijos užstatytos teritorijos"
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr "Pietų Afrika CD:NGI oro nuotraukos"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr "Catastro Ispanija"
@@ -16811,6 +17049,9 @@ msgstr "IDEIB - Balearų salos"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Kanarų salos"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Argau kantonas 25cm (AGIS 2011)"
@@ -16853,6 +17094,9 @@ msgstr "Friburgo kantonas 50cm (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Berno miestas 10cm/25cm (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -16874,6 +17118,12 @@ msgstr "Bonvillars Orthophoto 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Fyzo Orthophoto 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -16889,6 +17139,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "MSR Maps Topo"
@@ -16916,9 +17169,54 @@ msgstr "NC Latest Orthoimagery"
msgid "U.S. Forest Service roads"
msgstr "JAV miškų aptarnaujamieji keliai"
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ukraina - Ortofotožemėlapiai 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -16940,9 +17238,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6 colių Škotija 1842-82"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k I serijos 1937-61"
@@ -16952,9 +17247,6 @@ msgstr "NLS - OS 1 colio VII serijos 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25k istorinis (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "OS 1:25k istorinis (OSM-ribotas)"
@@ -17266,8 +17558,8 @@ msgstr ""
msgid "Create a grid of ways."
msgstr "Sukurti kelių tinklelį."
-msgid "Customization of public transport stops."
-msgstr "Viešojo transporto stotelių pritaikymas"
+msgid "Customization of public public transport stops."
+msgstr ""
msgid ""
"Creating and handling address nodes and buildings within Czech Republic."
@@ -17358,6 +17650,9 @@ msgstr "Paprastas įrankis pažymėti namų numerius."
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -17648,7 +17943,7 @@ msgid "Plugin to digital sign OSM-Data"
msgstr ""
msgid "Editor to add turn lanes tags in highways"
-msgstr ""
+msgstr "Tvarkytuvė posūkių juostoms keliuose pridėti"
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -17960,7 +18255,7 @@ msgid "Gauge (mm)"
msgstr "Bėgių plotis (mm)"
msgid "Allowed traffic:"
-msgstr ""
+msgstr "Leidžiamas eismas:"
msgid "Horse"
msgstr "Arkliu"
@@ -19416,7 +19711,7 @@ msgid "uncontrolled"
msgstr "nekontroliuojama"
msgid "traffic_signals"
-msgstr ""
+msgstr "šviesoforas"
msgid "island"
msgstr "salelė"
@@ -19485,7 +19780,7 @@ msgid "incorrect"
msgstr ""
msgid "In case of traffic signals:"
-msgstr ""
+msgstr "Jei yra šviesoforas:"
msgid "Traffic Calming"
msgstr "Greičio mažinimo priemonė"
@@ -19766,6 +20061,9 @@ msgstr "Upelis"
msgid "River"
msgstr "Upė"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Kanalas"
@@ -20815,6 +21113,12 @@ msgstr "Motelis"
msgid "Guest House/Bed & Breakfast"
msgstr "Svečių namai/Nakvynė ir pusryčiai"
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Vasarnamis"
@@ -20881,6 +21185,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Greitas Maistas"
@@ -21824,31 +22134,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr "Medžiotojo namelis"
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -22440,6 +22738,10 @@ msgid "hut"
msgstr "trobelė"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22707,7 +23009,7 @@ msgid "Groundwater"
msgstr ""
msgid "Traffic"
-msgstr ""
+msgstr "Eismas"
msgid "Air Quality"
msgstr ""
@@ -22773,7 +23075,7 @@ msgid "parking"
msgstr ""
msgid "traffic"
-msgstr ""
+msgstr "eismas"
msgid "shop"
msgstr "parduotuvė"
@@ -23733,6 +24035,9 @@ msgstr "Mėsininkas"
msgid "Seafood"
msgstr "Jūrų gėrybės"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -24546,9 +24851,6 @@ msgstr "Medžių eilė"
msgid "A line of trees."
msgstr "Medžių eilė."
-msgid "Wood"
-msgstr "Medžiai"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -25600,6 +25902,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0} pasenusi"
@@ -25695,6 +26000,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -25771,6 +26082,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "sutrumpintas gatvės pavadinimas"
@@ -25795,6 +26111,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -26514,7 +26833,7 @@ msgid "images"
msgstr ""
msgid "Traffic sign font at ''{0}'' has wrong format"
-msgstr ""
+msgstr "Kelio ženklo šrifto pozicijoje „{0}“ neteisingas formatas"
msgid "Could not read font-file from ''{0}''"
msgstr ""
@@ -26576,6 +26895,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr "Išsiųsti nuotraukas"
@@ -26618,7 +26947,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -27433,6 +27762,9 @@ msgstr ""
msgid "Area Selector"
msgstr "Ploto parinkiklis"
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -27474,8 +27806,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -29092,6 +29424,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Atverti vaizdų XML failą"
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -30868,7 +31259,7 @@ msgid "Edit Image Coordinates"
msgstr ""
msgid "Edit coordinates in separate editor"
-msgstr ""
+msgstr "Redaguoti koordinates atskiroje tvarkytuvėje"
msgid "altitude"
msgstr ""
@@ -31281,9 +31672,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -31441,9 +31829,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -31501,6 +31886,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr "Viešasis transportas: pakeisti stotelės tipą"
@@ -31609,7 +31997,7 @@ msgid "Relation Toolbox"
msgstr ""
msgid "Open relation/multipolygon editor panel"
-msgstr ""
+msgstr "Atverti ryšių/multipoligono tvarkytuvės panelę"
msgid "Specify role"
msgstr ""
@@ -31687,7 +32075,7 @@ msgid "Duplicate relation"
msgstr ""
msgid "Open relation editor for the chosen relation"
-msgstr ""
+msgstr "Atverti ryšių tvarkytuvę pasirinktam ryšiui"
msgid "Find a relation"
msgstr ""
@@ -31698,9 +32086,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
@@ -32249,7 +32634,7 @@ msgid "OSM Export"
msgstr ""
msgid "Export traffic data to SUMO network file."
-msgstr ""
+msgstr "Eksportuoti eismo duomenis į SUMO tinklo failą."
msgid "SUMO Export"
msgstr ""
@@ -32314,10 +32699,10 @@ msgid "Edit tags"
msgstr "Keisti žymas"
msgid "Launches the tag editor dialog"
-msgstr ""
+msgstr "Paleidžia žymų tvarkytuvės langą"
msgid "JOSM Tag Editor Plugin"
-msgstr "JOSM žymų rengyklės papildinys"
+msgstr "JOSM žymų tvarkytuvės papildinys"
msgid "Abort tag editing and close dialog"
msgstr ""
@@ -32945,16 +33330,16 @@ msgid "Create a new signing key"
msgstr ""
msgid "Turn lanes tagging - editor"
-msgstr ""
+msgstr "Posūkių juostų žymėjimas – tvarkytuvė"
msgid "Turn lanes tagging - Editor"
-msgstr ""
+msgstr "Posūkių juostų žymėjimas – tvarkytuvė"
msgid "turn lanes tagging - editor"
-msgstr ""
+msgstr "posūkių juostų žymėjimas – tvarkytuvė"
msgid "Turn Lanes Editor"
-msgstr ""
+msgstr "Posūkių juostų tvarkytuvė"
msgid " The number of lanes has fixed according number of turns"
msgstr ""
@@ -33449,7 +33834,7 @@ msgid "Removes the member with role ''to''"
msgstr ""
msgid "Fix in editor"
-msgstr ""
+msgstr "Taisyti tvarkytuvėje"
msgid ""
"Go to Basic Editor and manually choose members with roles ''from'' and ''to''"
diff --git a/i18n/po/lv.po b/i18n/po/lv.po
index 89b38f9..ce1a641 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:56+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:00+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: lv\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr "Izveido pamatizvēlni"
msgid "Help"
msgstr "Palīgs"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Sartē OSM API"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Startē validatoru"
@@ -202,6 +208,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr "Pievienot attēla slāni {0}"
@@ -223,12 +235,6 @@ msgstr "Kļūda"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr "Pievienot mezglu..."
@@ -719,6 +725,9 @@ msgstr "Lēkt uz pozīciju"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr "Lēkt uz pozīciju"
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -740,9 +749,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Lēkt tur"
-msgid "Jump to Position"
-msgstr "Lēkt uz pozīciju"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -793,6 +799,9 @@ msgstr "Sapludināt slāni"
msgid "Merge the current layer into another layer"
msgstr "Iepludināt esošo slāni citā slānī."
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -942,24 +951,30 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Labi"
+
msgid "Open Location..."
msgstr "Atvērt vietu..."
msgid "Open an URL."
msgstr "Atvērt URL"
-msgid "Separate Layer"
-msgstr "Atsevišķs slānis"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Izvēlieties, ja datiem jābūt ielādētiem jaunā slānī"
-
msgid "Enter URL to download:"
msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr "Atsevišķs slānis"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Izvēlieties, ja datiem jābūt ielādētiem jaunā slānī"
+
msgid "Download Location"
msgstr "Lejupielādes vieta"
@@ -975,12 +990,6 @@ msgstr "Aizvērt logu un atcelt lejupielādi"
msgid "Download Data"
msgstr "Lejupielādēt datus"
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr "Labi"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1773,9 +1782,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3961,9 +3967,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3993,12 +3996,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4690,12 +4708,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4712,8 +4736,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5034,9 +5058,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5175,82 +5196,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5416,6 +5361,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5475,7 +5496,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6867,212 +6888,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8178,6 +8199,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9664,6 +9688,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9676,9 +9703,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9775,14 +9799,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9795,6 +9811,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10783,6 +10802,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10795,6 +10817,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10807,6 +10841,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10866,6 +10903,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10884,9 +10926,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12081,6 +12130,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13120,6 +13175,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13141,12 +13202,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14106,6 +14161,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14594,13 +14652,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14624,7 +14685,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14675,7 +14739,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14684,10 +14748,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14723,6 +14799,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14768,10 +14850,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14804,34 +14892,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14870,6 +14998,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14903,9 +15037,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14962,9 +15093,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14992,9 +15120,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15028,9 +15153,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15067,19 +15237,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15142,9 +15321,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15178,12 +15369,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15310,9 +15523,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15322,6 +15532,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15343,12 +15567,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15370,6 +15612,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15412,6 +15657,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15433,6 +15681,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15448,6 +15702,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15475,9 +15732,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15499,9 +15801,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15511,9 +15810,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15825,7 +16121,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15913,6 +16209,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18309,6 +18608,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19357,6 +19659,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19423,6 +19731,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20366,31 +20680,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20982,6 +21284,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22275,6 +22581,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23088,9 +23397,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24135,6 +24441,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24226,6 +24535,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24302,6 +24617,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24326,6 +24646,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25099,6 +25422,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25141,7 +25474,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25944,6 +26277,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25985,8 +26321,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27584,6 +27920,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29745,9 +30140,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29905,9 +30297,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29965,6 +30354,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30162,9 +30554,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/mk.po b/i18n/po/mk.po
index 061c02e..6a39307 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:57+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:02+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: mk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr "Создавам главно мени"
msgid "Help"
msgstr "Помош"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Го покревам прилогот на OSM"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Го покревам проверувачот"
@@ -204,6 +210,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -225,12 +237,6 @@ msgstr "Грешка"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr "Додади точка..."
@@ -711,6 +717,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -732,9 +741,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -785,6 +791,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -934,16 +943,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -952,6 +961,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -967,12 +982,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1765,9 +1774,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3953,9 +3959,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3985,12 +3988,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4683,12 +4701,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4705,8 +4729,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5027,9 +5051,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5168,82 +5189,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5409,6 +5354,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5468,7 +5489,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6860,212 +6881,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8171,6 +8192,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9657,6 +9681,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9669,9 +9696,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9768,14 +9792,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9788,6 +9804,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10776,6 +10795,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10788,6 +10810,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10800,6 +10834,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10859,6 +10896,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10877,9 +10919,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12075,6 +12124,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13110,6 +13165,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13131,12 +13192,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14096,6 +14151,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14584,13 +14642,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14614,7 +14675,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14665,7 +14729,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14674,10 +14738,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14713,6 +14789,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14758,10 +14840,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14794,34 +14882,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14860,6 +14988,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14893,9 +15027,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14952,9 +15083,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14982,9 +15110,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15018,9 +15143,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15057,19 +15227,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15132,9 +15311,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15168,12 +15359,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15300,9 +15513,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15312,6 +15522,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15333,12 +15557,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15360,6 +15602,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15402,6 +15647,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15423,6 +15671,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15438,6 +15692,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15465,9 +15722,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15489,9 +15791,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15501,9 +15800,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15815,7 +16111,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15903,6 +16199,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18299,6 +18598,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19347,6 +19649,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19413,6 +19721,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20356,31 +20670,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20972,6 +21274,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22265,6 +22571,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23078,9 +23387,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24125,6 +24431,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24216,6 +24525,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24292,6 +24607,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24316,6 +24636,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25089,6 +25412,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25131,7 +25464,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25934,6 +26267,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25975,8 +26311,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27574,6 +27910,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29735,9 +30130,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29895,9 +30287,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29955,6 +30344,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30152,9 +30544,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/mr.po b/i18n/po/mr.po
index f6022cc..631d0c9 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:58+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:02+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: mr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr "मदत"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "OSM API प्रारंभत आहे"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -203,6 +209,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr "WMS थर निवडा"
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -224,12 +236,6 @@ msgstr ""
msgid "Select image format for WMS layer"
msgstr "WMS थरासाठी प्रतिमा प्रारूप निवडा"
-msgid "Select WMS layers"
-msgstr "WMS थर निवडा"
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -722,6 +728,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -743,9 +752,6 @@ msgstr "URL"
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -796,6 +802,9 @@ msgstr "थर विलीन करा"
msgid "Merge the current layer into another layer"
msgstr "सध्याचा थर दुसऱ्या थरात विलीन करा"
+msgid "{0} completed in {1}"
+msgstr "{0} {1} मध्ये पूर्ण"
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -949,24 +958,30 @@ msgstr[1] "{0} संचिका उघडत आहे..."
msgid "Opening file ''{0}'' ..."
msgstr "संचिका ''{0}'' उघडत आहे ..."
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "ठीक"
+
msgid "Open Location..."
msgstr "ठिकाण उघडा..."
msgid "Open an URL."
msgstr "URL उघडा."
-msgid "Separate Layer"
-msgstr "वेगळा थर"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr ""
-
msgid "Enter URL to download:"
msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr "वेगळा थर"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -982,12 +997,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr "ठीक"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1789,9 +1798,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3978,9 +3984,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -4010,12 +4013,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4708,12 +4726,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4730,8 +4754,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5052,9 +5076,6 @@ msgstr ""
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} {1} मध्ये पूर्ण"
-
msgid "Enlarge"
msgstr ""
@@ -5193,82 +5214,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr "माझी त्यांच्याबरोबर"
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr "गुणधर्म"
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr "गाठी"
-
-msgid "Members"
-msgstr "सदस्य"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5434,6 +5379,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "त्यांची आवृत्ती ({0} नोंद)"
msgstr[1] "त्यांची आवृत्ती ({0} नोंदी)"
+msgid "My with Their"
+msgstr "माझी त्यांच्याबरोबर"
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr "गुणधर्म"
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr "गाठी"
+
+msgid "Members"
+msgstr "सदस्य"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr "गाठ"
@@ -5493,7 +5514,7 @@ msgstr "भूमिका"
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6844,161 +6865,58 @@ msgstr "दिनांक"
msgid "{0} [incomplete]"
msgstr "{0} [अपूर्ण]"
-msgid "open"
-msgstr "खुला"
-
-msgid "closed"
-msgstr "बंद"
-
-msgid "Download content"
-msgstr ""
-
-msgid "Download the changeset content from the OSM server"
-msgstr ""
-
-msgid "Update content"
-msgstr ""
-
-msgid "Update the changeset content from the OSM server"
-msgstr ""
-
-msgid "Changeset ID: "
-msgstr ""
-
-msgid "Enter a changeset id"
-msgstr ""
-
-msgid ""
-"Download the changeset with the specified id, including the changeset content"
-msgstr ""
-
-msgid "Select changesets owned by specific users"
-msgstr ""
-
-msgid "Select changesets depending on whether they are open or closed"
-msgstr ""
-
-msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr ""
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr ""
-
-msgid "Query open changesets only"
-msgstr ""
-
-msgid "Query closed changesets only"
-msgstr ""
-
-msgid "Query both open and closed changesets"
-msgstr ""
-
-msgid "Only changesets owned by myself"
-msgstr "केवळ माझ्या मालकीचे बदलसंच"
-
-msgid "User ID:"
-msgstr ""
-
-msgid "User name:"
-msgstr ""
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr ""
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-
-msgid "Please enter a valid user ID"
-msgstr ""
-
-msgid "Invalid user ID"
-msgstr ""
-
-msgid "Please enter a non-empty user name"
-msgstr ""
-
-msgid "Invalid user name"
-msgstr ""
-
-msgid "Date: "
-msgstr "दिनांक: "
-
-msgid "Time:"
-msgstr "वेळ:"
-
-msgid "Closed after - "
-msgstr ""
+msgid "open"
+msgstr "खुला"
-msgid "Date:"
-msgstr "दिनांक:"
+msgid "closed"
+msgstr "बंद"
-msgid "Created before - "
+msgid "Download content"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Download the changeset content from the OSM server"
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Update content"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+msgid "Changeset ID: "
msgstr ""
-msgid "Invalid date/time values"
+msgid "Enter a changeset id"
msgstr ""
msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+"Download the changeset with the specified id, including the changeset content"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Select changesets owned by specific users"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Select changesets depending on whether they are open or closed"
msgstr ""
msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+"Select changesets based on the date/time they have been created or closed"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Select only changesets related to a specific bounding box"
msgstr ""
msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
+msgstr ""
+
+msgid "Invalid bounding box"
msgstr ""
msgid "Download my changesets only"
@@ -7076,6 +6994,66 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid "Query open changesets only"
+msgstr ""
+
+msgid "Query closed changesets only"
+msgstr ""
+
+msgid "Query both open and closed changesets"
+msgstr ""
+
+msgid "Date: "
+msgstr "दिनांक: "
+
+msgid "Time:"
+msgstr "वेळ:"
+
+msgid "Closed after - "
+msgstr ""
+
+msgid "Date:"
+msgstr "दिनांक:"
+
+msgid "Created before - "
+msgstr ""
+
+msgid "Only changesets closed after the following date/time"
+msgstr ""
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+
+msgid "Invalid date/time values"
+msgstr ""
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+
+msgid "Please enter an integer value > 0"
+msgstr ""
+
msgid "URL: "
msgstr "URL: "
@@ -7093,6 +7071,49 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Only changesets owned by myself"
+msgstr "केवळ माझ्या मालकीचे बदलसंच"
+
+msgid "User ID:"
+msgstr ""
+
+msgid "User name:"
+msgstr ""
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr ""
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr ""
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+
+msgid "Please enter a valid user ID"
+msgstr ""
+
+msgid "Invalid user ID"
+msgstr ""
+
+msgid "Please enter a non-empty user name"
+msgstr ""
+
+msgid "Invalid user name"
+msgstr ""
+
msgid "Activate"
msgstr ""
@@ -8196,6 +8217,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9692,6 +9716,9 @@ msgstr "दिशा"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9704,9 +9731,6 @@ msgstr ""
msgid "Import not possible"
msgstr "आयात अशक्य"
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9803,14 +9827,6 @@ msgstr "(URL होती: "
msgid "Select the map painting styles"
msgstr "नकाशासाठी रंगशैली निवडा"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr "शैली ''{0}'' लादत आहे..."
@@ -9823,6 +9839,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10812,6 +10831,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10824,6 +10846,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10836,6 +10870,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10895,6 +10932,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10913,9 +10955,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12110,6 +12159,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13145,6 +13200,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13166,12 +13227,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14131,6 +14186,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14619,13 +14677,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14649,7 +14710,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14700,7 +14764,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14709,10 +14773,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14748,6 +14824,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14793,10 +14875,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14829,34 +14917,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14895,6 +15023,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14928,9 +15062,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14987,9 +15118,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15017,9 +15145,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15053,9 +15178,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15092,19 +15262,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15167,9 +15346,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15203,12 +15394,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15335,9 +15548,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15347,6 +15557,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15368,12 +15592,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15395,6 +15637,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15437,6 +15682,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15458,6 +15706,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15473,6 +15727,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15500,9 +15757,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15524,9 +15826,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15536,9 +15835,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15850,7 +16146,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15938,6 +16234,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18334,6 +18633,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19382,6 +19684,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19448,6 +19756,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20391,31 +20705,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -21007,6 +21309,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22300,6 +22606,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23113,9 +23422,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24160,6 +24466,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24251,6 +24560,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24327,6 +24642,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24351,6 +24671,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25124,6 +25447,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25166,7 +25499,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25969,6 +26302,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26010,8 +26346,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27609,6 +27945,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29770,9 +30165,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29930,9 +30322,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29990,6 +30379,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30187,9 +30579,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/ms.po b/i18n/po/ms.po
index d810cf3..688ab7d 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:58+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:03+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: ms\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr "Bantuan"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr ""
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -708,6 +714,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -729,9 +738,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -782,6 +788,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -931,16 +940,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -949,6 +958,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -964,12 +979,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1762,9 +1771,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3950,9 +3956,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3982,12 +3985,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4680,12 +4698,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4702,8 +4726,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5024,9 +5048,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5165,82 +5186,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5406,6 +5351,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5465,7 +5486,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6857,212 +6878,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8168,6 +8189,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9654,6 +9678,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9666,9 +9693,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9765,14 +9789,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9785,6 +9801,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10773,6 +10792,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10785,6 +10807,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10797,6 +10831,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10856,6 +10893,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10874,9 +10916,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12071,6 +12120,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13106,6 +13161,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13127,12 +13188,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14092,6 +14147,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14580,13 +14638,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14610,7 +14671,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14661,7 +14725,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14670,10 +14734,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14709,6 +14785,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14754,10 +14836,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14790,34 +14878,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14856,6 +14984,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14889,9 +15023,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14948,9 +15079,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14978,9 +15106,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15014,9 +15139,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15053,19 +15223,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15128,9 +15307,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15164,12 +15355,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15296,9 +15509,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15308,6 +15518,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15329,12 +15553,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15356,6 +15598,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15398,6 +15643,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15419,6 +15667,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15434,6 +15688,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15461,9 +15718,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15485,9 +15787,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15497,9 +15796,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15811,7 +16107,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15899,6 +16195,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18295,6 +18594,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19343,6 +19645,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19409,6 +19717,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20352,31 +20666,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20968,6 +21270,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22261,6 +22567,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23074,9 +23383,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24121,6 +24427,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24212,6 +24521,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24288,6 +24603,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24312,6 +24632,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25085,6 +25408,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25127,7 +25460,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25930,6 +26263,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25971,8 +26307,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27570,6 +27906,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29731,9 +30126,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29891,9 +30283,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29951,6 +30340,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30148,9 +30540,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/nb.po b/i18n/po/nb.po
index 8040c51..84c0224 100644
--- a/i18n/po/nb.po
+++ b/i18n/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
"PO-Revision-Date: 2016-10-06 19:11+0000\n"
"Last-Translator: Syver Stensholt <sssandum at gmail.com>\n"
"Language-Team: Norwegian Bokmal <nb 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: 2016-11-07 05:00+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:05+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: nb\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr "Bygger hovedmeny"
msgid "Help"
msgstr "Hjelp"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Starter OSM API"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Laster inn kontrollør"
@@ -207,6 +213,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr "Sett valgte kartobjekt til det som er valgt i lista ovenfor."
+msgid "Select WMS layers"
+msgstr "Velg WMS-lag"
+
+msgid "Add layers"
+msgstr "Legg til lag"
+
msgid "Add imagery layer {0}"
msgstr "Legg til bildelag {0}"
@@ -228,12 +240,6 @@ msgstr "Feil"
msgid "Select image format for WMS layer"
msgstr "Velg bildeformat for WMS-lag"
-msgid "Select WMS layers"
-msgstr "Velg WMS-lag"
-
-msgid "Add layers"
-msgstr "Legg til lag"
-
msgid "Add Node..."
msgstr "Legg til node…"
@@ -744,6 +750,9 @@ msgstr "Gå til Posisjon"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Åpner dialog som lar deg gå til bestemt posisjon"
+msgid "Jump to Position"
+msgstr "Gå til posisjon"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Gi inn Lat/Lon for posisjon du vil gå til"
@@ -765,9 +774,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Gå dit"
-msgid "Jump to Position"
-msgstr "Gå til posisjon"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr "Kunne ikke tolke Lat / Lon eller zoom. Sjekk input."
@@ -818,6 +824,9 @@ msgstr "Flett lag"
msgid "Merge the current layer into another layer"
msgstr "Flett det gjeldende laget inn i et annet lag"
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr "Fletter lag med forskjellige opplastningspoliser"
@@ -970,24 +979,30 @@ msgstr[1] "Åpner {0} filer..."
msgid "Opening file ''{0}'' ..."
msgstr "Åpner fil ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr "Hvilke oppgaver skal utføres?"
+
+msgid "Ok"
+msgstr "OK"
+
msgid "Open Location..."
msgstr "Åpne sted …"
msgid "Open an URL."
msgstr "Åpne en URL."
-msgid "Separate Layer"
-msgstr "Separat lag"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Velg hvis innholdet skal lastes ned i et eget lag"
-
msgid "Enter URL to download:"
msgstr "Oppgi URL for nedlasting:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Oppgi link til innholdet som skal lastes ned"
+msgid "Separate Layer"
+msgstr "Separat lag"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Velg hvis innholdet skal lastes ned i et eget lag"
+
msgid "Download Location"
msgstr "Last ned sted"
@@ -1003,12 +1018,6 @@ msgstr "Steng dialog og avbryt nedlasting"
msgid "Download Data"
msgstr "Laster ned data"
-msgid "Which tasks to perform?"
-msgstr "Hvilke oppgaver skal utføres?"
-
-msgid "Ok"
-msgstr "OK"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1823,9 +1832,6 @@ msgstr "Spør og last ned endringssett..."
msgid "Errors during download"
msgstr "Feiler under nedlastning"
-msgid "Download Geo URL"
-msgstr "Last ned fra Geo-URL"
-
msgid "Download GPS"
msgstr "Last ned GPS"
@@ -4043,9 +4049,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr "Ingen ytre linje i multipolygon"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -4075,12 +4078,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4780,12 +4798,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4802,8 +4826,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5124,9 +5148,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5265,86 +5286,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr "Lokal med tjeners"
-
-msgid "My with Merged"
-msgstr "Lokal med sammenslått"
-
-msgid "Their with Merged"
-msgstr "Tjeners med sammenslått"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "rolle {0} deltar ikke i sammenlikningspar {1}"
-
-msgid "Properties"
-msgstr "Egenskaper"
-
-msgid "Tags"
-msgstr "Egenskaper"
-
-msgid "Nodes"
-msgstr "Noder"
-
-msgid "Members"
-msgstr "Medlemmer"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Ingen gjenværende egenskapskonflikter å løse"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr "Noder (løst)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Liste over sammenslåtte noder er låst. Ingen gjenværende konflikter i denne "
-"linjas nodeliste."
-
-msgid "Nodes(with conflicts)"
-msgstr "Noder (med konflikter)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Gjenværende konflikter i denne linjas nodeliste"
-
-msgid "Members(resolved)"
-msgstr "Medlemmer (løst)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Liste over sammenslåtte medlemmer er låst. Ingen gjenværende konflikter i "
-"denne relasjonens medlemsliste."
-
-msgid "Members(with conflicts)"
-msgstr "Medlemmer (med konflikter)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Gjenværende konflikter i denne relasjonens medlemsliste"
-
-msgid "No pending property conflicts"
-msgstr "Ingen gjenværende egenskapskonflikter"
-
-msgid "Properties(with conflicts)"
-msgstr "Egenskaper (med konflikter)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Gjenværende egenskapskonflikter å løse"
-
-msgid "Conflict Resolution"
-msgstr "Konfliktløsning"
-
msgid "{0} more..."
msgstr ""
@@ -5530,6 +5471,86 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Tjenerens versjon ({0} oppføring)"
msgstr[1] "Tjenerens versjon ({0} oppføringer)"
+msgid "My with Their"
+msgstr "Lokal med tjeners"
+
+msgid "My with Merged"
+msgstr "Lokal med sammenslått"
+
+msgid "Their with Merged"
+msgstr "Tjeners med sammenslått"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "rolle {0} deltar ikke i sammenlikningspar {1}"
+
+msgid "Properties"
+msgstr "Egenskaper"
+
+msgid "Tags"
+msgstr "Egenskaper"
+
+msgid "Nodes"
+msgstr "Noder"
+
+msgid "Members"
+msgstr "Medlemmer"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Ingen gjenværende egenskapskonflikter å løse"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr "Noder (løst)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Liste over sammenslåtte noder er låst. Ingen gjenværende konflikter i denne "
+"linjas nodeliste."
+
+msgid "Nodes(with conflicts)"
+msgstr "Noder (med konflikter)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Gjenværende konflikter i denne linjas nodeliste"
+
+msgid "Members(resolved)"
+msgstr "Medlemmer (løst)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Liste over sammenslåtte medlemmer er låst. Ingen gjenværende konflikter i "
+"denne relasjonens medlemsliste."
+
+msgid "Members(with conflicts)"
+msgstr "Medlemmer (med konflikter)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Gjenværende konflikter i denne relasjonens medlemsliste"
+
+msgid "No pending property conflicts"
+msgstr "Ingen gjenværende egenskapskonflikter"
+
+msgid "Properties(with conflicts)"
+msgstr "Egenskaper (med konflikter)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Gjenværende egenskapskonflikter å løse"
+
+msgid "Conflict Resolution"
+msgstr "Konfliktløsning"
+
msgid "Node"
msgstr "Node"
@@ -5592,9 +5613,8 @@ msgstr "Rolle"
msgid "Primitive"
msgstr "Objekt"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
msgid "<undefined>"
msgstr "<ikke angitt>"
@@ -6944,131 +6964,45 @@ msgstr "Dato"
msgid "{0} [incomplete]"
msgstr ""
-msgid "open"
-msgstr ""
-
-msgid "closed"
-msgstr ""
-
-msgid "Download content"
-msgstr ""
-
-msgid "Download the changeset content from the OSM server"
-msgstr ""
-
-msgid "Update content"
-msgstr ""
-
-msgid "Update the changeset content from the OSM server"
-msgstr ""
-
-msgid "Changeset ID: "
-msgstr ""
-
-msgid "Enter a changeset id"
-msgstr ""
-
-msgid ""
-"Download the changeset with the specified id, including the changeset content"
-msgstr ""
-
-msgid "Select changesets owned by specific users"
-msgstr ""
-
-msgid "Select changesets depending on whether they are open or closed"
-msgstr ""
-
-msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr ""
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr ""
-
-msgid "Query open changesets only"
-msgstr ""
-
-msgid "Query closed changesets only"
-msgstr ""
-
-msgid "Query both open and closed changesets"
-msgstr ""
-
-msgid "Only changesets owned by myself"
-msgstr ""
-
-msgid "User ID:"
-msgstr ""
-
-msgid "User name:"
-msgstr ""
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr ""
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-
-msgid "Please enter a valid user ID"
-msgstr ""
-
-msgid "Invalid user ID"
+msgid "open"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "closed"
msgstr ""
-msgid "Invalid user name"
+msgid "Download content"
msgstr ""
-msgid "Date: "
+msgid "Download the changeset content from the OSM server"
msgstr ""
-msgid "Time:"
+msgid "Update content"
msgstr ""
-msgid "Closed after - "
+msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Date:"
+msgid "Changeset ID: "
msgstr ""
-msgid "Created before - "
+msgid "Enter a changeset id"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid ""
+"Download the changeset with the specified id, including the changeset content"
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Select changesets owned by specific users"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Select changesets depending on whether they are open or closed"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Select changesets based on the date/time they have been created or closed"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Select only changesets related to a specific bounding box"
msgstr ""
msgid ""
@@ -7084,23 +7018,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-
-msgid "Please enter an integer value > 0"
-msgstr ""
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-
msgid "Download my changesets only"
msgstr ""
@@ -7176,6 +7093,66 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid "Query open changesets only"
+msgstr ""
+
+msgid "Query closed changesets only"
+msgstr ""
+
+msgid "Query both open and closed changesets"
+msgstr ""
+
+msgid "Date: "
+msgstr ""
+
+msgid "Time:"
+msgstr ""
+
+msgid "Closed after - "
+msgstr ""
+
+msgid "Date:"
+msgstr ""
+
+msgid "Created before - "
+msgstr ""
+
+msgid "Only changesets closed after the following date/time"
+msgstr ""
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+
+msgid "Invalid date/time values"
+msgstr ""
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+
+msgid "Please enter an integer value > 0"
+msgstr ""
+
msgid "URL: "
msgstr ""
@@ -7193,6 +7170,49 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Only changesets owned by myself"
+msgstr ""
+
+msgid "User ID:"
+msgstr ""
+
+msgid "User name:"
+msgstr ""
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr ""
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr ""
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+
+msgid "Please enter a valid user ID"
+msgstr ""
+
+msgid "Invalid user ID"
+msgstr ""
+
+msgid "Please enter a non-empty user name"
+msgstr ""
+
+msgid "Invalid user name"
+msgstr ""
+
msgid "Activate"
msgstr ""
@@ -8307,6 +8327,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9826,6 +9849,9 @@ msgstr "Retning"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave-lydfiler (*.wav)"
+
msgid "Import Audio"
msgstr "Importer lyd"
@@ -9838,9 +9864,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave-lydfiler (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Lyd-markører fra {0}"
@@ -9945,14 +9968,6 @@ msgstr "(URL var: "
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9965,6 +9980,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10966,6 +10984,9 @@ msgstr "Dilution of Position (rød = bra, green = dårlig (hvis noen)"
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "En farge (kan tilpasses navngitte lag)"
@@ -10978,6 +10999,18 @@ msgstr "Sykkel"
msgid "Foot"
msgstr "Til fots"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Skogsområde"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10990,6 +11023,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11056,6 +11092,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11076,9 +11117,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr "Tillater å justere fargen etter gjennomsnittsfarten."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Farge på punkt og track linjer"
@@ -12276,6 +12324,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13327,6 +13381,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Lagre bruker og passord (ukryptert)"
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13348,12 +13408,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14319,6 +14373,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14811,13 +14868,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14841,7 +14901,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14892,7 +14955,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14901,10 +14964,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14940,6 +15015,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14985,10 +15066,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -15024,31 +15111,71 @@ msgstr ""
msgid "TEC bus lines (2014)"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
+msgstr ""
+
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -15087,6 +15214,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -15120,9 +15253,6 @@ msgstr "Matrikkel"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -15179,9 +15309,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15209,9 +15336,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15245,9 +15369,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15284,19 +15453,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15359,9 +15537,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15395,12 +15585,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15527,9 +15739,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15539,6 +15748,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15560,12 +15783,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15587,6 +15828,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15629,6 +15873,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15650,6 +15897,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15665,6 +15918,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15692,9 +15948,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15716,9 +16017,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15728,9 +16026,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -16042,7 +16337,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr "Lag et rutenett med linjer."
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -16133,6 +16428,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18541,6 +18839,9 @@ msgstr "Bekk"
msgid "River"
msgstr "Elv"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -19589,6 +19890,12 @@ msgstr "Motell"
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Feriehytter"
@@ -19655,6 +19962,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Gatekjøkken"
@@ -20598,31 +20911,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr "Jaktpost"
-msgid "Height"
-msgstr "Høyde"
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
-msgstr "Lås"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -21214,6 +21515,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22507,6 +22812,9 @@ msgstr "Slakter"
msgid "Seafood"
msgstr "Sjømat"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Delkatesser"
@@ -23320,9 +23628,6 @@ msgstr "Trerekke"
msgid "A line of trees."
msgstr "En rekke med trær."
-msgid "Wood"
-msgstr "Skogsområde"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24371,6 +24676,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24468,6 +24776,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} på en node. Bør brukes på linje."
@@ -24544,6 +24858,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} bør være på noden der {1} og {2} krysser"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24568,6 +24887,9 @@ msgstr "{0} brukt med {1}"
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25343,6 +25665,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25385,7 +25717,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -26188,6 +26520,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26229,8 +26564,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27852,6 +28187,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -30024,9 +30418,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -30184,9 +30575,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -30244,6 +30632,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30441,9 +30832,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/nds.po b/i18n/po/nds.po
index 6f9a32b..a54c904 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:59+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:04+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr ""
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr ""
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -708,6 +714,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -729,9 +738,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -782,6 +788,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -931,16 +940,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -949,6 +958,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -964,12 +979,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1762,9 +1771,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3949,9 +3955,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3981,12 +3984,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4679,12 +4697,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4701,8 +4725,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5023,9 +5047,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5164,82 +5185,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5405,6 +5350,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5464,7 +5485,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6856,212 +6877,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8167,6 +8188,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9653,6 +9677,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9665,9 +9692,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9764,14 +9788,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9784,6 +9800,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10772,6 +10791,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10784,6 +10806,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Holt"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10796,6 +10830,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10855,6 +10892,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10873,9 +10915,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12070,6 +12119,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13105,6 +13160,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13126,12 +13187,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14091,6 +14146,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14579,13 +14637,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14609,7 +14670,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14660,7 +14724,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14669,10 +14733,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14708,6 +14784,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14753,10 +14835,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14789,34 +14877,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14855,6 +14983,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14888,9 +15022,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14947,9 +15078,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14977,9 +15105,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15013,9 +15138,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15052,19 +15222,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15127,9 +15306,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15163,12 +15354,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15295,9 +15508,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15307,6 +15517,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15328,12 +15552,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15355,6 +15597,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15397,6 +15642,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15418,6 +15666,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15433,6 +15687,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15460,9 +15717,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15484,9 +15786,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15496,9 +15795,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15810,7 +16106,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15898,6 +16194,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18294,6 +18593,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19342,6 +19644,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19408,6 +19716,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20351,31 +20665,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20967,6 +21269,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22260,6 +22566,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23073,9 +23382,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr "Holt"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24120,6 +24426,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24211,6 +24520,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24287,6 +24602,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24311,6 +24631,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25084,6 +25407,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25126,7 +25459,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25929,6 +26262,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25970,8 +26306,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27569,6 +27905,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29730,9 +30125,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29890,9 +30282,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29950,6 +30339,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30147,9 +30539,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/nl.po b/i18n/po/nl.po
index f785d07..0aeeab2 100644
--- a/i18n/po/nl.po
+++ b/i18n/po/nl.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-06 22:51+0100\n"
-"PO-Revision-Date: 2016-11-01 10:28+0000\n"
-"Last-Translator: DiGro <Unknown>\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
+"PO-Revision-Date: 2017-01-02 22:10+0000\n"
+"Last-Translator: korst <Unknown>\n"
"Language-Team: Dutch\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: 2016-11-07 04:40+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:44+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: nl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -65,9 +65,15 @@ msgstr "Hoofdmenu opbouwen"
msgid "Help"
msgstr "Help"
+msgid "Initializing internal boundaries data"
+msgstr "Initialiseren van gegevens van interne grenzen"
+
msgid "Initializing OSM API"
msgstr "OSM-API initialiseren"
+msgid "Initializing internal traffic data"
+msgstr "Initialiseren van interne verkeersgegevens"
+
msgid "Initializing validator"
msgstr "Validator initialiseren"
@@ -212,6 +218,12 @@ msgstr ""
"De geselecteerde elementen op de kaart instellen op de geselecteerde items "
"in de bovenstaande lijst."
+msgid "Select WMS layers"
+msgstr "WMS-lagen selecteren"
+
+msgid "Add layers"
+msgstr "Lagen toevoegen"
+
msgid "Add imagery layer {0}"
msgstr "Afbeeldingslaag {0} toevoegen"
@@ -233,12 +245,6 @@ msgstr "Fout"
msgid "Select image format for WMS layer"
msgstr "Kies een afbeelding voor de WMS laag"
-msgid "Select WMS layers"
-msgstr "WMS-lagen selecteren"
-
-msgid "Add layers"
-msgstr "Lagen toevoegen"
-
msgid "Add Node..."
msgstr "Knoop toevoegen..."
@@ -769,6 +775,9 @@ msgstr ""
"Opent een dialoogvenster waarmee naar een specifieke locatie kan worden "
"gesprongen."
+msgid "Jump to Position"
+msgstr "Spring naar positie"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Lat/lon invoeren om naar positie te springen."
@@ -790,9 +799,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Spring daarheen"
-msgid "Jump to Position"
-msgstr "Spring naar positie"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Kon lengte- of breedtegraad of zoom niet parsen. Gelieve deze te controleren."
@@ -848,6 +854,9 @@ msgstr "Laag samenvoegen"
msgid "Merge the current layer into another layer"
msgstr "Voeg de huidige laag samen met een andere laag"
+msgid "{0} completed in {1}"
+msgstr "{0} voltooid in {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Lagen met verschillend uploadbeleid samenvoegen"
@@ -1023,24 +1032,30 @@ msgstr[1] "{0} bestanden aan het openen..."
msgid "Opening file ''{0}'' ..."
msgstr "Bestand ''{0}'' aan het openen..."
+msgid "Which tasks to perform?"
+msgstr "Welke taken moeten worden uitgevoerd?"
+
+msgid "Ok"
+msgstr "OK"
+
msgid "Open Location..."
msgstr "Locatie openen..."
msgid "Open an URL."
msgstr "Een URL openen."
-msgid "Separate Layer"
-msgstr "Laag scheiden"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Selecteer als de data naar een nieuwe laag moet worden gedownload"
-
msgid "Enter URL to download:"
msgstr "Voer URL om te downloaden in:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Voer een URL in waarvandaan de gegevens gedownload moeten worden"
+msgid "Separate Layer"
+msgstr "Laag scheiden"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Selecteer als de data naar een nieuwe laag moet worden gedownload"
+
msgid "Download Location"
msgstr "Locatie voor downloaden"
@@ -1056,12 +1071,6 @@ msgstr "Sluit dialoogvenster en stop het downloaden"
msgid "Download Data"
msgstr "Download gegevens"
-msgid "Which tasks to perform?"
-msgstr "Welke taken moeten worden uitgevoerd?"
-
-msgid "Ok"
-msgstr "OK"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1944,9 +1953,6 @@ msgstr "Zoekopdracht en downloaden wijzigingensets ..."
msgid "Errors during download"
msgstr "Fouten tijdens downloaden"
-msgid "Download Geo URL"
-msgstr "Geo URL downloaden"
-
msgid "Download GPS"
msgstr "GPS downloaden"
@@ -4344,9 +4350,6 @@ msgstr "Gebied is niet gesloten"
msgid "No outer way for multipolygon"
msgstr "Geen buitenste weg voor multipolygoon"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "Rol voor ''{0}'' zou moeten zijn ''{1}''"
-
msgid "No area style for multipolygon"
msgstr "Geen gebeidsstijl voor multipolygoon"
@@ -4384,12 +4387,27 @@ msgstr "Stijl voor gebied op buitenste weg"
msgid "Multipolygon is not closed"
msgstr "Multipolygoon is niet gesloten"
+msgid "Multipolygon rings share node(s)"
+msgstr "Ringen van multipolygonen delen kno(o)p(en)"
+
+msgid "Intersection between multipolygon ways"
+msgstr "Wegen die lid zijn van een multipolygoonrelatie kruisen elkaar"
+
+msgid "Multipolygon rings are equal"
+msgstr "Ringen van multipolygonen zijn gelijk"
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "Rol voor ''{0}'' zou moeten zijn ''{1}''"
+
msgid "Multipolygon inner way is outside"
msgstr ""
"Het lid van de multipolygoonrelatie met als rol inner ligt aan de buitenkant"
-msgid "Intersection between multipolygon ways"
-msgstr "Wegen die lid zijn van een multipolygoonrelatie kruisen elkaar"
+msgid "Multipolygon ring contains segments twice"
+msgstr "Ring van multipolygoon bevat segmenten tweemaal"
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr "Buitenste weg van multipolygoon deelt segment(en) met andere ring"
msgid "No useful role for multipolygon member"
msgstr "Een lid van een multipolygoonrelatie heeft een niet-geschikte rol"
@@ -5112,12 +5130,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr "opties ter beschikking gesteld als systeemeigenschappen"
+msgid "Change the JOSM directory name"
+msgstr "De naam van de map voor JOSM wijzigen"
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/PAD/NAAR/JOSM/PREF "
msgid "Set the preferences directory"
msgstr "Map voor voorkeuren instellen"
+msgid "Default: {0}"
+msgstr "Standaard: {0}"
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/PAD/NAAR/JOSM/GEBRUIKERSGEGEVENS"
@@ -5134,10 +5158,11 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/PAD/NAAR/JOSM/HOMEDIR "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Alle 3 mappen verplaatsen naar homedir. Map Cache zal zijn in homedir/cache"
+"Stel de map voor de voorkeuren+gegevens+cache in (map voor cache zal zijn "
+"josm.home/cache)"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5489,9 +5514,6 @@ msgstr "Klikken om de taak op de achtergrond uit te voeren"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} voltooid in {1}"
-
msgid "Enlarge"
msgstr "Vergroten"
@@ -5637,86 +5659,6 @@ msgstr "Conflict op achtergrond: verwijder lid"
msgid "Conflict foreground: remove member"
msgstr "Conflict op voorgrond: verwijder lid"
-msgid "My with Their"
-msgstr "Mijn met Hun"
-
-msgid "My with Merged"
-msgstr "Mijn met Samengevoegd"
-
-msgid "Their with Merged"
-msgstr "Hun met Samengevoegd"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "Rol {0} maakt geen deel uit van vergelijkingspaar {1}."
-
-msgid "Properties"
-msgstr "Eigenschappen"
-
-msgid "Tags"
-msgstr "Tags"
-
-msgid "Nodes"
-msgstr "Knopen"
-
-msgid "Members"
-msgstr "Leden"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Geen tag-conflicten om op te lossen"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Tags({0} conflict)"
-msgstr[1] "Tags({0} conflicten)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} tagconflict nog op te lossen"
-msgstr[1] "{0} tagconflicten nog op te lossen"
-
-msgid "Nodes(resolved)"
-msgstr "Knopen (opgelost)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Lijst met samengevoegde knopen bevroren. Er zijn geen openstaande conflicten "
-"in de lijst met knopen van deze weg"
-
-msgid "Nodes(with conflicts)"
-msgstr "Knopen (met conflicten)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Openstaande conflicten in de lijst met knopen van deze weg"
-
-msgid "Members(resolved)"
-msgstr "Leden (opgelost)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Lijst met samengevoegde leden bevroren. Er zijn geen openstaande conflicten "
-"in de lijst met leden van deze relatie"
-
-msgid "Members(with conflicts)"
-msgstr "Leden (met conflicten)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Openstaande conflicten in de lijst met leden van deze relatie"
-
-msgid "No pending property conflicts"
-msgstr "Geen openstaande conflicten voor eigenschappen"
-
-msgid "Properties(with conflicts)"
-msgstr "Eigenschappen (met conflicten)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Nog openstaande conflicten voor eigenschappen om nog op te lossen"
-
-msgid "Conflict Resolution"
-msgstr "Conflictoplossing"
-
msgid "{0} more..."
msgstr "{0} meer..."
@@ -5910,6 +5852,86 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Hun versie ({0} items)"
msgstr[1] "Hun versie ({0} items)"
+msgid "My with Their"
+msgstr "Mijn met Hun"
+
+msgid "My with Merged"
+msgstr "Mijn met Samengevoegd"
+
+msgid "Their with Merged"
+msgstr "Hun met Samengevoegd"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "Rol {0} maakt geen deel uit van vergelijkingspaar {1}."
+
+msgid "Properties"
+msgstr "Eigenschappen"
+
+msgid "Tags"
+msgstr "Tags"
+
+msgid "Nodes"
+msgstr "Knopen"
+
+msgid "Members"
+msgstr "Leden"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Geen tag-conflicten om op te lossen"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Tags({0} conflict)"
+msgstr[1] "Tags({0} conflicten)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} tagconflict nog op te lossen"
+msgstr[1] "{0} tagconflicten nog op te lossen"
+
+msgid "Nodes(resolved)"
+msgstr "Knopen (opgelost)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Lijst met samengevoegde knopen bevroren. Er zijn geen openstaande conflicten "
+"in de lijst met knopen van deze weg"
+
+msgid "Nodes(with conflicts)"
+msgstr "Knopen (met conflicten)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Openstaande conflicten in de lijst met knopen van deze weg"
+
+msgid "Members(resolved)"
+msgstr "Leden (opgelost)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Lijst met samengevoegde leden bevroren. Er zijn geen openstaande conflicten "
+"in de lijst met leden van deze relatie"
+
+msgid "Members(with conflicts)"
+msgstr "Leden (met conflicten)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Openstaande conflicten in de lijst met leden van deze relatie"
+
+msgid "No pending property conflicts"
+msgstr "Geen openstaande conflicten voor eigenschappen"
+
+msgid "Properties(with conflicts)"
+msgstr "Eigenschappen (met conflicten)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Nog openstaande conflicten voor eigenschappen om nog op te lossen"
+
+msgid "Conflict Resolution"
+msgstr "Conflictoplossing"
+
msgid "Node"
msgstr "Knoop"
@@ -5974,10 +5996,8 @@ msgstr "Rol"
msgid "Primitive"
msgstr "Primitief"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"Samengevoegde knopen zijn nog niet vastgezet. Kan nog geen opdracht voor "
-"oplossing bouwen"
msgid "<undefined>"
msgstr "<ongedefinieerd>"
@@ -7522,108 +7542,6 @@ msgstr ""
"Selecteer alleen wijzigingensets die betrekking hebben op een specifieke "
"omvattende rechthoek"
-msgid "Query open changesets only"
-msgstr "Zoek alleen in geopende wijzigingensets"
-
-msgid "Query closed changesets only"
-msgstr "Zoek alleen in afgesloten wijzigingensets"
-
-msgid "Query both open and closed changesets"
-msgstr "Zoek zowel in geopende als afgesloten wijzigingensets"
-
-msgid "Only changesets owned by myself"
-msgstr "Alleen wijzigingensets waarvan ikzelf eigenaar ben"
-
-msgid "User ID:"
-msgstr "Gebruikers-ID:"
-
-msgid "User name:"
-msgstr "Gebruikersnaam:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
-"Alleen wijzigingensets waarvan de gebruiker met het opgegeven gebruikers-ID "
-"eigenaar is"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-"Alleen wijzigingensets waarvan de gebruiker met de volgende gebruikersnaam "
-"eigenaar is"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Alleen wijzigingensets waarvan ikzelf eigenaar ben (uitgeschakeld. JOSM "
-"wordt momenteel uitgevoerd door een anonieme gebruiker)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Kan de aanvraag voor de wijzigingenset niet beperken tot de huidige "
-"gebruiker, omdat de huidige gebruiker anoniem is"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "Huidige waarde ''{0}'' is niet geldig als gebruikers-ID"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"Kan de aanvraag voor de wijzigingenset niet beperken tot de volgende "
-"gebruikersnaam ''{0}''"
-
-msgid "Please enter a valid user ID"
-msgstr "Voer een geldige gebruikers-ID in"
-
-msgid "Invalid user ID"
-msgstr "Ongeldige gebruikers-ID"
-
-msgid "Please enter a non-empty user name"
-msgstr "Voer een niet-lege gebruikersnaam in"
-
-msgid "Invalid user name"
-msgstr "Ongeldige gebruikersnaam"
-
-msgid "Date: "
-msgstr "Datum: "
-
-msgid "Time:"
-msgstr "Tijd:"
-
-msgid "Closed after - "
-msgstr "Afgesloten na - "
-
-msgid "Date:"
-msgstr "Datum:"
-
-msgid "Created before - "
-msgstr "Gemaakt voor - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Alleen wijzigingensets afgesloten na de volgende datum/tijd"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-"Alleen wijzigingensets afgesloten na en gemaakt vóór een specifieke "
-"datum/tijd"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"Kan geen zoekopdracht voor wijzigingenset bouwen met de op tijd gebaseerde "
-"beperkingen. Invoer is niet geldig."
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr ""
-"<html>Geef geldige datum-/tijdwaarden op<br>om de zoekopdracht te beperken "
-"tot een specifiek tijdpad.</html>"
-
-msgid "Invalid date/time values"
-msgstr "Ongeldige datum/tijd-waarden"
-
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
"invalid."
@@ -7642,30 +7560,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Ongeldige omvattende rechthoek"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"De huidige waarde is geen geldige ID voor een gebruiker. Voer een geheel "
-"getal > 0 in"
-
-msgid "Please enter an integer value > 0"
-msgstr "Voer een geheel getal > 0 in"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Voer een datum in in de gebruikelijke indeling voor uw "
-"locatie.<br>Voorbeeld: {0}<br>Voorbeeld: {1}<br>Voorbeeld: {2}<br>Voorbeeld: "
-"{3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Voer een tijd in in de gebruikelijke indeling voor uw locatie.<br>Voorbeeld: "
-"{0}<br>Voorbeeld: {1}<br>Voorbeeld: {2}<br>Voorbeeld: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Alleen mijn wijzigingensets downloaden"
@@ -7760,6 +7654,79 @@ msgid "Close the dialog and abort querying of changesets"
msgstr ""
"Sluit het dialoogvenster en breek de zoekopdracht van de wijzigingensets af"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Voer een datum in in de gebruikelijke indeling voor uw "
+"locatie.<br>Voorbeeld: {0}<br>Voorbeeld: {1}<br>Voorbeeld: {2}<br>Voorbeeld: "
+"{3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Zoek alleen in geopende wijzigingensets"
+
+msgid "Query closed changesets only"
+msgstr "Zoek alleen in afgesloten wijzigingensets"
+
+msgid "Query both open and closed changesets"
+msgstr "Zoek zowel in geopende als afgesloten wijzigingensets"
+
+msgid "Date: "
+msgstr "Datum: "
+
+msgid "Time:"
+msgstr "Tijd:"
+
+msgid "Closed after - "
+msgstr "Afgesloten na - "
+
+msgid "Date:"
+msgstr "Datum:"
+
+msgid "Created before - "
+msgstr "Gemaakt voor - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Alleen wijzigingensets afgesloten na de volgende datum/tijd"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+"Alleen wijzigingensets afgesloten na en gemaakt vóór een specifieke "
+"datum/tijd"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Kan geen zoekopdracht voor wijzigingenset bouwen met de op tijd gebaseerde "
+"beperkingen. Invoer is niet geldig."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Geef geldige datum-/tijdwaarden op<br>om de zoekopdracht te beperken "
+"tot een specifiek tijdpad.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Ongeldige datum/tijd-waarden"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Voer een tijd in in de gebruikelijke indeling voor uw locatie.<br>Voorbeeld: "
+"{0}<br>Voorbeeld: {1}<br>Voorbeeld: {2}<br>Voorbeeld: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"De huidige waarde is geen geldige ID voor een gebruiker. Voer een geheel "
+"getal > 0 in"
+
+msgid "Please enter an integer value > 0"
+msgstr "Voer een geheel getal > 0 in"
+
msgid "URL: "
msgstr "URL: "
@@ -7781,6 +7748,59 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Deze URL voor de zoekopdracht voor wijzigingenset is ongeldig"
+msgid "Only changesets owned by myself"
+msgstr "Alleen wijzigingensets waarvan ikzelf eigenaar ben"
+
+msgid "User ID:"
+msgstr "Gebruikers-ID:"
+
+msgid "User name:"
+msgstr "Gebruikersnaam:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr ""
+"Alleen wijzigingensets waarvan de gebruiker met het opgegeven gebruikers-ID "
+"eigenaar is"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+"Alleen wijzigingensets waarvan de gebruiker met de volgende gebruikersnaam "
+"eigenaar is"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Alleen wijzigingensets waarvan ikzelf eigenaar ben (uitgeschakeld. JOSM "
+"wordt momenteel uitgevoerd door een anonieme gebruiker)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Kan de aanvraag voor de wijzigingenset niet beperken tot de huidige "
+"gebruiker, omdat de huidige gebruiker anoniem is"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "Huidige waarde ''{0}'' is niet geldig als gebruikers-ID"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"Kan de aanvraag voor de wijzigingenset niet beperken tot de volgende "
+"gebruikersnaam ''{0}''"
+
+msgid "Please enter a valid user ID"
+msgstr "Voer een geldige gebruikers-ID in"
+
+msgid "Invalid user ID"
+msgstr "Ongeldige gebruikers-ID"
+
+msgid "Please enter a non-empty user name"
+msgstr "Voer een niet-lege gebruikersnaam in"
+
+msgid "Invalid user name"
+msgstr "Ongeldige gebruikersnaam"
+
msgid "Activate"
msgstr "Activeren"
@@ -8998,6 +9018,9 @@ msgstr "T"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10684,6 +10707,9 @@ msgstr "Richting"
msgid "Velocity, {0}"
msgstr "Snelheid, {0}"
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave-geluidsbestanden (*.wav)"
+
msgid "Import Audio"
msgstr "Geluid importeren"
@@ -10699,9 +10725,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Importeren niet mogelijk"
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave-geluidsbestanden (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Geluidsmarkeringen van {0}"
@@ -10812,19 +10835,8 @@ msgstr "Fout tijdens het tonen van de URL voor deze markering"
msgid "(URL was: "
msgstr "(URL was: "
-msgid "Select the map painting styles"
-msgstr "Selecteer de maptekenstijlen"
-
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "Laden van Kaarttekenstijlen vanaf ''{0}'' mislukt. Exceptie was: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-"JOSM ondersteunt niet langer kaarttekenstijlen die zijn geschreven in de "
-"oude indeling XML.\n"
-"Werk ''{0}'' bij naar MapCSS"
+msgid "Select the map painting styles"
+msgstr "Selecteer de maptekenstijlen"
msgid "loading style ''{0}''..."
msgstr "stijl laden ''{0}''..."
@@ -10842,6 +10854,9 @@ msgstr[1] ""
"Er traden {0} fouten op bij het laden van deze stijl. Selecteer ''Info'' uit "
"het rechtsklik-menu voor details."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "Laden van Kaarttekenstijlen vanaf ''{0}'' mislukt. Exceptie was: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
"Parsen van Kaarttekenstijlen vanaf ''{0}'' mislukt. Exceptie was: {1}"
@@ -11991,6 +12006,9 @@ msgstr ""
msgid "Track date"
msgstr "Datum spoor"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Enkele kleur (kan voor lagen met een naam ingesteld worden)"
@@ -12003,6 +12021,18 @@ msgstr "Fiets"
msgid "Foot"
msgstr "Te voet"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Oerbos"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Maak markeringen bij het lezen van GPX"
@@ -12015,6 +12045,9 @@ msgstr "Dynamisch kleurbereik gebaseerd op grenzen van gegevens"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "GPX-lagen anti-aliasen"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -12086,6 +12119,11 @@ msgstr ""
"Pas anti-aliasing toe op GPX-lijnen, wat zorgt voor een mooiere weergave."
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -12109,11 +12147,18 @@ msgid "Colors points and track segments by its timestamp."
msgstr ""
"Kleur punten en segmenten van het spoor op basis van hun tijdstempel."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
"Sta toe om de kleur van het spoor af te stemmen op de verschillende "
"gemiddelde snelheden."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Kleuren van sporen en punten"
@@ -13443,6 +13488,12 @@ msgstr "Controleert op fouten voor religieuze objecten"
msgid "Checks for errors on relations"
msgstr "Controleert op fouten in relaties"
+msgid "Territories"
+msgstr "Gebieden"
+
+msgid "Checks for territories-specific features"
+msgstr "Controles voor gebiedsspecifieke objecten"
+
msgid "Unnecessary tags"
msgstr "Onnodige tags"
@@ -14599,6 +14650,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Gebruikersnaam en wachtwoord opslaan (niet versleuteld)"
+msgid "Assume"
+msgstr "Veronderstelling"
+
+msgid "Existing values"
+msgstr "Bestaande waarden"
+
msgid "<delete from {0} objects>"
msgstr "<verwijderen uit {0} objecten>"
@@ -14620,12 +14677,6 @@ msgstr "Voeg de gekozen tags toe aan de geselecteerde objecten"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Enter: Voeg alle tags toe aan de geselecteerde objecten"
-msgid "Assume"
-msgstr "Veronderstelling"
-
-msgid "Existing values"
-msgstr "Bestaande waarden"
-
msgid "Enable the checkbox to accept the value"
msgstr "Schakel het keuzevak in om de waarde te accepteren"
@@ -15826,6 +15877,9 @@ msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
"Stil conflict in sneltoetsen: ''{0}'' verplaatst door ''{1}'' naar ''{2}''."
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "Er werd een tag {0} gevonden in de buffer, dit is verdacht!"
@@ -16353,14 +16407,17 @@ msgstr "Mapbox Satellite"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr "Thunderforest Landscape"
+
msgid "OpenSeaMap"
msgstr "OpenSeaMap"
-msgid "OpenStreetMap Carto (Standard layer)"
-msgstr "OpenStreetMap Carto (Standaardlaag)"
+msgid "OpenStreetMap Carto (Standard)"
+msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik zwart-wit)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr "OpenStreetMap (Standaard zwart & wit)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, geen labels)"
@@ -16383,8 +16440,11 @@ msgstr "Wandelen & Fietsen"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Cambodia, Laos, Thailand, Vietnam tweetalig"
+msgid "Stamen Terrain"
+msgstr "Stamen Terrain"
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr "Cambodja, Laos, Thailand, Vietnam, Myanmar tweetalig"
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
@@ -16434,8 +16494,8 @@ msgstr "OSM Inspector: Plaatsen"
msgid "OSM Inspector: Highways"
msgstr "OSM Inspector: Wegen"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM Inspector: Multipolygonen"
+msgid "OSM Inspector: Area"
+msgstr "OSM Inspector: Gebied"
msgid "OSM Inspector: Routing"
msgstr "OSM Inspector: Routeren"
@@ -16443,11 +16503,23 @@ msgstr "OSM Inspector: Routeren"
msgid "OSM Inspector: Addresses"
msgstr "OSM Inspector: Adressen"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM Inspector: Grenzen (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr "OSM Inspector: Kustlijn (EU)"
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr "imagico.de OSM images for mapping: Prokletije Mountains"
-msgid "IGN Argentina (WMTS)"
-msgstr "IGN Argentinië (WMTS)"
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr "imagico.de OSM images for mapping: Pensacola Mountains"
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+
+msgid "IGN Argentina (TMS)"
+msgstr ""
msgid "IGN Argentina (WMS)"
msgstr "IGN Argentinië (WMS)"
@@ -16482,6 +16554,12 @@ msgstr "LPI NSW Administratieve grenzen State Forest"
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr "LPI NSW Administratieve grenzen NPWS Reserve"
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr "imagico.de OSM images for mapping: Northwest Heard Island"
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr "imagico.de OSM images for mapping: Heard Island coast"
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -16527,11 +16605,17 @@ msgstr "VoGIS: Flächenwidmungsplan"
msgid "VoGIS: Höhen und Gelände"
msgstr "VoGIS: Höhen und Gelände"
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
-msgstr "AGIV (Vlaanderen / Flanders) meest recente luchtfoto''s (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr "AGIV Vlaanderen meest recente luchtfoto''s"
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
+msgstr "AGIV Vlaanderen 2013-2015 luchtfoto''s 10cm"
-msgid "AGIV aerial imagery 10cm 2013-15"
-msgstr "AGIV luchtofoto''s 10cm 2013-15"
+msgid "AGIV Flanders GRB"
+msgstr ""
msgid "URBISfr numerical imagery (2013)"
msgstr "URBISfr numerieke afbeeldingen (2013)"
@@ -16566,8 +16650,17 @@ msgstr "SPW(allonie) 2009-2010 luchtfoto’s"
msgid "TEC bus lines (2014)"
msgstr "TEC buslijnen (2014)"
-msgid "Benin:cotonou_pleiade_2016"
-msgstr "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr "Benin: Cotonou Pleiade 2016"
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr "imagico.de OSM images for mapping: Cotonou"
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr "imagico.de OSM images for mapping: Bouvet Island"
msgid "IBGE Mapa de Setores Urbanos"
msgstr "IBGE Mapa de Setores Urbanos"
@@ -16575,6 +16668,15 @@ msgstr "IBGE Mapa de Setores Urbanos"
msgid "IBGE Mapa de Setores Rurais"
msgstr "IBGE Mapa de Setores Rurais"
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Geobase Hydrografie"
@@ -16587,12 +16689,34 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "British Columbia Mozaïek"
+msgid "Latest southwest British Columbia Landsat"
+msgstr "Laatste zuidwestelijk British Columbia Landsat"
+
msgid "Kelowna 2012"
msgstr "Kelowna 2012"
msgid "Kelowna Roads overlay"
msgstr "Kelowna Wegen overlay"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr "imagico.de OSM images for mapping: Eastern Devon Island coast"
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr "imagico.de OSM images for mapping: Northern Ellesmere Island"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr "imagico.de OSM images for mapping: Fogo, Cape Verde"
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr "imagico.de OSM images for mapping: Isla Londonderry"
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr "imagico.de OSM images for mapping: Volcán Calbuco"
+
msgid "Czech CUZK:KM"
msgstr "Czech CUZK:KM"
@@ -16629,6 +16753,12 @@ msgstr "Stevns (Denemarken)"
msgid "Vejmidte (Denmark)"
msgstr "Vejmidte (Denemarken)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr "imagico.de OSM images for mapping: El Altar"
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Estonia Basemap (Maaamet)"
@@ -16662,9 +16792,6 @@ msgstr "Kadaster"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr "CRAIG - Auvergne 2013 - 25 cm"
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Alpen-Maritiem 2009 - 40 cm"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "GrandNancy luchtfoto 2012"
@@ -16723,9 +16850,6 @@ msgstr ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - luchtfoto''s "
"1999 - 1 m"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (taal: Servisch)"
-
msgid "Hamburg (40 cm)"
msgstr "Hamburg (40 cm)"
@@ -16753,9 +16877,6 @@ msgstr "Berlijn luchtfoto''s 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Berlijn luchtfoto''s 2016"
-msgid "Stuttgart (aerial imagery)"
-msgstr "Stuttgart (luchtfoto''s)"
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Erlangen luchtfoto''s (2016 5.0 cm)"
@@ -16790,9 +16911,57 @@ msgstr "NRW-Atlas: Topografische kaart 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropool Ruhr: Luchtfoto (10 cm)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr "imagico.de OSM images for mapping: Qasigiannguit"
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr "imagico.de OSM images for mapping: Thule Air Base"
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr "imagico.de OSM images for mapping: Greenland mosaic"
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr "imagico.de OSM images for mapping: Northern Greenland ASTER"
+
msgid "Drone Imagery (Haiti)"
msgstr "Drone afbeeldingen (Haiti)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone afbeeldingen 2014 (Haiti)"
@@ -16829,14 +16998,8 @@ msgstr "Danube overstroming ortophoto 2013"
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Rivieroevers van Danube in Boedapest, Szentendre en Szigetmonostor"
-msgid "Budapest district XII ortophoto 2013"
-msgstr "Boedapest district XII ortophoto 2013"
-
-msgid "Interspect Budapest ortophoto 2014"
-msgstr "Interspect Budapest ortophoto 2014"
-
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
-msgstr "Vijf districten van Budapest: III, IV, XIII, XIV, XV"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Hongarije (wandelroutes)"
@@ -16844,6 +17007,21 @@ msgstr "OpenStreetMap Hongarije (wandelroutes)"
msgid "Hillshade Hungary"
msgstr "Hillshade Hongarije"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgstr "imagico.de OSM images for mapping: Eastern Iceland"
+
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr "imagico.de OSM images for mapping: Rann of Kutch"
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr "imagico.de OSM images for mapping: Southeastern Sulawesi"
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr "imagico.de OSM images for mapping: Bakun Reservoir"
+
+msgid "imagico.de OSM images for mapping: Batam"
+msgstr "imagico.de OSM images for mapping: Batam"
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -16904,9 +17082,21 @@ msgstr "PCN 2012 - Italië"
msgid "South Tyrol Orthofoto 2011"
msgstr "Zuid Tirol luchtofoto 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr "Zuid Tirol Topomap"
+msgid "Japan GSI ortho Imagery"
+msgstr "Japan GSI ortho Imagery"
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "USSR - Letland"
@@ -16940,12 +17130,35 @@ msgstr "Niger Delta Oct 2012 Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard -Orthophoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr "imagico.de OSM images for mapping: Western Karakoram"
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Gaza Strip - Pléiades - 2014/07/06"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr "imagico.de OSM images for mapping: Panama Canal"
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr "imagico.de OSM images for mapping: Vanatinai"
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr "imagico.de OSM images for mapping: New Ireland"
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Pangasinán/Bulacan (Filipijnen HiRes)"
@@ -17072,9 +17285,6 @@ msgstr "Świętochłowice: Ortofotomapa 2012 (luchtfoto)"
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Zabrze: Ortofotomapa 2011 (luchtfoto)"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Szlaki (paden)"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr "Wrocław: Ortofotomapa 2015 (luchtfoto)"
@@ -17084,6 +17294,20 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Car"
@@ -17105,12 +17329,30 @@ msgstr "RABA-KGZ: Sloveens gebruik landerijen"
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr "RABA-KGZ: Slovenië bebouwde gebieden"
+msgid "City of Cape Town 2013 Aerial"
+msgstr "Kaapstad 2013 Luchtfoto"
+
msgid "City of Cape Town 2015 Aerial"
msgstr "Kaapstad 2015 luchtfoto''s"
msgid "South Africa CD:NGI Aerial"
msgstr "Zuid-Afrika CD:NGI Luchtfoto"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr "imagico.de OSM images for mapping: Leskov Island ASTER"
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr "imagico.de OSM images for mapping: Scott Island"
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr "imagico.de OSM images for mapping: Leskov Island Landsat"
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr "imagico.de OSM images for mapping: Clerke Rocks"
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr "imagico.de OSM images for mapping: Shag Rocks"
+
msgid "Catastro Spain"
msgstr "Catastro Spanje"
@@ -17132,6 +17374,9 @@ msgstr "IDEIB - Balearen"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Canarische eilanden"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Kanton Aargau 25cm (AGIS 2011)"
@@ -17174,6 +17419,9 @@ msgstr "Kanton Freiburg 50cm (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Stad Bern 10cm/25cm (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr "Stad Bern 10cm (2016)"
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -17195,6 +17443,12 @@ msgstr "Bonvillars Orthophoto 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Fiez Orthophoto 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr "Kanton Basel-Stadt 2015"
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr "Taiwan e-Map Open Data"
@@ -17210,6 +17464,9 @@ msgstr "Taiwan Land-Section Data"
msgid "NLSC Open Data WMTS"
msgstr "NLSC Open Data WMTS"
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "MSR Maps Topo"
@@ -17237,9 +17494,54 @@ msgstr "NC Laatste luchtfoto''s"
msgid "U.S. Forest Service roads"
msgstr "U.S. Forest Service roads"
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr "imagico.de OSM images for mapping: Alaska Range"
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr "NJ 2015 Aerial Imagery (Infrared)"
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr "NJ 2015 Aerial Imagery (Natural Color)"
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr "San Juan Metro Area: 2013 USACE Orthophotos"
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr "WA 2013 aerial imagery for San Juan County"
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr "WA Vector Streetmap for San Juan County"
+
+msgid "Texas Orthophoto"
+msgstr "Texas Orthophoto"
+
+msgid "Philadelphia 2015 Imagery"
+msgstr "Philadelphia 2015 Imagery"
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr "MD 2014 6 Inch Aerial Imagery"
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr "MD Three Inch Aerial Imagery"
+
+msgid "MD Transportation Basemap"
+msgstr "MD Transportation Basemap"
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr "imagico.de OSM images for mapping: Rwenzori Mountains"
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Oekraïne - Orthophotomaps 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr "Oekraïne - Kiev 2014 (DZK)"
@@ -17261,9 +17563,6 @@ msgstr "Surrey Air Survey"
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Scotland 1842-82"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr "NLS - OS 6-inch County Series 1888-1913"
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -17273,9 +17572,6 @@ msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr "NLS - OS 25-inch (Scotland) 1892-1905"
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25k historisch (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "OS 1:25k historisch (OSM-Limited)"
@@ -17618,8 +17914,8 @@ msgstr "Nieuwe gegevens downloaden als u pant/zoomt"
msgid "Create a grid of ways."
msgstr "Maak een raster van wegen."
-msgid "Customization of public transport stops."
-msgstr "Aanpassen van haltes openbaar vervoer."
+msgid "Customization of public public transport stops."
+msgstr ""
msgid ""
"Creating and handling address nodes and buildings within Czech Republic."
@@ -17731,6 +18027,10 @@ msgstr "Eenvoudig gereedschap om huisnummers te taggen."
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "Genereer Imagery-XML-grenzen van een multipolygon"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+"Tegels exporteren vanuit de afbeeldingslaag naar het bestandssysteem."
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18399,7 +18699,7 @@ msgid "spur"
msgstr "wissels"
msgid "crossover"
-msgstr ""
+msgstr "spoorwegovergang"
msgid "Electrified"
msgstr "Elektrisch"
@@ -19455,7 +19755,7 @@ msgstr ""
msgctxt "Highway"
msgid "trunk"
-msgstr ""
+msgstr "autoweg"
msgctxt "Highway"
msgid "trunk_link"
@@ -20272,6 +20572,9 @@ msgstr "Beek"
msgid "River"
msgstr "Rivier"
+msgid "Lock"
+msgstr "Sluis"
+
msgid "Canal"
msgstr "Kanaal"
@@ -21327,6 +21630,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr "Pension/Bed & Breakfast"
+msgid "Apartment"
+msgstr "Appartement"
+
+msgid "Number of apartments"
+msgstr "Aantal appartementen"
+
msgid "Chalet"
msgstr "Bungalowpark"
@@ -21393,6 +21702,12 @@ msgstr "Terras buiten"
msgid "Takeaway"
msgstr "Afhalen"
+msgid "Delivery"
+msgstr "Levering"
+
+msgid "Mo-Su 12:00-22:00"
+msgstr "Ma-Zo 12:00-22:00"
+
msgid "Fast Food"
msgstr "Fastfood"
@@ -22338,31 +22653,19 @@ msgstr "wild_schuilplaats"
msgid "Hunting Stand"
msgstr "Jachthut"
-msgid "Height"
-msgstr "Hoogte"
-
-msgctxt "height"
-msgid "low"
-msgstr "laag"
-
-msgctxt "height"
-msgid "half"
-msgstr "helft"
-
-msgctxt "height"
-msgid "full"
-msgstr "volledig"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr "Schuilplaats"
-msgid "Lock"
-msgstr "Afgesloten"
+msgid "Lockable"
+msgstr "Afsluitbaar"
msgid "Water Point"
msgstr "Waterpunt"
+msgid "Animal watering place"
+msgstr "Waterplaats voor dieren"
+
msgid "Compressed Air"
msgstr "Luchtdruk"
@@ -22836,7 +23139,7 @@ msgstr "universiteit"
msgctxt "building"
msgid "college"
-msgstr ""
+msgstr "schoolgebouw"
msgctxt "building"
msgid "hospital"
@@ -22954,6 +23257,10 @@ msgid "hut"
msgstr "hut"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr "slaapzaal"
@@ -24249,6 +24556,9 @@ msgstr "Slager"
msgid "Seafood"
msgstr "Viswinkel"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Delicatessen (fijne kost)"
@@ -25066,9 +25376,6 @@ msgstr "Bomenrij"
msgid "A line of trees."
msgstr "Een bomenrij"
-msgid "Wood"
-msgstr "Oerbos"
-
msgid "Woodland where timber production does not dominate use."
msgstr "Een bosgebied waar houtproductie niet het gebruik domineert."
@@ -26133,6 +26440,9 @@ msgstr "Verschillend aantal lanes in de sleutels {0} en {1}"
msgid "possibly missing {0} tag"
msgstr "mogelijk ontbrekende {0} tag"
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0} is vervallen"
@@ -26210,7 +26520,7 @@ msgid "Definition of {0} is unclear"
msgstr "Definitie van {0} is niet helder"
msgid "{0} + {1} + {2}"
-msgstr ""
+msgstr "{0} + {1} + {2}"
msgid ""
"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
@@ -26244,6 +26554,12 @@ msgstr "onwaarschijnlijke sleutel (eindigt op een getal)"
msgid "The key {0} has an uncommon value."
msgstr "De sleutel {0} heeft een ongewone waarde."
+msgid "misspelled value"
+msgstr "verkeerd gespelde waarde"
+
+msgid "wrong value: {0}"
+msgstr "verkeerde waarde: {0}"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} op een knoop. Zou moeten wordne gebruikt op een weg."
@@ -26324,6 +26640,13 @@ msgstr "Kustlijn binnen {1}"
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} zou op de node moeten zijn waar {1} en {2} kruisen"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+"{0} is de tag voor de lineaire waterweg. Gebruik in plaats daarvan {1} + {2} "
+"om het watergebied te taggen."
+
msgid "abbreviated street name"
msgstr "afgekorte straatnaam"
@@ -26348,6 +26671,9 @@ msgstr "{0} gebruikt met {1}"
msgid "street name contains ss"
msgstr "straatnaam bevat ss"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -27171,6 +27497,21 @@ msgstr "De huidige wijzigingenset indienen"
msgid "Submit the current changeset to Mapillary"
msgstr "De huidige wijzigingenset naar Mapillary indienen"
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr "Uploaden van wijzigingenset mislukt met {0} fout ''{1} {2}''!"
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+"er trad een uitzondering op tijdens het indienen van de wijzigingenset. Als "
+"dit vaker voorkomt, overweeg dan om een bug te rapporteren via het menu "
+"Help. Als dit bericht voor de eerste keer verschijnt, probeer het dan gewoon "
+"nog een keer. Dit zou een probleempje met de internetverbinding geweest "
+"kunnen zijn."
+
msgid "Upload pictures"
msgstr "Afbeeldingen uploaden"
@@ -27213,8 +27554,8 @@ msgstr "Dialoogvenster voor wijzigingenset Mapillary openen"
msgid "Mapillary changeset"
msgstr "Mapillary wijzigingenset"
-msgid "Submit"
-msgstr "Indienen"
+msgid "Submitting changeset to server…"
+msgstr "Wijzigingenset indienen bij de server…"
msgid "Export all images"
msgstr "Alle afbeeldingen exporteren"
@@ -28134,6 +28475,9 @@ msgstr ""
msgid "Area Selector"
msgstr "Gebiedsselectie"
+msgid "Trying to detect an area at:"
+msgstr "Proberen om een gebied te detecteren op:"
+
msgid "Created area"
msgstr "Gemaakt gebied"
@@ -28180,11 +28524,11 @@ msgid "Algorithm"
msgstr "Algoritme"
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
-"Maximum aantal pixels dat een punt mag zijn gelegen vanaf een lijn om nog "
-"steeds beschouwd te worden als lid van die lijn (Standaard: {0})."
+"Maximale afstand in meters tussen een punt en de lijn om als lid van die "
+"lijn te worden beschouwd (Standaard: {0})."
msgid "Distance Tolerance"
msgstr "Afstandstolerantie"
@@ -29921,6 +30265,66 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Open afbeeldings-XML-bestand"
+msgid "Export tiles"
+msgstr "Tegels exporteren"
+
+msgid "Export cached tiles to file system."
+msgstr "Gecachte tegels naar bestandssysteem exporteren."
+
+msgid "Exporting cached tiles"
+msgstr "Gecachte tegels exporteren"
+
+msgid "Failed to write image file {0}: {1}"
+msgstr "Wegschrijven naar afbeeldingsbestand {0}: {1} mislukt"
+
+msgid "Failed to write image file {0}."
+msgstr "Wegschrijven naar afbeeldingsbestand {0} mislukt."
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] "Geëxporteerde {0} tegel vanuit laag {1}."
+msgstr[1] "Geëxporteerde {0} tegels vanuit laag {1}."
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+"Pad voor exporteren naar bestandssysteem bestaat al, maar er is geen map."
+
+msgid "Failed to create export directory: {0}"
+msgstr "Maken van map voor exporteren: {0} mislukt"
+
+msgid "Failed to create export directory."
+msgstr "Maken van map voor exporteren mislukt."
+
+msgid "Append cache name"
+msgstr "Naam van cache toevoegen"
+
+msgid "Export Tiles"
+msgstr "Tegels exporteren"
+
+msgid "Cache name:"
+msgstr "Naam van cache:"
+
+msgid "Object count:"
+msgstr "Aantal objecten:"
+
+msgid "file system path"
+msgstr "pad naar bestandssysteem"
+
+msgid "File system path the tiles are exported to."
+msgstr "Pad naar bestandssysteem waar de tegels naartoe worden geëxporteerd."
+
+msgid "Export directory:"
+msgstr "Map voor exporteren:"
+
+msgid "Append cache name to export directory."
+msgstr "Naam van cache toevoegen aan map voor exporteren."
+
+msgid "Tiles will be exported to directory {0}"
+msgstr "Tegels zullen worden geëxporteerd naar de map {0}"
+
+msgid "No export directory set."
+msgstr "Geen map voor exporteren ingesteld."
+
msgid "Calibration Layer"
msgstr "Laag voor calibratie"
@@ -32249,9 +32653,6 @@ msgstr "PT: Route zou moeten beginnen en eindigen met een stop_position"
msgid "PT: First or last way needs to be split"
msgstr "PT: Eerste of laatste weg zou moeten wordne gesplitst"
-msgid "PT: Problem in the route segment"
-msgstr "PT: Probleem in het segment van de route"
-
msgid "PT: Stop not served"
msgstr "PT: Halte niet in service"
@@ -32421,9 +32822,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr "[gat]"
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "Routepatronen ..."
@@ -32481,6 +32879,9 @@ msgstr "linkerkant"
msgid "Maximum distance from route"
msgstr "Maximale afstand vanaf route"
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "Openbaar vervoer: Wijzig type van halte"
@@ -32683,11 +33084,6 @@ msgstr "Polygoon reconstrueren"
msgid "Multipolygon must consist only of ways"
msgstr "Multipolygoon mag alleen wegen bevatten"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-"De reconstructie van polygonen kan alleen van buitenste wegen worden "
-"uitgevoerd"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Reconstrueer polygonen van relatie {0}"
diff --git a/i18n/po/nn.po b/i18n/po/nn.po
index f989e4b..62fc7b8 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:59+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:04+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: nn\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr "Hjelp"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr "Feil"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -708,6 +714,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -729,9 +738,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -782,6 +788,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -931,16 +940,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -949,6 +958,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -964,12 +979,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1762,9 +1771,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3950,9 +3956,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3982,12 +3985,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4680,12 +4698,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4702,8 +4726,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5024,9 +5048,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5165,82 +5186,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5406,6 +5351,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5465,7 +5486,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6857,212 +6878,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8168,6 +8189,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9654,6 +9678,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9666,9 +9693,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9765,14 +9789,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9785,6 +9801,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10773,6 +10792,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10785,6 +10807,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10797,6 +10831,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10856,6 +10893,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10874,9 +10916,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12071,6 +12120,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13106,6 +13161,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13127,12 +13188,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14092,6 +14147,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14580,13 +14638,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14610,7 +14671,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14661,7 +14725,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14670,10 +14734,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14709,6 +14785,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14754,10 +14836,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14790,34 +14878,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14856,6 +14984,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14889,9 +15023,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14948,9 +15079,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14978,9 +15106,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15014,9 +15139,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15053,19 +15223,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15128,9 +15307,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15164,12 +15355,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15296,9 +15509,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15308,6 +15518,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15329,12 +15553,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15356,6 +15598,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15398,6 +15643,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15419,6 +15667,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15434,6 +15688,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15461,9 +15718,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15485,9 +15787,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15497,9 +15796,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15811,7 +16107,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15899,6 +16195,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18295,6 +18594,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19343,6 +19645,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19409,6 +19717,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20352,31 +20666,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20968,6 +21270,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22261,6 +22567,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23074,9 +23383,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24121,6 +24427,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24212,6 +24521,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24288,6 +24603,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24312,6 +24632,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25085,6 +25408,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25127,7 +25460,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25930,6 +26263,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25971,8 +26307,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27570,6 +27906,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29731,9 +30126,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29891,9 +30283,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29951,6 +30340,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30148,9 +30540,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/oc.po b/i18n/po/oc.po
index d88712e..d7360b8 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:01+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:06+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr "Ajuda"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -204,6 +210,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr "Apondre lo calc d’imatjariá {0}"
@@ -225,12 +237,6 @@ msgstr "Error"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr "Apondre un nosèl..."
@@ -715,6 +721,9 @@ msgstr "Anar a la posicion"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr "Anar dirèctament a una posicion"
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -736,9 +745,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Anar aicí"
-msgid "Jump to Position"
-msgstr "Anar dirèctament a una posicion"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -789,6 +795,9 @@ msgstr "Fusionar lo calc"
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -938,24 +947,30 @@ msgstr[1] "Dobertura dels fichièrs {0}..."
msgid "Opening file ''{0}'' ..."
msgstr "Dobertura del fichièr ''{0}''…"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "D'acòrdi"
+
msgid "Open Location..."
msgstr "Dobrir un emplaçament..."
msgid "Open an URL."
msgstr "Dobrir una URL"
-msgid "Separate Layer"
-msgstr "Calc separat"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Telecargar las donadas dins un calc novèl"
-
msgid "Enter URL to download:"
msgstr "Picar l’URL de telecargar :"
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr "Calc separat"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Telecargar las donadas dins un calc novèl"
+
msgid "Download Location"
msgstr ""
@@ -971,12 +986,6 @@ msgstr ""
msgid "Download Data"
msgstr "Telecargar de donadas"
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr "D'acòrdi"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1769,9 +1778,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3957,9 +3963,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3989,12 +3992,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4687,12 +4705,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4709,8 +4733,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5031,9 +5055,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5172,82 +5193,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr "Proprietats"
-
-msgid "Tags"
-msgstr "Etiquetas"
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr "Membres"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5413,6 +5358,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr "Proprietats"
+
+msgid "Tags"
+msgstr "Etiquetas"
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr "Membres"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5472,7 +5493,7 @@ msgstr "Ròtle"
msgid "Primitive"
msgstr "Primitiva"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6832,122 +6853,36 @@ msgstr "tampat"
msgid "Download content"
msgstr ""
-msgid "Download the changeset content from the OSM server"
-msgstr ""
-
-msgid "Update content"
-msgstr ""
-
-msgid "Update the changeset content from the OSM server"
-msgstr ""
-
-msgid "Changeset ID: "
-msgstr ""
-
-msgid "Enter a changeset id"
-msgstr ""
-
-msgid ""
-"Download the changeset with the specified id, including the changeset content"
-msgstr ""
-
-msgid "Select changesets owned by specific users"
-msgstr ""
-
-msgid "Select changesets depending on whether they are open or closed"
-msgstr ""
-
-msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr ""
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr ""
-
-msgid "Query open changesets only"
-msgstr ""
-
-msgid "Query closed changesets only"
-msgstr ""
-
-msgid "Query both open and closed changesets"
-msgstr ""
-
-msgid "Only changesets owned by myself"
-msgstr ""
-
-msgid "User ID:"
-msgstr "Identificant de l'utilizaire :"
-
-msgid "User name:"
-msgstr "Nom d'utilizaire :"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr ""
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-
-msgid "Please enter a valid user ID"
-msgstr ""
-
-msgid "Invalid user ID"
-msgstr "ID d'utilizaire invalida"
-
-msgid "Please enter a non-empty user name"
-msgstr ""
-
-msgid "Invalid user name"
+msgid "Download the changeset content from the OSM server"
msgstr ""
-msgid "Date: "
-msgstr "Data : "
-
-msgid "Time:"
+msgid "Update content"
msgstr ""
-msgid "Closed after - "
+msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Date:"
-msgstr "Data :"
+msgid "Changeset ID: "
+msgstr ""
-msgid "Created before - "
+msgid "Enter a changeset id"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid ""
+"Download the changeset with the specified id, including the changeset content"
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Select changesets owned by specific users"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Select changesets depending on whether they are open or closed"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Select changesets based on the date/time they have been created or closed"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Select only changesets related to a specific bounding box"
msgstr ""
msgid ""
@@ -6963,23 +6898,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-
-msgid "Please enter an integer value > 0"
-msgstr ""
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-
msgid "Download my changesets only"
msgstr ""
@@ -7055,6 +6973,66 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid "Query open changesets only"
+msgstr ""
+
+msgid "Query closed changesets only"
+msgstr ""
+
+msgid "Query both open and closed changesets"
+msgstr ""
+
+msgid "Date: "
+msgstr "Data : "
+
+msgid "Time:"
+msgstr ""
+
+msgid "Closed after - "
+msgstr ""
+
+msgid "Date:"
+msgstr "Data :"
+
+msgid "Created before - "
+msgstr ""
+
+msgid "Only changesets closed after the following date/time"
+msgstr ""
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+
+msgid "Invalid date/time values"
+msgstr ""
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+
+msgid "Please enter an integer value > 0"
+msgstr ""
+
msgid "URL: "
msgstr "URL : "
@@ -7072,6 +7050,49 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Only changesets owned by myself"
+msgstr ""
+
+msgid "User ID:"
+msgstr "Identificant de l'utilizaire :"
+
+msgid "User name:"
+msgstr "Nom d'utilizaire :"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr ""
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr ""
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+
+msgid "Please enter a valid user ID"
+msgstr ""
+
+msgid "Invalid user ID"
+msgstr "ID d'utilizaire invalida"
+
+msgid "Please enter a non-empty user name"
+msgstr ""
+
+msgid "Invalid user name"
+msgstr ""
+
msgid "Activate"
msgstr "Activar"
@@ -8175,6 +8196,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9663,6 +9687,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "Fichièrs àudio Wave (*.wav)"
+
msgid "Import Audio"
msgstr "Importar Àudio"
@@ -9675,9 +9702,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr "Fichièrs àudio Wave (*.wav)"
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9774,14 +9798,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9794,6 +9810,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10782,6 +10801,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10794,6 +10816,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10806,6 +10840,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10865,6 +10902,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10883,9 +10925,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12080,6 +12129,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13115,6 +13170,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13136,12 +13197,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14101,6 +14156,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14589,13 +14647,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14619,7 +14680,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14670,7 +14734,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14679,10 +14743,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14718,6 +14794,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14763,10 +14845,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14799,34 +14887,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14865,6 +14993,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14898,9 +15032,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14957,9 +15088,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14987,9 +15115,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15023,9 +15148,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15062,19 +15232,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15137,9 +15316,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15173,12 +15364,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15305,9 +15518,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15317,6 +15527,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15338,12 +15562,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15365,6 +15607,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15407,6 +15652,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15428,6 +15676,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15443,6 +15697,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15470,9 +15727,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15494,9 +15796,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15506,9 +15805,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15820,7 +16116,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15908,6 +16204,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18304,6 +18603,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19352,6 +19654,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19418,6 +19726,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20361,31 +20675,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20977,6 +21279,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22270,6 +22576,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23083,9 +23392,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24130,6 +24436,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24221,6 +24530,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24297,6 +24612,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24321,6 +24641,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25094,6 +25417,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25136,7 +25469,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25939,6 +26272,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25980,8 +26316,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27579,6 +27915,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29740,9 +30135,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29900,9 +30292,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29960,6 +30349,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30157,9 +30549,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/pa.po b/i18n/po/pa.po
index 38e9a8b..25162b9 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:01+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:06+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: pa\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr "ਮੱਦਦ"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr ""
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -708,6 +714,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -729,9 +738,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -782,6 +788,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -931,16 +940,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -949,6 +958,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -964,12 +979,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1762,9 +1771,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3950,9 +3956,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3982,12 +3985,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4680,12 +4698,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4702,8 +4726,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5024,9 +5048,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5165,82 +5186,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5406,6 +5351,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5465,7 +5486,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6857,212 +6878,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8168,6 +8189,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9654,6 +9678,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9666,9 +9693,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9765,14 +9789,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9785,6 +9801,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10773,6 +10792,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10785,6 +10807,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10797,6 +10831,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10856,6 +10893,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10874,9 +10916,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12071,6 +12120,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13106,6 +13161,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13127,12 +13188,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14092,6 +14147,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14580,13 +14638,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14610,7 +14671,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14661,7 +14725,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14670,10 +14734,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14709,6 +14785,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14754,10 +14836,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14790,34 +14878,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14856,6 +14984,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14889,9 +15023,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14948,9 +15079,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14978,9 +15106,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15014,9 +15139,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15053,19 +15223,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15128,9 +15307,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15164,12 +15355,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15296,9 +15509,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15308,6 +15518,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15329,12 +15553,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15356,6 +15598,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15398,6 +15643,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15419,6 +15667,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15434,6 +15688,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15461,9 +15718,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15485,9 +15787,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15497,9 +15796,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15811,7 +16107,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15899,6 +16195,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18295,6 +18594,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19343,6 +19645,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19409,6 +19717,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20352,31 +20666,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20968,6 +21270,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22261,6 +22567,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23074,9 +23383,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24121,6 +24427,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24212,6 +24521,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24288,6 +24603,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24312,6 +24632,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25085,6 +25408,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25127,7 +25460,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25930,6 +26263,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25971,8 +26307,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27570,6 +27906,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29731,9 +30126,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29891,9 +30283,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29951,6 +30340,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30148,9 +30540,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/pl.po b/i18n/po/pl.po
index 3c2ce6d..c8ed21e 100644
--- a/i18n/po/pl.po
+++ b/i18n/po/pl.po
@@ -2,23 +2,23 @@
# PAWEŁ MADEJ <nysander at quanteam.pl>, 2008.
# Nabuchodonozor <nabuchodonozor.2nd at gmail.com>, 2008.
# MARCIN FLORYAN <mfloryan at mmsqaure.com>, 2008.
-# Piotr Sokół <psokol.l10n at gmail.com>, 2016.
+# Piotr Sokół <psokol.l10n at gmail.com>, 2016, 2017.
#
msgid ""
msgstr ""
-"Project-Id-Version: josm\n"
+"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-06 22:51+0100\n"
-"PO-Revision-Date: 2016-10-06 21:24+0000\n"
-"Last-Translator: Daniel Koć <daniel at xn--ko-wla.pl>\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
+"PO-Revision-Date: 2017-01-06 11:36+0000\n"
+"Last-Translator: Rafał Rudzik <rrudzik at gmail.com>\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: 2016-11-07 05:03+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:08+0000\n"
+"X-Generator: Launchpad (build 18302)\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"
@@ -29,6 +29,9 @@ msgstr "Wykop"
msgid "Lit"
msgstr "Oświetlenie"
+msgid "Repair"
+msgstr "Warsztat naprawczy"
+
msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}: opcja „{1}” jest niejednoznaczna"
@@ -74,9 +77,15 @@ msgstr "Budowanie menu głównego"
msgid "Help"
msgstr "Pomoc"
+msgid "Initializing internal boundaries data"
+msgstr "Inicjowanie danych wewnętrznych granic"
+
msgid "Initializing OSM API"
msgstr "Inicjowanie API OSM"
+msgid "Initializing internal traffic data"
+msgstr "Inicjowanie wewnętrznych danych o kierunku ruchu"
+
msgid "Initializing validator"
msgstr "Inicjowanie walidatora"
@@ -147,10 +156,10 @@ msgid "Plugins"
msgstr "Wtyczki"
msgid "About JOSM..."
-msgstr "O JOSM..."
+msgstr "Informacje o JOSM..."
msgid "OK"
-msgstr "OK"
+msgstr "Zatwierdź"
msgid "Report bug"
msgstr "Zgłoś błąd"
@@ -221,6 +230,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr "Zaznacza na mapie elementy wskazane na powyższej liście"
+msgid "Select WMS layers"
+msgstr "Wybierz warstwy WMS"
+
+msgid "Add layers"
+msgstr "Dodaj warstwy"
+
msgid "Add imagery layer {0}"
msgstr "Dodaje warstwę podkładu {0}"
@@ -242,12 +257,6 @@ msgstr "Błąd"
msgid "Select image format for WMS layer"
msgstr "Wybierz format obrazu dla warsty WMS"
-msgid "Select WMS layers"
-msgstr "Wybierz warstwy WMS"
-
-msgid "Add layers"
-msgstr "Dodaj warstwy"
-
msgid "Add Node..."
msgstr "Dodaj węzeł..."
@@ -258,19 +267,19 @@ msgid "Edit: {0}"
msgstr "Edycja: {0}"
msgid "Align Nodes in Circle"
-msgstr "Wyrównaj węzły na kole"
+msgstr "Wyrównaj węzły na okręgu"
msgid "Move the selected nodes into a circle."
-msgstr "Przesuwa wybrane węzły tak, aby tworzyły koło."
+msgstr "Przesuwa wybrane węzły tak, aby tworzyły okrąg."
msgid "Tool: {0}"
msgstr "Narzędzie: {0}"
msgid "Not enough nodes in selected ways."
-msgstr "Zbyt mało węzłów w wybranych ścieżkach."
+msgstr "Zbyt mało węzłów w wybranych liniach."
msgid "Please select at least four nodes."
-msgstr "Wybierz co najmniej cztery węzły."
+msgstr "Proszę wybrać co najmniej cztery węzły."
msgid "Cannot determine center of selected nodes."
msgstr "Nie można określić środka z wybranych węzłów."
@@ -278,8 +287,8 @@ msgstr "Nie można określić środka z wybranych węzłów."
msgid ""
"One or more nodes involved in this action is outside of the downloaded area."
msgstr ""
-"Jeden lub więcej węzłów biorących udziął w tej akcji jest poza pobranym "
-"obszarem."
+"Jeden lub więcej węzłów biorących udział w tej czynności znajduje się poza "
+"pobranym obszarem."
msgid "Align Nodes in Line"
msgstr "Wyrównaj węzły wzdłuż prostej"
@@ -288,17 +297,17 @@ msgid "Move the selected nodes in to a line."
msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii."
msgid "Please select at least three nodes."
-msgstr "Wybierz co najmniej trzy węzły."
+msgstr "Proszę wybrać co najmniej trzy węzły."
msgid "Can not align a polygon. Abort."
-msgstr "Nie można wyrównać wieloboku. Akcja przerwana."
+msgstr "Nie można wyrównać wieloboku. Przerwano czynność."
msgid "Intersection of three or more ways can not be solved. Abort."
msgstr ""
-"Nie można rozwiązać przecięcia trzech lub więcej linii. Akcja przerwana."
+"Nie można rozwiązać przecięcia trzech lub więcej linii. Przerwano czynność."
msgid "Two parallels ways found. Abort."
-msgstr "Znaleziono dwie równoległe linie. Akcja przerwana."
+msgstr "Znaleziono dwie równoległe linie. Przerwano czynność."
msgid "data"
msgstr "dane"
@@ -364,7 +373,7 @@ msgid "No open changesets"
msgstr "Brak otwartych zestawów zmian"
msgid "Downloading open changesets ..."
-msgstr "Pobieram otwarte zestawy zmian..."
+msgstr "Pobieranie otwartych zestawów zmian..."
msgid "Combine Way"
msgstr "Połącz linie"
@@ -487,7 +496,7 @@ msgid "Download from OSM..."
msgstr "Pobierz z OSM..."
msgid "Download map data from the OSM server."
-msgstr "Pobiera dane mapy z serwera OSM."
+msgstr "Pobiera dane mapy z serwera OSM"
msgid ""
"<html>This action will require {0} individual<br>download requests. Do you "
@@ -500,7 +509,7 @@ msgid "Download data"
msgstr "Pobiera dane"
msgid "Download notes in current view"
-msgstr "Pobierz uwagi w bieżącym widoku"
+msgstr "Pobierz uwagi w aktualnym widoku"
msgid "Download in current view"
msgstr "Pobierz w aktualnym widoku"
@@ -533,10 +542,10 @@ msgid "Exit the application."
msgstr "Kończy działanie programu"
msgid "Expert Mode"
-msgstr "Tryb zaawansowany"
+msgstr "Tryb ekspercki"
msgid "Enable/disable expert mode"
-msgstr "Przełącza tryb zaawansowany"
+msgstr "Przełącza tryb ekspercki"
msgid "Follow line"
msgstr "Podążaj za linią"
@@ -588,10 +597,10 @@ msgid "New offset"
msgstr "Nowe przesunięcie"
msgid "Adjust the position of this imagery layer"
-msgstr "Dopasuj położenie warstwy obrazu"
+msgstr "Ustala położenie warstwy podkładu"
msgid "Adjust imagery offset"
-msgstr "Ustala przesunięcie warstwy podkładu"
+msgstr "Ustalanie przesunięcia podkładu"
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
@@ -617,14 +626,14 @@ msgid "Offset bookmark already exists. Overwrite?"
msgstr "Zakładka przesunięcia już istnieje. Zastąpić ją?"
msgid "Advanced info"
-msgstr "Szczegółowe informacje"
+msgstr "Szczegóły"
msgid ""
"Display advanced object information about OSM nodes, ways, or relations."
msgstr "Wyświetla szczegółowe informacje o węzłach, liniach lub relacjach."
msgid "Advanced info (web)"
-msgstr "Szczegółowe informacje (WWW)"
+msgstr "Szczegóły (strona internetowa)"
msgid ""
"Display object information about OSM nodes, ways, or relations in web "
@@ -762,6 +771,9 @@ msgstr "Przejdź do położenia"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Otwiera okno umożliwiające wyświetlenie wybranego położenia"
+msgid "Jump to Position"
+msgstr "Przechodzenie do położenia"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Wpisz Szerokość/Długość żeby przejść do pozycji"
@@ -783,9 +795,6 @@ msgstr "Adres URL"
msgid "Jump there"
msgstr "Przejdź"
-msgid "Jump to Position"
-msgstr "Przechodzenie do położenia"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Nie można przetworzyć współrzędnych lub przybliżenia. Proszę sprawdzić "
@@ -840,6 +849,9 @@ msgstr "Połącz warstwy"
msgid "Merge the current layer into another layer"
msgstr "Łączy bieżącą warstwę z inną"
+msgid "{0} completed in {1}"
+msgstr "ukończono {0} z {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Łączenie warstw z różnymi zasadami wysyłania"
@@ -1017,24 +1029,30 @@ msgstr[2] "Otwieranie {0} plików..."
msgid "Opening file ''{0}'' ..."
msgstr "Otwieranie pliku „{0}” ..."
+msgid "Which tasks to perform?"
+msgstr "Które zadania wykonać?"
+
+msgid "Ok"
+msgstr "Zatwierdź"
+
msgid "Open Location..."
msgstr "Otwórz adres..."
msgid "Open an URL."
msgstr "Otwiera adres URL."
-msgid "Separate Layer"
-msgstr "Osobna wartwa"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Wczytuje dane do nowej warstwy"
-
msgid "Enter URL to download:"
msgstr "Proszę wprowadzić adres danych do pobrania:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Wprowadź URL z którego powinny być pobierane dane"
+msgid "Separate Layer"
+msgstr "Osobna warstwa"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Wczytuje dane do nowej warstwy"
+
msgid "Download Location"
msgstr "Położenie pobierania"
@@ -1050,12 +1068,6 @@ msgstr "Zamyka okno i anuluje pobieranie"
msgid "Download Data"
msgstr "Pobierz dane"
-msgid "Which tasks to perform?"
-msgstr "Które zadania wykonać?"
-
-msgid "Ok"
-msgstr "OK"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1152,10 +1164,10 @@ msgid "Paste"
msgstr "Wklej"
msgid "Paste contents of clipboard."
-msgstr "Wklej zawartość schowka."
+msgstr "Wkleja zawartość schowka"
msgid "Paste at source position"
-msgstr "Wklej do położenia źródłowego"
+msgstr "Wklej do pierwotnego położenia"
msgid "Paste contents of clipboard at the position they were copied from."
msgstr "Wkleja zawartość schowka do położenia, z którego została skopiowana."
@@ -1228,7 +1240,7 @@ msgid "Redo {0}"
msgstr "Ponawia {0}"
msgid "Rename layer"
-msgstr "Zmień nazwę warstwy"
+msgstr "Zmień nazwę"
msgid "Also rename the file"
msgstr "Zmienienie także nazwy pliku"
@@ -1582,13 +1594,13 @@ msgid "Tags / Memberships"
msgstr "Znaczniki / członkowie"
msgid "Unglue"
-msgstr "Rozdzielanie"
+msgstr "Rozdziel"
msgid "Where should the tags of the node be put?"
-msgstr "Gdzie należy umieścić tagi węzła?"
+msgstr "Gdzie umieścić znaczniki węzła?"
msgid "Where should the memberships of this node be put?"
-msgstr "Gdzie należy umieścić członkostwo tego węzła?"
+msgstr "Gdzie umieścić członkostwo tego węzła?"
msgid "Unglued Node"
msgstr "Rozdzielony węzeł"
@@ -1926,9 +1938,6 @@ msgstr "Odpytaj i pobierz zestawy zmian..."
msgid "Errors during download"
msgstr "Błędy w czasie pobierania"
-msgid "Download Geo URL"
-msgstr "pobierz geolokalizacyjny adres URL"
-
msgid "Download GPS"
msgstr "Pobiera GPS"
@@ -2450,7 +2459,7 @@ msgstr ""
msgid "Add all objects selected in the current dataset after the last member"
msgstr ""
-"Dodaj wszystkie zaznaczone obiekty w bieżącym zestawie danych po ostatnim "
+"Dodaje wszystkie zaznaczone obiekty w bieżącym zestawie danych po ostatnim "
"członku"
msgid "Add selection to relation"
@@ -2473,7 +2482,7 @@ msgid "Delete the selected relation"
msgstr "Usuwa zaznaczoną relację."
msgid "Download all members of the selected relations"
-msgstr "Pobierz wszystkich członków zaznaczonej relacji"
+msgstr "Pobiera wszystkich członków zaznaczonej relacji"
msgid "Download members"
msgstr "Pobierz członków"
@@ -2491,7 +2500,7 @@ msgid "Edit"
msgstr "Edycja"
msgid "Call relation editor for selected relation"
-msgstr "Edytuj wybraną relację"
+msgstr "Otwiera wybraną relację w edytorze relacji"
msgid ""
"You are about to open <b>{0}</b> different relation editor "
@@ -2499,15 +2508,13 @@ msgid ""
msgid_plural ""
"You are about to open <b>{0}</b> different relation editors "
"simultaneously.<br/>Do you want to continue?"
-msgstr[0] ""
-"Masz zamiar otworzyć jednocześnie <b>{0}</b> różny edytor "
-"relacji.<br/>Chcesz kontynuować?"
+msgstr[0] "Zostanie otwarty <b>{0}</b> edytor relacji.<br/>Kontynuować?"
msgstr[1] ""
-"Masz zamiar otworzyć jednocześnie <b>{0}</b> różne edytory "
-"relacji.<br/>Chcesz kontynuować?"
+"Zostaną otwarte jednocześnie <b>{0}</b> edytory różnych "
+"relacji.<br/>Kontynuować?"
msgstr[2] ""
-"Masz zamiar otworzyć jednocześnie <b>{0}</b> różnych edytorów "
-"relacji.<br/>Chcesz kontynuować?"
+"Zostanie otwartych jednocześnie <b>{0}</b> edytorów różnych "
+"relacji.<br/>Kontynuować?"
msgid "Confirmation"
msgstr "Potwierdzenie"
@@ -2896,7 +2903,7 @@ msgstr ""
"{1}"
msgid "Cannot parse timestamp ''{0}''"
-msgstr "Nie można przetworzyć datownika„{0}”"
+msgstr "Nie można przetworzyć datownika „{0}”"
msgid "Expecting {0} after {1}"
msgstr "Spodziewane {0} po {1}"
@@ -2966,7 +2973,7 @@ msgid "Cyclic dependency between relations:"
msgstr "Zapętlone zależności między relacjami"
msgid "Removed obsolete tags"
-msgstr "Usunięte przestarzałe tagi"
+msgstr "Usunięte przestarzałe znaczniki"
msgid "Fix deprecated tags"
msgstr "Napraw nieaktualne tagi"
@@ -3360,7 +3367,7 @@ msgid "Please select which changes you want to apply."
msgstr "Wybierz zmiany do zastosowania."
msgid "Tags of "
-msgstr "Tagi "
+msgstr "Znaczniki "
msgid "Roles in relations referring to"
msgstr "Role w relacjach odnoszących się do"
@@ -3619,7 +3626,7 @@ msgid "Projection"
msgstr "Odwzorowanie"
msgid "Matrix set identifier"
-msgstr ""
+msgstr "Identyfikator zestawu macierzy"
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Brak zdefiniowanych warstw w dokumencie getCapabilities: {0}"
@@ -3627,6 +3634,8 @@ msgstr "Brak zdefiniowanych warstw w dokumencie getCapabilities: {0}"
msgid ""
"WMTS Parser error - start element {0} has different name than end element {2}"
msgstr ""
+"Błąd analizy WMTS - początkowy element {0} ma inną nazwę niż końcowy element "
+"{2}"
msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
@@ -3742,8 +3751,8 @@ msgid ""
"Tag collection cannot be applied to a primitive because there are keys with "
"multiple values."
msgstr ""
-"Zestaw tagów nie może być przypisany do elementu ponieważ są klucze z "
-"wieloma wartościami."
+"Zbiór znaczników nie może być przypisany do elementu, ponieważ są w nim "
+"klucze z wieloma wartościami."
msgid "<anonymous>"
msgstr "<anonimowy>"
@@ -3820,10 +3829,10 @@ msgid "Node: connection"
msgstr "Węzeł: połączony"
msgid "Node: tagged"
-msgstr "Węzeł: otagowany"
+msgstr "Węzeł: posiada znaczniki"
msgid "untagged way"
-msgstr "nieotagowana linia"
+msgstr "linia bez znaczników"
msgid "background"
msgstr "tło"
@@ -3835,7 +3844,7 @@ msgid "highlight wireframe"
msgstr "podświetl szkielet"
msgid "untagged"
-msgstr "nieotagowany"
+msgstr "bez znaczników"
msgid "text"
msgstr "tekst"
@@ -3932,7 +3941,7 @@ msgid "WGS84"
msgstr "WGS84"
msgid "Albers Equal Area"
-msgstr ""
+msgstr "Równopowierzchniowe Albersa"
msgid "Parameter ''{0}'' required."
msgstr "Parametr „{0}'' jest wymagany."
@@ -3944,10 +3953,10 @@ msgid "Cassini-Soldner"
msgstr "Cassiniego-Soldnera"
msgid "Double Stereographic"
-msgstr ""
+msgstr "Podwójne stereograficzne"
msgid "Lambert Azimuthal Equal Area"
-msgstr ""
+msgstr "Azymutalne równopowierzchniowe Lamberta"
msgid "Lambert Conformal Conic"
msgstr "Projekcja Stożkowa Lamberta"
@@ -3968,13 +3977,14 @@ msgid "Illegal value for parameter ''{0}'': {1}"
msgstr "Niedozwolona wartość parametru „{0}'': {1}"
msgid "error in initialization"
-msgstr "błąd inicjalizacji"
+msgstr "błąd inicjowania"
msgid "Polar Stereographic"
-msgstr ""
+msgstr "Biegunowe stereograficzne"
msgid "Polar Stereographic: Parameter ''{0}'' must be 90 or -90."
msgstr ""
+"Biegunowe stereograficzne: Parametr ''{0}'' musi być równy 90 lub -90."
msgid "Sinusoidal"
msgstr "Sinusoidalne"
@@ -4247,7 +4257,7 @@ msgid "Highway link is not linked to adequate highway/link"
msgstr "Łącznik nie pasuje do drogi, do której jest doprowadzony"
msgid "Missing pedestrian crossing information"
-msgstr "Brakujące informacje o przejściu dla pieczych"
+msgstr "Brakujące informacje o przejściu dla pieszych"
msgid "Unknown country code: {0}"
msgstr "Nieznany kod kraju: {0}"
@@ -4256,22 +4266,22 @@ msgid "Unknown source:maxspeed context: {0}"
msgstr "Nieznana zawartość source:maxspeed: {0}"
msgid "Internet tags"
-msgstr "Tagi internetowe"
+msgstr "Znaczniki internetowe"
msgid "Checks for errors in internet-related tags."
-msgstr "Sprawdza błędy w tagach związanych z Internetem"
+msgstr "Sprawdza błędy w znacznikach związanych z Internetem"
msgid "''{0}'': {1}"
-msgstr "''{0}'': {1}"
+msgstr "„{0}”: {1}"
msgid "Lane tags"
-msgstr "Tagowanie pasów jezdni"
+msgstr "Znaczniki pasów jezdni"
msgid "Test that validates ''lane:'' tags."
-msgstr "Test sprawdzający tagi''lane:''"
+msgstr "Test sprawdzający znaczniki „lane:”."
msgid "Number of {0} greater than {1}"
-msgstr "Numer {0} większy niż {1}"
+msgstr "Liczba {0} większa niż {1}"
msgid "{0}+{1}"
msgstr "{0}+{1}"
@@ -4295,7 +4305,7 @@ msgid "Very long segment of {0} kilometers"
msgstr "Bardzo długi segment o długości {0} kilometrów"
msgid "Tag checker (MapCSS based)"
-msgstr "Walidator tagów (bazujący na MapCSS)"
+msgstr "Walidator znaczników (bazujący na MapCSS)"
msgid "This test checks for errors in tag keys and values."
msgstr "Ten test szuka błędów w kluczach i wartościach."
@@ -4330,9 +4340,6 @@ msgstr "Niezamknięty obszar"
msgid "No outer way for multipolygon"
msgstr "Brak zewnętrznej linii wielokąta złożonego"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "Rola dla „{0}'' powinna być „{1}”"
-
msgid "No area style for multipolygon"
msgstr "Brak stylu dla obszaru wielokąta złożonego"
@@ -4371,12 +4378,27 @@ msgstr "Styl obszaru dla linii zewnętrznej"
msgid "Multipolygon is not closed"
msgstr "Wielokąt złożony nie jest zamknięty"
-msgid "Multipolygon inner way is outside"
-msgstr "Wewnętrzna linia wielokąta złożonego znajduje się na zewnątrz"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "Linie wielokąta złożonego przecinają się"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "Rola dla „{0}'' powinna być „{1}”"
+
+msgid "Multipolygon inner way is outside"
+msgstr "Wewnętrzna linia wielokąta złożonego znajduje się na zewnątrz"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "Składnik wielokąta złożonego nie ma przypisanej roli"
@@ -4384,10 +4406,10 @@ msgid "Non-Way in multipolygon"
msgstr "Wielokąt złożony zawiera obiekt niebędący linią"
msgid "Multipolygon member(s) repeated with different role"
-msgstr ""
+msgstr "Członek relacji powtórzony z inną rolą"
msgid "Multipolygon member(s) repeated with same role"
-msgstr ""
+msgstr "Członek relacji powtórzony z tą samą rolą"
msgid "Missing name:* translation"
msgstr "Brakujące tłumaczenie tagów name:*"
@@ -4489,7 +4511,7 @@ msgid "Route relation contains a ''{0}'' role"
msgstr ""
msgid "Route relation contains a gap"
-msgstr ""
+msgstr "Relacja trasy posiada luki"
msgid "Stop position not part of route"
msgstr ""
@@ -4558,7 +4580,7 @@ msgstr ""
"Ten test wyszukuje linie o podobnych nazwach - podejrzenie błędu w nazwie."
msgid "Tag checker"
-msgstr "Walidator tagów"
+msgstr "Walidator znaczników"
msgid "Adding {0} to ignore tags"
msgstr "Dodawanie {0} do ignorowania tagów"
@@ -4580,7 +4602,7 @@ msgstr ""
"{0}"
msgid "Suspicious tag/value combinations"
-msgstr "Podejrzana kombinacja tag/wartość"
+msgstr "Podejrzana kombinacja znacznik/wartość"
msgid "Key ''{0}'' invalid."
msgstr "Klucz „{0}'' jest nieprawidłowy."
@@ -4598,7 +4620,7 @@ msgid "Tag key longer than allowed"
msgstr "Klucz tagu jest za długi"
msgid "Tags with empty values"
-msgstr "Tag z pustą wartością"
+msgstr "Znaczniki z pustymi wartościami"
msgid "Invalid white space in property key"
msgstr "Nieprawidłowy odstęp (space) w kluczu właściwości"
@@ -4719,7 +4741,7 @@ msgid "No \"to\" way found"
msgstr "Nie znaleziono linii z rolą „to\""
msgid "\"from\" way equals \"to\" way"
-msgstr "Droga \"from\" jest identyczna jak \"to\""
+msgstr "Linia \"from\" jest identyczna jak \"to\""
msgid "No \"via\" node or way found"
msgstr "Nie znaleziono linii lub węzła z rolą „via\""
@@ -4888,16 +4910,16 @@ msgid "Reversed land: land not on left side"
msgstr "Odwrócona linia lądu: ląd nie znajduje się po lewej stronie"
msgid "Show this dialog again the next time"
-msgstr "Pokaż to okno ponownie następnym razem"
+msgstr "Wyświetlenie tego okna ponownie następnym razem"
msgid "Do not show again (this operation)"
-msgstr "Nie pokazuj ponownie (dla tej operacji)"
+msgstr "Pomijanie wyświetlania ponownie (dla tej czynności)"
msgid "Do not show again (this session)"
-msgstr "Nie pokazuj ponownie (dla tej sesji)"
+msgstr "Pomijanie wyświetlania ponownie (dla tej sesji)"
msgid "Do not show again (remembers choice)"
-msgstr "Nie pokazuj ponownie (zapamiętaj wybór)"
+msgstr "Pomijanie wyświetlania ponownie (zapamiętanie wyboru)"
msgid "incomplete"
msgstr "niekompletne"
@@ -5015,7 +5037,7 @@ msgid "Message of the day not available"
msgstr "Wiadomość dnia jest niedostępna"
msgid "Click to close the dialog"
-msgstr "Kliknij aby zamknąć"
+msgstr "Zamyka okno dialogowe"
msgid "Imagery offset"
msgstr "Przesunięcie podkładu"
@@ -5091,30 +5113,36 @@ msgstr "Wyłącz dostęp do danego zasobu(-ów), oddzielone przecinkiem"
msgid "options provided as Java system properties"
msgstr "opcja dostarczano jako ustawienia systemowe Javy"
+msgid "Change the JOSM directory name"
+msgstr "Zmień nazwę katalogu JOSM"
+
msgid "/PATH/TO/JOSM/PREF "
-msgstr ""
+msgstr "/SCIEZKA/DO/JOSM/PREF "
msgid "Set the preferences directory"
msgstr "Podaj położenie katalogu ustawień"
-msgid "/PATH/TO/JOSM/USERDATA"
+msgid "Default: {0}"
msgstr ""
+msgid "/PATH/TO/JOSM/USERDATA"
+msgstr "/SCIEZKA/DO/JOSM/USERDATA"
+
msgid "Set the user data directory"
msgstr "Podaj położenie katalogu z danymi użytkownika"
msgid "/PATH/TO/JOSM/CACHE "
-msgstr ""
+msgstr "/SCIEZKA/DO/JOSM/CACHE "
msgid "Set the cache directory"
msgstr "Podaj położenie katalogu bufora"
msgid "/PATH/TO/JOSM/HOMEDIR "
-msgstr ""
+msgstr "/SCIEZKA/DO/JOSM/HOMEDIR "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5167,7 +5195,7 @@ msgid "Updating plugins"
msgstr "Aktualizowanie wtyczek"
msgid "Installing updated plugins"
-msgstr "Instalacja zaktualizowanych wtyczek"
+msgstr "Instalowanie uaktualnionych wtyczek"
msgid "Loading early plugins"
msgstr "Wczytywanie wczesnych wtyczek"
@@ -5418,10 +5446,10 @@ msgid "Do not hide status bar"
msgstr "Nie ukrywaj paska stanu"
msgid "The northing at the mouse pointer."
-msgstr ""
+msgstr "Współrzędna północna punktu wskazywanego przez kursor."
msgid "The easting at the mouse pointer."
-msgstr ""
+msgstr "Współrzędna wschodnia punktu wskazywanego przez kursor."
msgid "The geographic latitude at the mouse pointer."
msgstr "Szerokość geograficzna punktu wskazywanego przez kursor."
@@ -5459,9 +5487,6 @@ msgstr "Uruchamia działanie w tle"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "ukończono {0} z {1}"
-
msgid "Enlarge"
msgstr "Przybliż"
@@ -5608,88 +5633,6 @@ msgstr "Konfilkt tła: usuń członka"
msgid "Conflict foreground: remove member"
msgstr "Konfilkt pierwszego planu: usuń członka"
-msgid "My with Their"
-msgstr "Moją z Ich"
-
-msgid "My with Merged"
-msgstr "Moją z Połączoną"
-
-msgid "Their with Merged"
-msgstr "Ich z Połączoną"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr "Właściwości"
-
-msgid "Tags"
-msgstr "Znaczniki"
-
-msgid "Nodes"
-msgstr "Węzły"
-
-msgid "Members"
-msgstr "Członkowie"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Brak oczekujących konfliktów do rozwiązania"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Znaczniki ({0} konflikt)"
-msgstr[1] "Znaczniki ({0} konflikty)"
-msgstr[2] "Znaczniki ({0} konfliktów)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} konflikt z tagiem oczekuje na rozwiązanie"
-msgstr[1] "{0} konflikty z tagami oczekuje na rozwiązanie"
-msgstr[2] "{0} konfliktów z tagami oczekuje na rozwiązanie"
-
-msgid "Nodes(resolved)"
-msgstr "Węzły(rozwiązane)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Lista połączonych węzłów zamrożona. Brak oczekujących konfilktów w liście "
-"węzłów tej linii."
-
-msgid "Nodes(with conflicts)"
-msgstr "Węzły (z konfliktami)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Oczekujące konflikty na liście wezłów tej linii"
-
-msgid "Members(resolved)"
-msgstr "Członkowie (rozwiązane)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Lista połączonych członków zamrożona. Brak oczekujących konfilktów w liście "
-"członków tej relacji."
-
-msgid "Members(with conflicts)"
-msgstr "Członkowie (z konfliktami)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Oczekujące konflikty na liście członków tej relacji"
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr "Właściwości (z konfliktami)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr "Konflikt rozdzielczości"
-
msgid "{0} more..."
msgstr "jeszcze {0}"
@@ -5757,6 +5700,8 @@ msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+"Skopuj moje zaznaczone elementy przed pierwszy zaznaczony element na liście "
+"połączonej wersji"
msgid "> after"
msgstr "> po"
@@ -5812,13 +5757,13 @@ msgid "Up"
msgstr "W górę"
msgid "Move up the selected entries by one position."
-msgstr "Przesuń wybrane elementy o jedną pozycję w górę."
+msgstr "Przesuwa wybrane elementy o jedną pozycję w górę"
msgid "Down"
msgstr "W dół"
msgid "Move down the selected entries by one position."
-msgstr "Przesuwa wybrane elementy w dół o jedną pozcyję."
+msgstr "Przesuwa wybrane elementy o jedną pozycję w dół"
msgid "Remove"
msgstr "Usuń"
@@ -5870,6 +5815,88 @@ msgstr[0] "Ich wersja ({0} pozycja)"
msgstr[1] "Ich wersja ({0} pozycje)"
msgstr[2] "Ich wersja ({0} pozycji)"
+msgid "My with Their"
+msgstr "Moją z Ich"
+
+msgid "My with Merged"
+msgstr "Moją z Połączoną"
+
+msgid "Their with Merged"
+msgstr "Ich z Połączoną"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr "Właściwości"
+
+msgid "Tags"
+msgstr "Znaczniki"
+
+msgid "Nodes"
+msgstr "Węzły"
+
+msgid "Members"
+msgstr "Członkowie"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Brak oczekujących konfliktów do rozwiązania"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Znaczniki ({0} konflikt)"
+msgstr[1] "Znaczniki ({0} konflikty)"
+msgstr[2] "Znaczniki ({0} konfliktów)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} konflikt z tagiem oczekuje na rozwiązanie"
+msgstr[1] "{0} konflikty z tagami oczekuje na rozwiązanie"
+msgstr[2] "{0} konfliktów z tagami oczekuje na rozwiązanie"
+
+msgid "Nodes(resolved)"
+msgstr "Węzły(rozwiązane)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Lista połączonych węzłów zamrożona. Brak oczekujących konfilktów w liście "
+"węzłów tej linii."
+
+msgid "Nodes(with conflicts)"
+msgstr "Węzły (z konfliktami)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Oczekujące konflikty na liście wezłów tej linii"
+
+msgid "Members(resolved)"
+msgstr "Członkowie (rozwiązane)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Lista połączonych członków zamrożona. Brak oczekujących konfilktów w liście "
+"członków tej relacji."
+
+msgid "Members(with conflicts)"
+msgstr "Członkowie (z konfliktami)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Oczekujące konflikty na liście członków tej relacji"
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr "Właściwości (z konfliktami)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr "Konflikt rozdzielczości"
+
msgid "Node"
msgstr "Węzeł"
@@ -5931,7 +5958,7 @@ msgstr "Rola"
msgid "Primitive"
msgstr "Element"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6077,22 +6104,22 @@ msgstr ""
"Wszystkie wartości połączone jako „{0}'' będą stosowane dla klucza „{1}”"
msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "Zbiór tagów nie zawiera wybranej wartości „{0}”."
+msgstr "Zbiór znaczników nie zawiera wybranej wartości „{0}”."
msgid "Not decided yet."
msgstr "Jeszcze nie rozstrzygnięte."
msgid "Tags from nodes"
-msgstr "Tagi z węzłów"
+msgstr "Znaczniki z węzłów"
msgid "Tags from ways"
-msgstr "Tagi z linii"
+msgstr "Znaczniki z linii"
msgid "Tags from relations"
-msgstr "Tagi z relacji"
+msgstr "Znaczniki z relacji"
msgid "Conflicts in pasted tags"
-msgstr "Konflikty we wklejonych tagach"
+msgstr "Konflikty we wklejonych znacznikach"
msgid "Paste ..."
msgstr "Wklej ..."
@@ -6105,9 +6132,9 @@ msgstr "Do ..."
msgid "{0} tag"
msgid_plural "{0} tags"
-msgstr[0] "{0} tag"
-msgstr[1] "{0} tagów"
-msgstr[2] "{0} tags"
+msgstr[0] "{0} znacznik"
+msgstr[1] "{0} znaczniki"
+msgstr[2] "{0} znaczników"
msgid "{0} way"
msgid_plural "{0} ways"
@@ -6122,7 +6149,7 @@ msgstr[1] "{0} relacje"
msgstr[2] "{0} relacji"
msgid "Position {0} is out of range. Current number of members is {1}."
-msgstr "Pozycja {0} jest poza zakresem. Obecną liczba członków jest {1}"
+msgstr "Pozycja {0} jest poza zakresem. Aktualna liczba członków wynosi {1}"
msgid "Remove this relation member from the relation"
msgstr "Usuń członka tej relacji z niej"
@@ -6364,7 +6391,7 @@ msgid "Resolve"
msgstr "Rozwiąż"
msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
+msgstr "Otwiera okno łączenia wszystkich elementów z powyższej listy"
msgid "Resolve to my versions"
msgstr "Rozwiąż stosując moją wersję"
@@ -6490,16 +6517,16 @@ msgid "Delete filter."
msgstr "Usuwa filtr."
msgid "Move filter up."
-msgstr "Przesuwa filtr do góry."
+msgstr "Przesuwa filtr w górę."
msgid "Move filter down."
-msgstr "Przesuwa filtr na dół."
+msgstr "Przesuwa filtr w dół."
msgid "Filter Hidden:{0} Disabled:{1}"
msgstr "Filtry ukryte:{0}, wyłączone:{1}"
msgid "<html>Error in filter <code>{0}</code>:<br>{1}"
-msgstr ""
+msgstr "<html>Błąd filtra <code>{0}</code>:<br>{1}"
msgid "Error in filter"
msgstr "Błąd w filtrze"
@@ -6709,8 +6736,9 @@ msgstr ""
msgid "{0} user last edited the selection:"
msgid_plural "{0} users last edited the selection:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} użytkownik ostatnio edytował zaznaczenie:"
+msgstr[1] "{0} użytkowników ostatnio edytowało zaznaczenie:"
+msgstr[2] "{0} użytkowników ostatnio edytowało zaznaczenie:"
msgid "mapcss"
msgstr "mapcss"
@@ -6741,15 +6769,17 @@ msgid "Coordinate value can be in one of three formats:"
msgstr "Wartości współrzędnych mogą być podane w jednym z trzech formatów:"
msgid "<i>degrees</i><tt>°</tt>"
-msgstr ""
+msgstr "<i>stopnie</i><tt>°</tt>"
msgid "<i>degrees</i><tt>°</tt> <i>minutes</i><tt>'</tt>"
-msgstr ""
+msgstr "<i>stopnie</i><tt>°</tt> <i>minuty</i><tt>'</tt>"
msgid ""
"<i>degrees</i><tt>°</tt> <i>minutes</i><tt>'</tt> "
"<i>seconds</i><tt>"</tt>"
msgstr ""
+"<i>stopnie</i><tt>°</tt> <i>minuty</i><tt>'</tt> "
+"<i>sekundy</i><tt>"</tt>"
msgid ""
"Symbols <tt>°</tt>, <tt>'</tt>, <tt>′</tt>, <tt>"</tt>, "
@@ -6822,7 +6852,7 @@ msgid "Map paint preferences"
msgstr "Ustawienia rysowania mapy"
msgid "Map Paint Styles"
-msgstr "Style rysowania map"
+msgstr "Style rysowania"
msgid "configure the map painting style"
msgstr "Konfiguruje styl rysowania mapy"
@@ -6957,7 +6987,7 @@ msgid "Sort"
msgstr "Sortuj"
msgid "Open the note in an external browser"
-msgstr ""
+msgstr "Otwiera uwagę w zewnętrznej przeglądarce"
msgid "Object type:"
msgstr "Typ obiektu:"
@@ -6967,30 +6997,34 @@ msgid "mixed"
msgstr "różne"
msgid "Choose the OSM object type"
-msgstr "Wynierz typ obiektu OSM"
+msgstr "Wybiera rodzaj obiektu OSM"
msgid "Object ID:"
-msgstr "ID obiektu:"
+msgstr "Identyfikator obiektu:"
msgid "Enter the ID of the object that should be downloaded"
-msgstr "Wprowadź ID obiektu który ma zostać pobrany"
+msgstr "Proszę wprowadzić identyfikator pobieranego obiektu"
msgid "Object IDs can be separated by comma or space, for instance: {0}"
-msgstr "ID obiektów mogą być rozdzielone przecinkiem, lub spacją, np.: {0}"
+msgstr ""
+"Identyfikatory obiektów mogą być rozdzielone przecinkiem lub spacją, np.: {0}"
msgid ""
"In mixed mode, specify objects like this: {0}<br/>({1} stands for "
"<i>node</i>, {2} for <i>way</i>, and {3} for <i>relation</i>)"
msgstr ""
+"Wyszukując różne obiekty, proszę określić je w następujący sposób: "
+"{0}<br/>(gdzie {1} oznacza <i>węzeł</i>, {2} - <i>linię</i> a {3} - "
+"<i>relację</i>)."
msgid "Ranges of object IDs are specified with a hyphen, for instance: {0}"
-msgstr "Zakresy ID obiektów są określone myślnikiem, np.: {0}"
+msgstr "Zakresy identyfikatorów obiektów są oznaczane myślnikiem, np.: {0}"
msgid ""
"Invalid ID list specified\n"
"Cannot continue."
msgstr ""
-"Nieprawidłowy numer ID listy\n"
+"Określono nieprawidłową listę identyfikatorów.\n"
"Nie można kontynuować."
msgid "Relations"
@@ -7057,7 +7091,7 @@ msgid "Toggle dynamic buttons"
msgstr "Przełącz używanie dynamicznych przycisków"
msgid "Open preferences for this panel"
-msgstr "Otwórz preferencje dla tego panelu"
+msgstr "Wyświetla preferencje tego panelu"
msgid "Undock the panel"
msgstr "Odłącza panel"
@@ -7176,7 +7210,7 @@ msgid "Changeset Management Dialog"
msgstr "Menedżer zestawów zmian"
msgid "Close the dialog"
-msgstr "Zamknij okno"
+msgstr "Zamyka okno"
msgid "Query"
msgstr "Zapytanie"
@@ -7194,10 +7228,10 @@ msgid "Close the selected changesets"
msgstr "Zamyka wybrane zestawy zmian"
msgid "Update changeset"
-msgstr "Aktualizuj zestaw zmian"
+msgstr "Uaktualnij zestaw zmian"
msgid "Updates the selected changesets with current data from the OSM server"
-msgstr "Aktualizuje dane zaznaczonych zestawów zmian z serwerem OSM"
+msgstr "Uaktualnia dane zaznaczonych zestawów zmian z serwera OSM"
msgid "Download changeset content"
msgstr "Pobierz zawartość zestawu zmian"
@@ -7206,15 +7240,16 @@ msgid "Download the content of the selected changesets from the server"
msgstr "Pobiera zawartość wybranych zestawów zmian z serwera"
msgid "Download changed objects"
-msgstr ""
+msgstr "Pobierz zmodyfikowane obiekty"
msgid ""
"Download the current version of the changed objects in the selected "
"changesets"
msgstr ""
+"Pobiera aktualną wersję zmodyfikowanych obiektów zaznaczonego zestawu zmian"
msgid "My changesets"
-msgstr "Moje zestawy zmian"
+msgstr "Własne zestawy zmian"
msgid "Download my changesets from the OSM server (max. 100 changesets)"
msgstr ""
@@ -7242,22 +7277,22 @@ msgid "Closed"
msgstr "Zamknięty"
msgid "ID"
-msgstr "ID"
+msgstr "Identyfikator"
msgid "Open"
-msgstr "Otwórz"
+msgstr "Stan"
msgid "User"
msgstr "Użytkownik"
msgid "Created at"
-msgstr "Utworzony"
+msgstr "Czas utworzenia"
msgid "Closed at"
-msgstr "Zamknięty"
+msgstr "Czas zamknięcia"
msgid "Discussions"
-msgstr "Dyskusje"
+msgstr "Liczba dyskusji"
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
@@ -7324,48 +7359,49 @@ msgid "Name"
msgstr "Nazwa"
msgid "ID:"
-msgstr "ID:"
+msgstr "Identyfikator:"
msgid "Comment:"
msgstr "Komentarz:"
msgid "Open/Closed:"
-msgstr "Otwarty/Zamknięty:"
+msgstr "Stan:"
msgid "Created by:"
msgstr "Utworzony przez:"
msgid "Created on:"
-msgstr "Utworzony:"
+msgstr "Czas utworzenia:"
msgid "Closed on:"
-msgstr "Zamknięty:"
+msgstr "Czas zamknięcia:"
msgid "Remove the changeset in the detail view panel from the local cache"
msgstr ""
"Usuwa zestaw zmian w panelu widoku szczegółowego z pamięci podręcznej"
msgid "Update the changeset from the OSM server"
-msgstr "Aktualizuje zestaw zmian z serwerem OSM"
+msgstr "Uaktualnia zestaw zmian z serwera OSM"
msgid ""
"Select the primitives in the content of this changeset in the current data "
"layer"
msgstr ""
-"Zaznacza elementy zawarte w tym zestawie zmian w edytowanej warstwie danych"
+"Zaznacza elementy zawarte w tym zestawie zmian na aktualnej warstwie danych"
msgid ""
"<html>None of the objects in the content of changeset {0} is available in "
"the current<br>edit layer ''{1}''.</html>"
msgstr ""
"<html>Żaden z obiektów zawartych w zestawie zmian {0} nie jest dostępny "
-"w<br>edytowanej warstwie „{1}”.</html>"
+"w<br>aktualnej warstwie „{1}”.</html>"
msgid ""
"Zoom to the objects in the content of this changeset in the current data "
"layer"
msgstr ""
-"Powiększa obiekty zawarte w zestawie zmian w edytowanej warstwie danych"
+"Przybliża widok do obiektów zawartych w zestawie zmian na aktualnej warstwie "
+"danych"
msgid "Update changeset discussion"
msgstr "Uaktualnij dyskusję nad zestawem zmian"
@@ -7423,102 +7459,6 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr "Wybierz tylko zestawy zmian związane z konkretnym obszarem edycji"
-msgid "Query open changesets only"
-msgstr "Zapytanie tylko o otwarte zestawy zmian"
-
-msgid "Query closed changesets only"
-msgstr "Zapytanie tylko o zaknięte zestawy zmian"
-
-msgid "Query both open and closed changesets"
-msgstr "Zapytanie o otwarte i zamknięte zestawy zmian"
-
-msgid "Only changesets owned by myself"
-msgstr "Tylko własne zestawy zmian"
-
-msgid "User ID:"
-msgstr "ID użytkownika:"
-
-msgid "User name:"
-msgstr "Nazwa użytkownika:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Tylko zestawy zmian użytkownika o następującym ID"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "Tylko zestawy zmian użytkownika o następującej nazwie użytkownika"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Tylko zmiany wprowadzone przeze mnie (wyłączone. JOSM jest aktualnie "
-"uruchomiony przez anonimowego użytkownika)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Nie można przypisać zapytania zestawu zmian do obecnego użytkownika ponieważ "
-"obecny użytkownik jest anonimowy"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "Bieżąca wartość ID użytkownika „{0}'' nie jest poprawna"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"Nie można ograniczyć zapytania zestawu zmian do nazwy użytkownika „{0}''"
-
-msgid "Please enter a valid user ID"
-msgstr "Wprowadź poprawne ID użytkownika"
-
-msgid "Invalid user ID"
-msgstr "Niepoprawny ID użytkownika"
-
-msgid "Please enter a non-empty user name"
-msgstr "Wprowadź nazwę użytkownika (nie może być pusta)"
-
-msgid "Invalid user name"
-msgstr "Niepoprawna nazwa użytkownika"
-
-msgid "Date: "
-msgstr "Data: "
-
-msgid "Time:"
-msgstr "Czas:"
-
-msgid "Closed after - "
-msgstr "Zamknięte po - "
-
-msgid "Date:"
-msgstr "Data:"
-
-msgid "Created before - "
-msgstr "Stworzone przed - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Tylko zestawy zmian zamknięte po podanej dacie lub czasie"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-"Tylko zestawy zmian zamknięte po i stworzone przed podaną datą/czasem"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"Nie można stworzyć zapytania na podstawie podanych wytycznych. Niewłaściwe "
-"dane wejścia."
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr ""
-"<html>Wpisz poprawne wartości daty/czasu żeby ograniczyć<br>zapytanie do "
-"wybranego zakresu czasu.</html>"
-
-msgid "Invalid date/time values"
-msgstr "Niepoprawna data/czas"
-
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
"invalid."
@@ -7536,38 +7476,14 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Nieprawidłowy obszar edycji"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"Wprowadzona wartość nie jest prawidłowym ID użytkownika. Proszę wprowadzić "
-"liczbę całkowitą > 0"
-
-msgid "Please enter an integer value > 0"
-msgstr "Proszę wprowadzić liczbę całkowitą >0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Proszę wprowadzić datę w formacie używanym w Twoich ustawieniach "
-"lokalnych.<br>Przykład: {0}<br>Przykład: {1}<br>Przykład: {2}<br>Przykład: "
-"{3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Proszę wprowadzić prawidłowy czas w formacie używanym w Twoich ustawieniach "
-"lokalnych.<br>Przykład: {0}<br>Przykład: {1}<br>Przykład: {2}<br>Przykład: "
-"{3}<br>"
-
msgid "Download my changesets only"
-msgstr "Pobierz tylko moje zestawy zmian"
+msgstr "Pobieranie tylko własnych zestawów zmian"
msgid ""
"<html>Select to restrict the query to your changesets only.<br>Unselect to "
"include all changesets in the query.</html>"
msgstr ""
+"<html>Przełącza ograniczenie wyników do zestawów zmian użytkownika.</html>"
msgid ""
"<html>Please select one the following <strong>standard "
@@ -7575,41 +7491,44 @@ msgid ""
"only want to download changesets created by yourself.<br>Note that JOSM will "
"download max. 100 changesets.</html>"
msgstr ""
-"<html>Proszę wybrać jedno z <strong>typowych zapytań</strong>. Zaznacz "
-"<strong>Pobierz tylko moje zestawy zmian</strong> jeśli chcesz pobrać "
-"zestawy zmian stworzone przez siebie.<br>Pamiętaj że JOSM pobierze "
-"maksymalnie 100 zestawów zmian.</html>"
+"<html>Proszę wybrać jedno z poniższych, <strong>typowych zapytań</strong>. "
+"Zaznaczenie opcji <strong>Pobranie tylko własnych zestawów zmian</strong> "
+"pobierze zestawy zmian utworzone przez użytkownika.<br>Należy pamiętać, że "
+"pobranych zostanie maksymalnie 100 zestawów zmian.</html>"
msgid "<html>Download the latest changesets</html>"
-msgstr "<html>Pobierz ostatnie zestawy zmian</html>"
+msgstr "<html>Pobranie ostatnich zestawów zmian</html>"
msgid ""
"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
"user name in the preferences first.</em></html>"
msgstr ""
-"<html>Pobierz moje otwarte zestawy zmian<br><em>Niedostępne. Proszę najpierw "
-"podać nazwę użytkownika OSM w ustawieniach.</em></html>"
+"<html>Pobranie własnych otwartych zestawów zmian<br><em>Niedostępne. Proszę "
+"najpierw wprowadzić nazwę użytkownika OSM w ustawieniach.</em></html>"
msgid "<html>Download my open changesets</html>"
-msgstr "<html>Pobierz moje otwarte zestawy zmian</html>"
+msgstr "<html>Pobranie własnych otwartych zestawów zmian</html>"
msgid ""
"<html>Download changesets in the current map view.<br><em>Disabled. There is "
"currently no map view active.</em></html>"
msgstr ""
-"<html>Pobierz zestawy zmian w obecnym widoku mapy.<br><em>Niedostępne. "
-"Obecnie nie masz aktywnego widoku mapy.</em></html>"
+"<html>Pobranie zestawów zmian w aktualnym widoku mapy.<br><em>Niedostępne. "
+"Obecnie nie ma aktywnego widoku mapy.</em></html>"
msgid "<html>Download changesets in the current map view</html>"
-msgstr "<html>Pobierz zestawy zmian w obecnym widoku mapy</html>"
+msgstr "<html>Pobranie zestawów zmian w aktualnym widoku mapy</html>"
msgid ""
"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
"query."
msgstr ""
+"Nieoczekiwana wartość dla ustawienia „{0}”, jest „{1}”. Przywracanie "
+"domyślnego zapytania."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
+"Nie można utworzyć zapytania o otwarte zestawy zmian anonimowego użytkownika"
msgid "Basic"
msgstr "Podstawowe"
@@ -7630,22 +7549,96 @@ msgid "Use a custom changeset query"
msgstr "Użyj własnych zapytań o zestawy zmian"
msgid "Query changesets"
-msgstr "Zapytanie o zestawy zmian"
+msgstr "Wysyła zapytanie o zestawy zmian"
msgid "Query and download changesets"
-msgstr "Kolejkuj i pobierz zestawy zmian"
+msgstr "Wysyła zapytanie i pobiera zestawy zmian"
msgid "Please enter a valid changeset query URL first."
-msgstr "Proszę, najpierw wprowadź poprawne zapytanie URL zestawu zmian."
+msgstr ""
+"Proszę, najpierw wprowadzić poprawny adres URL zapytania o zestaw zmian."
msgid "Illegal changeset query URL"
-msgstr "Nieprawidłowe zapytanie URL zestawu zmian."
+msgstr "Nieprawidłowy adres URL zapytania o zestaw zmian"
msgid "Close the dialog and abort querying of changesets"
msgstr "Zamyka okno i przerywa odpytywanie o zestawy zmian."
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Proszę wprowadzić datę w formacie używanym w Twoich ustawieniach "
+"lokalnych.<br>Przykład: {0}<br>Przykład: {1}<br>Przykład: {2}<br>Przykład: "
+"{3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Zapytanie tylko o otwarte zestawy zmian"
+
+msgid "Query closed changesets only"
+msgstr "Zapytanie tylko o zamknięte zestawy zmian"
+
+msgid "Query both open and closed changesets"
+msgstr "Zapytanie o otwarte i zamknięte zestawy zmian"
+
+msgid "Date: "
+msgstr "Data: "
+
+msgid "Time:"
+msgstr "Czas:"
+
+msgid "Closed after - "
+msgstr "Zamknięte po - "
+
+msgid "Date:"
+msgstr "Data:"
+
+msgid "Created before - "
+msgstr "Utworzone przed - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Tylko zestawy zmian zamknięte po podanej dacie lub czasie"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+"Tylko zestawy zmian zamknięte po i stworzone przed podaną datą/czasem"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Nie można stworzyć zapytania na podstawie podanych wytycznych. Niewłaściwe "
+"dane wejścia."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Wpisz poprawne wartości daty/czasu żeby ograniczyć<br>zapytanie do "
+"wybranego zakresu czasu.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Niepoprawna data/czas"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Proszę wprowadzić prawidłowy czas w formacie używanym w Twoich ustawieniach "
+"lokalnych.<br>Przykład: {0}<br>Przykład: {1}<br>Przykład: {2}<br>Przykład: "
+"{3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"Wprowadzona wartość nie jest prawidłowym ID użytkownika. Proszę wprowadzić "
+"liczbę całkowitą > 0"
+
+msgid "Please enter an integer value > 0"
+msgstr "Proszę wprowadzić liczbę całkowitą >0"
+
msgid "URL: "
-msgstr "URL: "
+msgstr "Adres URL: "
msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr "Wpisz lub wklej link aby otrzymać zestawy zmian z OSM API."
@@ -7657,10 +7650,61 @@ msgid ""
"Note that changeset queries are currently always submitted to ''{0}'', "
"regardless of the host, port and path of the URL entered below."
msgstr ""
+"Należy pamiętać, że zapytania o zestawy zmian są zawsze wysyłane na adres "
+"„{0}”, niezależnie od nazwy komputera, numeru portu oraz adresu URL "
+"wprowadzonych poniżej."
msgid "This changeset query URL is invalid"
msgstr "Ten adres URL zestawu zmian jest nieprawidłowy"
+msgid "Only changesets owned by myself"
+msgstr "Tylko własne zestawy zmian"
+
+msgid "User ID:"
+msgstr "Identyfikator użytkownika:"
+
+msgid "User name:"
+msgstr "Nazwa użytkownika:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Tylko zestawy zmian użytkownika o następującym identyfikatorze"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "Tylko zestawy zmian użytkownika o następującej nazwie użytkownika"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Tylko zmiany wprowadzone przeze mnie (wyłączone. JOSM jest aktualnie "
+"uruchomiony przez anonimowego użytkownika)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Nie można przypisać zapytania zestawu zmian do obecnego użytkownika ponieważ "
+"obecny użytkownik jest anonimowy"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "Aktualna wartość identyfikatora użytkownika „{0}” nie jest poprawna"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"Nie można ograniczyć zapytania zestawu zmian do nazwy użytkownika „{0}''"
+
+msgid "Please enter a valid user ID"
+msgstr "Wprowadź poprawny identyfikator użytkownika"
+
+msgid "Invalid user ID"
+msgstr "Niepoprawny identyfikator użytkownika"
+
+msgid "Please enter a non-empty user name"
+msgstr "Proszę wprowadzić nie pustą nazwę użytkownika"
+
+msgid "Invalid user name"
+msgstr "Niepoprawna nazwa użytkownika"
+
msgid "Activate"
msgstr "Uaktywnij"
@@ -7713,13 +7757,13 @@ msgid "Colorfulness"
msgstr "Nasycenie"
msgid "Merge this layer into another layer"
-msgstr "Połącz tę warstwę z inną warstwą"
+msgstr "Łączy tę warstwę z inną warstwą"
msgid "Move the selected layer one row down."
-msgstr "Przesuwa wybraną warstwę o jeden wiersz w dół"
+msgstr "Przesuwa wybraną warstwę o jedną pozycję w dół"
msgid "Move the selected layer one row up."
-msgstr "Przesuwa wybraną warstwę o jeden wiersz do góry"
+msgstr "Przesuwa wybraną warstwę o jedną pozycję w górę"
msgid "Show/hide"
msgstr "Przełącz wyświetlanie"
@@ -7764,7 +7808,7 @@ msgid "Tags/Memberships"
msgstr "Znaczniki/członkowie"
msgid "Tags for selected objects."
-msgstr "Znaczniki dla zaznaczonych obiektów."
+msgstr "Wyświetla znaczniki zaznaczonych obiektów."
msgid "<different>"
msgstr "<różne>"
@@ -7785,7 +7829,7 @@ msgid "Tags: {0} / Memberships: {1}"
msgstr "Znaczniki: {0} / Członkowie: {1}"
msgid "Delete the selected key in all objects"
-msgstr "Usuń wybrany klucz ze wszystkich obiektów"
+msgstr "Usuwa wybrany klucz ze wszystkich obiektów"
msgid "Delete Tags"
msgstr "Usuń znaczniki"
@@ -7800,13 +7844,13 @@ msgid "Really delete selection from relation {0}?"
msgstr "Usunąć zaznaczenie z relacji {0}?"
msgid "Add a new key/value pair to all objects"
-msgstr "Dodaj nową parę nazwa/wartość do wszystkich obiektów"
+msgstr "Dodaje nową parę klucz/wartość do wszystkich obiektów"
msgid "Add Tag"
msgstr "Dodaj znacznik"
msgid "Edit the value of the selected key for all objects"
-msgstr "Edytuj wartość wybranego klucza dla wszystkich obiektów"
+msgstr "Modyfikuje wartość wybranego klucza we wszystkich obiektach"
msgid "Edit Tags"
msgstr "Edytuj znaczniki"
@@ -7836,7 +7880,7 @@ msgid "Copy the value of the selected tag to clipboard"
msgstr "Kopiuje wartość wybranego znacznika do schowka"
msgid "Copy selected Key(s)/Value(s)"
-msgstr "Skopiuj zaznaczone pary kluczy/wartości"
+msgstr "Skopiuj zaznaczone klucze/wartości"
msgid "Copy the key and value of the selected tag(s) to clipboard"
msgstr "Kopiuje klucze i wartości zaznaczonych znaczników do schowka"
@@ -7988,19 +8032,19 @@ msgstr "Zmieniono wartość „{0}'' z „{1}” na „{2}''."
msgid "Edit the relation the currently selected relation member refers to."
msgstr ""
-"Edytuj relację, do której odnosi się aktualnie zaznaczony członek relacji."
+"Edytuje relację, do której odnosi się aktualnie zaznaczony członek relacji."
msgid "Download all child relations (recursively)"
-msgstr "Pobierz wszystkie relacje podrzędne (rekursywnie)"
+msgstr "Pobiera wszystkie relacje podrzędne (rekursywnie)"
msgid "Download All Children"
-msgstr "Pobierz relacje podrzędne"
+msgstr "Pobierz wszystkie"
msgid "Download selected relations"
-msgstr "Pobierz zaznaczone relacje"
+msgstr "Pobiera zaznaczone relacje podrzędne"
msgid "Download Selected Children"
-msgstr "Pobierz wybrane relacje"
+msgstr "Pobierz zaznaczone"
msgid "Conflict in data"
msgid_plural "Conflicts in data"
@@ -8009,7 +8053,7 @@ msgstr[1] "Konflikty w danych"
msgstr[2] "Konflikty w danych"
msgid "Download relation members"
-msgstr "Pobierz obiekty należące do relacji"
+msgstr "Pobranie członków relacji"
msgid ""
"<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
@@ -8095,19 +8139,19 @@ msgid ""
"object ''{0}''<br><br>Do you really want to add another relation "
"member?</html>"
msgstr ""
-"<html>Ta relacja ma już jeden lub więcej członków wskazujących na<br>obiekt "
-"„{0}''<br><br>Czy nadal chcesz dodać kolejnego członka relacji?</html>"
+"<html>Ta relacja ma już jednego lub więcej członków wskazujących "
+"na<br>obiekt „{0}”<br><br>Dodać kolejnego członka relacji?</html>"
msgid "Multiple members referring to same object."
-msgstr "Wiele członków wskazuje na ten sam obiekt."
+msgstr "Wielu członków wskazuje na ten sam obiekt."
msgid ""
"<html>You are trying to add a relation to itself.<br><br>This creates "
"circular references and is therefore discouraged.<br>Skipping relation "
"''{0}''.</html>"
msgstr ""
-"<html>Próbujesz dodać relację do siebie samej.<br><br>To stworzy cykliczną "
-"zależność i dlatego jest odradzane.<br>Pomijam relację „{0}''.</html>"
+"<html>Próbujesz dodać relację do siebie samej.<br><br>Utworzy to cykliczną "
+"zależność i dlatego jest odradzane.<br>Pomijanie relacji „{0}”.</html>"
msgid "Select previous Gap"
msgstr "Zaznacz poprzednią przerwę"
@@ -8128,7 +8172,7 @@ msgid "Zoom to the gap in the way sequence"
msgstr ""
msgid "Refers to"
-msgstr "Odnosi się do"
+msgstr "Odniesienie"
msgid "Cannot add {0} since it is not part of dataset"
msgstr ""
@@ -8140,7 +8184,7 @@ msgid "There were {0} conflicts during import."
msgstr "Wystąpił/o {0} koflikt/ów podczas wysyłania."
msgid "including immediate children of parent relations"
-msgstr "w tym bezpośrednie relacje potomne"
+msgstr "Uwzględnienie najbliższych relacji podrzędnych"
msgid "Load parent relations"
msgstr "Wczytuje relacje nadrzędne"
@@ -8155,16 +8199,16 @@ msgid "Edit the currently selected relation"
msgstr "Edytuj wybraną relację"
msgid "Apply Changes"
-msgstr "Zastosuj zmiany"
+msgstr "Wprowadza zmiany"
msgid "Create new relation in layer ''{0}''"
-msgstr "Utwórz nową relację na warstwie „{0}”"
+msgstr "Tworzenie nowej relacji na warstwie „{0}”"
msgid "Edit new relation in layer ''{0}''"
-msgstr "Edytuj nową relację na warstwie „{0}”"
+msgstr "Edytowanie nowej relacji na warstwie „{0}”"
msgid "Edit relation #{0} in layer ''{1}''"
-msgstr "Edycja relacji #{0} w warstwie „{1}”"
+msgstr "Edytowanie relacji #{0} na warstwie „{1}”"
msgid "Load relation"
msgstr "Wczytaj relacje"
@@ -8173,51 +8217,50 @@ msgid ""
"Add all objects selected in the current dataset after the last selected "
"member"
msgstr ""
-"Dodaj wszystkie zaznaczone obiekty w bieżącym zestawie danych po ostatnim "
+"Dodaje wszystkie zaznaczone obiekty w bieżącym zestawie danych po ostatnim "
"zaznaczonym członku"
msgid ""
"Add all objects selected in the current dataset before the first member"
msgstr ""
-"Dodaj wszystkie zaznaczone obiekty w bieżącym zestawie danych przed "
+"Dodaje wszystkie zaznaczone obiekty w bieżącym zestawie danych przed "
"pierwszego członka"
msgid ""
"Add all objects selected in the current dataset before the first selected "
"member"
msgstr ""
-"Dodaj wszystkie zaznaczone obiekty w bieżącym zestawie danych przed "
+"Dodaje wszystkie zaznaczone obiekty w bieżącym zestawie danych przed "
"pierwszego zaznaczonego członka"
msgid "Apply the current updates"
msgstr "Zastosuj zmiany"
msgid "Cancel the updates and close the dialog"
-msgstr "Anuluj aktualizowanie i zamknij okno"
+msgstr "Porzuca zmiany i zamyka okno"
msgid "Yes, save the changes and close"
-msgstr "Tak, zapisz zmiany i zamknij"
+msgstr "Zapisz zmiany"
msgid "Click to save the changes and close this relation editor"
-msgstr "Kliknij by zapisać zmiany i zamknąć edytor"
+msgstr "Zapisuje zmiany i zamyka edytor relacji"
msgid "No, discard the changes and close"
-msgstr "Nie, odrzuć zmiany i zamknij"
+msgstr "Odrzuć zmiany"
msgid "Click to discard the changes and close this relation editor"
-msgstr "Kliknij by odrzuć zmiany i zamknąć edytor relacji"
+msgstr "Odrzuca zmiany i zamyka edytor relacji"
msgid "Cancel, continue editing"
-msgstr "Anuluj, kontynuuj edycję"
+msgstr "Anuluj"
msgid "Click to return to the relation editor and to resume relation editing"
-msgstr "Kliknij by powrócić do edytora relacji i kontynuować edycję"
+msgstr "Powraca do edytora relacji i kontynuuje edycję"
msgid ""
"<html>The relation has been changed.<br><br>Do you want to save your "
"changes?</html>"
-msgstr ""
-"<html>Relacja została zmodyfikowana.<br><br>Czy chcesz zapisać zmiany?</html>"
+msgstr "<html>Zmodyfikowano relację.<br><br>Zapisać zmiany?</html>"
msgid "Unsaved changes"
msgstr "Niezapisane zmiany"
@@ -8229,13 +8272,13 @@ msgid "Relation Editor: Download Members"
msgstr "Edytor Rejacji: Pobierz członków relacji"
msgid "Download all incomplete members"
-msgstr "Pobierz wszystkich brakujących członków relacji"
+msgstr "Pobiera wszystkich brakujących członków relacji"
msgid "Download Members"
msgstr "Pobierz członków"
msgid "Download selected incomplete members"
-msgstr "Pobiera zaznaczonych niekompletnych członków"
+msgstr "Pobiera zaznaczonych brakujących członków"
msgid "Edit the relation the currently selected relation member refers to"
msgstr "Edytuj relację wskazywaną przez wybranego członka relacji"
@@ -8244,31 +8287,31 @@ msgid "Relation Editor: Move Down"
msgstr "Edytor relacji: Przenieś w dół"
msgid "Move the currently selected members down"
-msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii."
+msgstr "Przesuwa aktualnie zaznaczonych członków w dół"
msgid "Relation Editor: Move Up"
msgstr "Edytor relacji: Przenieś w górę"
msgid "Move the currently selected members up"
-msgstr "Przesuń aktualnie zaznaczonych członkół w górę"
+msgstr "Przesuwa aktualnie zaznaczonych członków w górę"
msgid "Apply the updates and close the dialog"
msgstr "Zastosuj zmiany i zamknij okno"
msgid "Relation Editor: Refresh"
-msgstr ""
+msgstr "Edytor relacji: wczytaj ponownie"
msgid "Refresh relation from data layer"
-msgstr ""
+msgstr "Wczytuje ponownie relacje z warstwy danych"
msgid "Refresh"
msgstr "Wczytaj ponownie"
msgid "Yes, discard changes and reload"
-msgstr ""
+msgstr "Odrzuć zmiany i wczytaj ponownie"
msgid "Click to discard the changes and reload data from layer"
-msgstr ""
+msgstr "Odrzuca zmiany i wczytuje dane ponownie z warstwy danych"
msgid ""
"<html>You have unsaved changes in this editor window.<br><br>Do you want to "
@@ -8276,15 +8319,17 @@ msgid ""
msgstr ""
msgid "Click to close window"
-msgstr ""
+msgstr "Kliknij aby zamknąć okno"
msgid "No, continue editing"
-msgstr "Nie, kontynuuj edycję"
+msgstr "Kontynuuj edycję"
msgid ""
"<html>Relation has been deleted outside editor.<br><br>Do you want to close "
"this window?</html>"
msgstr ""
+"<html>Relacja została usunięta poza edytorem.<br><br>Czy chcesz zamknąć to "
+"okno?</html>"
msgid "Deleted relation"
msgstr "Usunięta relacja"
@@ -8296,10 +8341,10 @@ msgid "Remove the currently selected members from this relation"
msgstr "Usuwa zaznaczonych członków tej relacji"
msgid "Remove all members referring to one of the selected objects"
-msgstr "Usuń wszystkich członków wskazujących na jeden z wybranych obiektów"
+msgstr "Usuwa wszystkich członków wskazujących na wybrany obiekt"
msgid "Reverse the order of the relation members"
-msgstr "Odwróć kolejność członków relacji"
+msgstr "Odwraca kolejność członków relacji"
msgid "Reverse"
msgstr "Odwróć"
@@ -8309,49 +8354,46 @@ msgid ""
"relation editor\n"
"was open. They have been removed from the relation members list."
msgstr ""
-"Jeden lub więcej członków zostało usuniętych z relacji kiedy edytor\n"
-"relacji był otwarty. Zostaną one usunięte z listy członków."
+"Jeden lub więcej członków zostało usuniętych z tej relacji kiedy edytor\n"
+"relacji był otwarty. Zostały one usunięte z listy członków."
msgid "Yes, create a conflict and close"
msgstr "Tak, utwórz konflikt i zamknij"
msgid "Click to create a conflict and close this relation editor"
-msgstr "Kliknij aby utworzyć konflikt i zamknąć edytor relacji"
+msgstr "Tworzy konflikt i zamyka edytor relacji"
msgid ""
"<html>This relation has been changed outside of the editor.<br>You cannot "
"apply your changes and continue editing.<br><br>Do you want to create a "
"conflict and close the editor?</html>"
msgstr ""
-"<html>Ta relacja została zmieniona poza edytorem.<br>Nie możesz zatwierdzić "
-"zmian i kontynuować edycji.<br><br>Czy chcesz utworzyć konflikt i zamknąć "
-"edytor?</html>"
+"<html>Ta relacja została zmieniona poza edytorem.<br>Nie można wprowadzić "
+"zmian i kontynuować edycji.<br><br>Utworzyć konflikt i zamknąć edytor?</html>"
msgid ""
"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>Please "
"resolve this conflict first, then try again.</html>"
msgstr ""
-"<html>Warstwa „{0}'' posiada konflikt z obiektem<br>„{1}”.<br>Proszę go "
+"<html>Warstwa „{0}” jest w konflikcie z obiektem<br>„{1}”.<br>Proszę go "
"najpierw rozwiązać i spróbować ponownie.</html>"
msgid "Select objects for selected relation members"
-msgstr "Zaznacz obiekty dla zaznaczonych członków relacji"
+msgstr "Zaznacza obiekty odpowiadające zaznaczonym członkom relacji"
msgid ""
"Select relation members which refer to objects in the current selection"
-msgstr ""
-"Zaznacz członków relacji którzy odpowiadają obiektom obecnie zaznaczonym"
+msgstr "Zaznacza członków relacji odpowiadającym zaznaczonym obiektom"
msgid ""
"Select relation members which refer to {0} objects in the current selection"
-msgstr ""
-"Zaznacz członków relacji którzy odpowiadają {0} obiektom obecnie zaznaczonym"
+msgstr "Zaznacza członków relacji odpowiadającym {0} zaznaczonym obiektom"
msgid "Sets a role for the selected members"
-msgstr "Ustaw rolę dla zaznzczonych członków"
+msgstr "Ustala rolę dla zaznaczonych członków"
msgid "Apply Role"
-msgstr "Zastosuj rolę"
+msgstr "Zastosowanie roli"
msgid "You are setting an empty role on {0} object."
msgid_plural "You are setting an empty role on {0} objects."
@@ -8360,7 +8402,7 @@ msgstr[1] "Ustawiasz pustą rolę dla {0} obiektów."
msgstr[2] "Ustawiasz pustą rolę dla {0} obiektów."
msgid "This is equal to deleting the roles of these objects."
-msgstr "To jest rownoznaczne z usunięciem ról dla tych obiektów."
+msgstr "To jest równoznaczne z usunięciem ról dla tych obiektów."
msgid "Do you really want to apply the new role?"
msgstr "Przypisać nową rolę?"
@@ -8378,13 +8420,13 @@ msgid "Relation Editor: Sort"
msgstr "Edytor relacji: Sortowanie"
msgid "Sort the relation members"
-msgstr "Sortuj elementy relacji"
+msgstr "Sortuje członków relacji"
msgid "Sort below"
-msgstr ""
+msgstr "Posortuj poniższe"
msgid "Sort the selected relation members and all members below"
-msgstr ""
+msgstr "Sortuje zaznaczonych członków relacji i wszystkich członków poniżej"
msgid "way is connected"
msgstr "linia jest połączona"
@@ -8470,7 +8512,7 @@ msgid "Bounding Box"
msgstr "Prostokąt ograniczający"
msgid "The string ''{0}'' is not a valid double value."
-msgstr "Napis ''{0}'' nie reprezentuje poprawnej liczby zmiennoprzecinkowej."
+msgstr "Ciąg „{0}” nie reprezentuje poprawnej liczby zmiennoprzecinkowej."
msgid "Value for latitude in range [-90,90] required."
msgstr "Wartości szerokości geograficznej musza być z zakresu [-90,90]."
@@ -8507,7 +8549,7 @@ msgstr ""
"danych do aktywnej warstwy danych.</html>"
msgid "Open this dialog on startup"
-msgstr "Otwieranie tego okna po uruchomieniu programu"
+msgstr "Otwieranie tego okna po uruchomieniu"
msgid ""
"<html>Autostart ''Download from OSM'' dialog every time JOSM is "
@@ -8552,23 +8594,22 @@ msgstr ""
"nich.</html>"
msgid "Download referrers (parent relations)"
-msgstr "Pobierz obiekty nadrzędne (relacje)"
+msgstr "Pobranie obiektów nadrzędnych (relacji)"
msgid "Download object"
msgstr "Pobierz obiekt"
msgid "Start downloading"
-msgstr "Rozpocznij pobieranie"
+msgstr "Rozpoczyna pobieranie"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
"i.e.,parent relations and for nodes, additionally, parent ways"
msgstr ""
-"Wybierz czy załadować obiekty z odniesieniami do tego obiektu (np. relacje i "
-"linie)"
+"Pobiera obiekty z odniesieniami do tego obiektu (np. relacje, węzły i linie)"
msgid "Select if the members of a relation should be downloaded as well"
-msgstr "Wybierz czy pobrać również obiekty należące do relacji"
+msgstr "Pobiera również obiekty należące do relacji"
msgid "Download referrers (parent relations and ways)"
msgstr "Pobierz obiekty nadrzędne (np. relacje i linie)"
@@ -8797,6 +8838,8 @@ msgstr ""
msgid "This changeset has {0} comment"
msgid_plural "This changeset has {0} comments"
msgstr[0] "Ten zestaw zmian ma {0} komentarz"
+msgstr[1] "Ten zestaw zmian ma {0} komentarze"
+msgstr[2] "Ten zestaw zmian ma {0} komentarzy"
msgid "Changeset"
msgstr "Zestaw zmian"
@@ -8828,6 +8871,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -8910,6 +8956,9 @@ msgid ""
"Click <strong>{0}</strong> to load them now.<br>If necessary JOSM will "
"create conflicts which you can resolve in the Conflict Resolution Dialog."
msgstr ""
+"Kliknij <strong>{0}</strong>aby załadować je teraz.<br>Jeśli to niezbędne "
+"JOSM stworzy konflikty które możesz rozwiązać w oknie Rozwiązywania "
+"Konfliktów."
msgid "Object still in use"
msgstr "Obiekt nadal w użyciu"
@@ -8938,7 +8987,7 @@ msgid "Enter an upload comment"
msgstr "Wprowadza komentarz przesyłania"
msgid "Specify the data source for the changes"
-msgstr "Podaj źródło danych"
+msgstr "Źródła danych dla zmian"
msgid "obtain from current layers"
msgstr "pobierz z bieżących warstw"
@@ -9104,8 +9153,8 @@ msgid ""
"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
"Skipping download."
msgstr ""
-"Nie można pobrać pliku ''{0}''. Ten link ''{1}'' nie jest prawidłlowym "
-"adresem. Pomijanie pobiernia."
+"Nie można pobrać pliku „{0}”. Ten link „{1}” nie jest prawidłowym adresem. "
+"Pomijanie pobierania."
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -9270,10 +9319,11 @@ msgstr ""
"Kończy działanie programu bez zapisywania. Niezapisane dane zostaną utracone."
msgid "Restart now!"
-msgstr ""
+msgstr "Uruchom ponownie teraz!"
msgid "Restart JOSM without saving. Unsaved changes are lost."
msgstr ""
+"Uruchamia ponownie JOSM bez zapisywania. Niezapisane zmiany zostaną utracone."
msgid "Delete now!"
msgstr "Usuń"
@@ -9290,10 +9340,12 @@ msgstr ""
"zostaną wysłane i/lub zapisane."
msgid "Perform actions before restarting"
-msgstr ""
+msgstr "Wykonaj działania przed ponownym uruchomieniem"
msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
msgstr ""
+"Ponownie uruchamia JOSM z zapisem. Niezapisane dane są wysyłane i/lub "
+"zapisywane."
msgid "Perform actions before deleting"
msgstr "Wykonaj czynności i usuń"
@@ -10505,7 +10557,10 @@ msgid "Direction"
msgstr "Kierunek"
msgid "Velocity, {0}"
-msgstr ""
+msgstr "Prędkość, {0}"
+
+msgid "Wave Audio files (*.wav)"
+msgstr "Pliki audio Wave (*.wav)"
msgid "Import Audio"
msgstr "Importuj dźwięk"
@@ -10522,9 +10577,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Import nie jest możliwy"
-msgid "Wave Audio files (*.wav)"
-msgstr "Pliki audio Wave (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Markery audio z {0}"
@@ -10633,14 +10685,6 @@ msgstr "(Adres URL był: "
msgid "Select the map painting styles"
msgstr "Wybierz style rysowania mapy"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr "wczytywanie stylu „{0}”..."
@@ -10660,11 +10704,14 @@ msgstr[2] ""
"Wystąpiło {0} błędów podczas wczytywania stylu. Proszę wybrać „Info” z menu "
"kontekstowego, aby wyświetlić szczegóły."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Failed to locate image ''{0}''"
-msgstr "Nie udało się zlokalizować obraz „{0}''"
+msgstr "Nie udało się zlokalizować obrazu „{0}''"
msgid "Save Access Token in preferences"
msgstr "Zapisz klucz dostępu w ustawieniach"
@@ -10720,7 +10767,7 @@ msgstr ""
"zapisane.</html>"
msgid "Overwrite custom OAuth settings?"
-msgstr "Nadpisać ustawienia OAuth?"
+msgstr "Zastąpić ustawienia OAuth?"
msgid "Fully automatic"
msgstr "Automatyczna"
@@ -10786,7 +10833,7 @@ msgid "Advanced OAuth properties"
msgstr "Zaawansowane właściwości OAuth"
msgid "Accept Access Token"
-msgstr "Akceptuj"
+msgstr "Zaakceptuj"
msgid ""
"<html>You have successfully retrieved an OAuth Access Token from the OSM "
@@ -10798,11 +10845,10 @@ msgstr ""
"by uzyskać dostęp do OSM API.</html>"
msgid "Authorize now"
-msgstr "Autoryzuj"
+msgstr "Uwierzytelnij"
msgid "Click to redirect you to the authorization form on the JOSM web site"
-msgstr ""
-"Kliknij aby przenieść się do formularza edycji praw dostępu na witrynie JOSM."
+msgstr "Przekierowuje do formularza edycji praw dostępu na witrynie JOSM"
msgid "Back"
msgstr "Wstecz"
@@ -10868,7 +10914,7 @@ msgid ""
"<html><body>Please enter an OAuth Access Token which is authorized to access "
"the OSM server ''{0}''.</body></html>"
msgstr ""
-"<html><body>Proszę wprowadzić Klucz Dostępu OAuth, który ma prawo dostępu do "
+"<html><body>Proszę wprowadzić klucz dostępu OAuth, który ma prawo dostępu do "
"serwera OSM „{0}”.</body></html>"
msgid "Please enter an Access Token Key"
@@ -10879,7 +10925,7 @@ msgid ""
msgstr "Token dostępu nie może być pusty. Wprowadź Token dostępu"
msgid "Please enter an Access Token Secret"
-msgstr ""
+msgstr "Proszę wprowadzić sekretny klucz dostępu"
msgid ""
"The Access Token Secret must not be empty. Please enter an Access Token "
@@ -10887,14 +10933,14 @@ msgid ""
msgstr ""
msgid "Click to test the Access Token"
-msgstr "Kliknij by przetestować Klucz Dostępu"
+msgstr "Kliknij, aby przetestować klucz dostępu"
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 ""
-"Dzięki OAuth możesz nadać JOSM prawa wysyłania danych map i ścieżek GPS w "
-"twoim imieniu (<a href=„{0}”>więćej informacji...</a>)."
+"Dzięki OAuth można nadać JOSM uprawnienia do wysyłania danych map i śladów "
+"GPS w imieniu użytkownika (<a href=„{0}”>więcej informacji...</a>)."
msgid "Please select an authorization procedure: "
msgstr "Proszę wybrać procedurę uwierzytelniania: "
@@ -10951,66 +10997,67 @@ msgid "Logging out session ''{0}''..."
msgstr "Wylogowanie z sesji „{0}”..."
msgid "Allow to upload map data"
-msgstr "Pozwól na wysyłanie map"
+msgstr "Wysyłanie danych map"
msgid "Select to grant JOSM the right to upload map data on your behalf"
-msgstr "Zaznacz by nadać JOSM prawo wysyłania map w twoim imieniu"
+msgstr ""
+"Nadaje JOSM uprawnienia do wysyłania danych map w imieniu użytkownika"
msgid "Allow to upload GPS traces"
-msgstr "Pozwól na wysyłaniu śladów GPS"
+msgstr "Wysyłanie śladów GPS"
msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
-msgstr "Zaznacz by nadać JOSM prawo do wysyłania śladów GPS w twoim imieniu"
+msgstr ""
+"Nadaje JOSM uprawnienia do wysyłania śladów GPS w imieniu użytkownika"
msgid "Allow to download your private GPS traces"
-msgstr "Pozwól na pobieranie twoich prywatnych śladów GPS"
+msgstr "Pobieranie prywatnych śladów GPS"
msgid ""
"Select to grant JOSM the right to download your private GPS traces into JOSM "
"layers"
msgstr ""
-"Zaznacz by nadać JOSM prawo do pobierania twoich prywatnych śladów GPS do "
-"warstw JOSM."
+"Nadaje JOSM uprawnienia do pobierania prywatnych śladów GPS użytkownika do "
+"warstw"
msgid "Allow to read your preferences"
-msgstr "Pozwól na odczyt twoich preferencji"
+msgstr "Odczytywanie preferencji użytkownika"
msgid "Select to grant JOSM the right to read your server preferences"
-msgstr "Zaznacz by nadać JOSM prawo odczytu twoich preferencji witryny OSM"
+msgstr "Nadaje JOSM uprawnienia do odczytywania preferencji użytkownika OSM"
msgid "Allow to write your preferences"
-msgstr "Pozwól na zapis twoich preferencji"
+msgstr "Zapisywanie preferencji użytkownika"
msgid "Select to grant JOSM the right to write your server preferences"
-msgstr ""
-"Zaznacz by nadac JOSM prawo do wysyłania twoich preferencji witryny OSM"
+msgstr "Nadaje JOSM uprawnienia do zapisywania preferencji użytkownika OSM"
msgid "Allow modifications of notes"
-msgstr "Pozwól na modyfikowanie uwag"
+msgstr "Modyfikowanie uwag"
msgid "Select to grant JOSM the right to modify notes on your behalf"
-msgstr "Zaznacz aby pozwolić JOSM na modyfikowanie uwag w twoim imieniu"
+msgstr "Nadaje JOSM uprawnienia do modyfikowania uwag w imieniu użytkownika"
msgid "Retrieving OAuth Access Token..."
-msgstr "Pobieranie klucza dostępu OAuth"
+msgstr "Pobieranie klucza dostępu OAuth..."
msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
-msgstr "<html>Pobieranie klucza dostępu OAuth z „{0}'' nie udało się.</html>"
+msgstr "<html>Nie udało się pobrać klucza dostępu OAuth z „{0}”.</html>"
msgid "Request Failed"
-msgstr "Zapytanie nie udało się"
+msgstr "Nieudane żądanie"
msgid "Retrieving OAuth Request Token..."
-msgstr "Pobieranie żetonu żądania OAuth..."
+msgstr "Pobieranie tokena żądania OAuth..."
msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
-msgstr "<html>Pobieranie Żetonu Żądania OAuth z „{0}'' nie udało się.</html>"
+msgstr "<html>Nie udało się pobrać tokena żądania OAuth z „{0}”.</html>"
msgid "Display Advanced OAuth Parameters"
msgstr "Wyświetl zaawansowane parametry OAuth"
msgid "Retrieve Request Token"
-msgstr "Pobierz Żeton Żądania"
+msgstr "Pobierz token żądania"
msgid ""
"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
@@ -11020,10 +11067,10 @@ msgstr ""
"z „{1}”.</html>"
msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
-msgstr "<html>Krok 1/3: Pobranie Żetonu Żądania z OAuth</html>"
+msgstr "<html>Krok 1/3: Pobranie tokena żądania z OAuth</html>"
msgid "<html>Step 2/3: Authorize and retrieve an Access Token</html>"
-msgstr "<html>Krok 2/3: Uwierzytelnianie i pobieranie Klucza Dostępu</html>"
+msgstr "<html>Krok 2/3: Uwierzytelnianie i pobieranie klucza dostępu</html>"
msgid "Request Access Token"
msgstr "Żądanie klucza dostępu"
@@ -11049,7 +11096,7 @@ msgid "Go back to step 1/3"
msgstr "Powróć do kroku 1/3"
msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
-msgstr "<html>Krok 3/3: Pomyślnie pobrano Klucz Dostępu</html>"
+msgstr "<html>Krok 3/3: Pobrano klucz dostępu</html>"
msgid ""
"<html>JOSM has successfully retrieved an Access Token. You can now accept "
@@ -11137,15 +11184,14 @@ msgid "Expert mode"
msgstr "Tryb ekspercki"
msgid "Close the preferences dialog and discard preference updates"
-msgstr "Zamknij okno ustawień i odrzuć zmiany w ustawieniach"
+msgstr "Zamyka okno ustawień i wycofuje zmiany w ustawieniach"
msgid "Save the preferences and close the dialog"
msgstr "Zapisuje ustawienia i zamyka okno"
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
-"Należy ponownie uruchomić program JOSM, aby niektóre ustawienia stały się "
-"aktywne."
+"Należy ponownie uruchomić program JOSM, aby wprowadzić część ustawień."
msgid "Would you like to restart now?"
msgstr "Uruchomić ponownie?"
@@ -11172,7 +11218,7 @@ msgid "Version:"
msgstr "Wersja:"
msgid "Minimum JOSM Version:"
-msgstr "Minimalna wersja JOSM:"
+msgstr "Najniższa wersja JOSM:"
msgid "by {0}"
msgstr "autor: {0}"
@@ -11181,10 +11227,10 @@ msgid "Name (optional):"
msgstr "Nazwa (opcjonalna):"
msgid "URL / File:"
-msgstr "URL/Plik:"
+msgstr "Adres URL / plik:"
msgid "active"
-msgstr "aktywne"
+msgstr "Aktywne"
msgid "Map paint style file (*.xml, *.mapcss, *.zip)"
msgstr "Plik stylu rysowania mapy (*.xml, *.mapcss, *.zip)"
@@ -11193,10 +11239,10 @@ msgid "Preset definition file (*.xml, *.zip)"
msgstr "Pliki definicji szablonu (*.xml, *.zip)"
msgid "Tag checker rule (*.validator.mapcss, *.zip)"
-msgstr ""
+msgstr "Reguła walidatora znaczników (*.validator mapcss, *.zip)"
msgid "Edit source entry:"
-msgstr "Edycja wpisu źródła (source):"
+msgstr "Edycja wpisu źródła:"
msgid "Entry ''{0}'' requires JOSM Version {1}. (Currently running: {2})"
msgstr "Wpis „{0}” wymaga JOSM w wersji {1}. (Uruchomiona: {2})"
@@ -11211,19 +11257,19 @@ msgid "Some entries have unmet dependencies:"
msgstr "Niektóre wpisy mają niespełnione zależności:"
msgid "Reset"
-msgstr "Resetuj"
+msgstr "Przywróć domyślne"
msgid "Reset to default"
-msgstr "Przywróć wartości domyślne"
+msgstr "Przywraca wartości domyślne"
msgid "Add a new icon path"
-msgstr "Dodaj nową ścieżkę ikon"
+msgstr "Dodaje nową ścieżkę ikon"
msgid "Remove the selected icon paths"
-msgstr "Usuń wybrane ścieżki ikon"
+msgstr "Usuwa wybrane ścieżki ikon"
msgid "Edit the selected icon path"
-msgstr "Edytuj wybraną ścieżkę ikon"
+msgstr "Modyfikuje wybraną ścieżkę ikon"
msgid "Tooltip"
msgstr "Podpowiedź"
@@ -11247,16 +11293,16 @@ msgid "Actions"
msgstr "Działania"
msgid "Toolbar customization"
-msgstr "Personalizacja paska narzędzi"
+msgstr "Pasek narzędziowy"
msgid "Customize the elements on the toolbar."
-msgstr "Dostosowywanie paska narzędzi do własnych potrzeb."
+msgstr "Dostosowuje elementy paska narzędziowego"
msgid "Separator"
msgstr "Separator"
msgid "Toolbar"
-msgstr "Pasek narzędzi"
+msgstr "Pasek narzędziowy"
msgid "Available"
msgstr "Dostępne"
@@ -11271,7 +11317,7 @@ msgid "Parameter value"
msgstr "Wartość parametru"
msgid "Toolbar action without name: {0}"
-msgstr ""
+msgstr "Czynność paska narzędziowego bez nazwy: {0}"
msgid "Strange toolbar value: {0}"
msgstr "Dziwna wartość paska narzędzi: {0}"
@@ -11437,42 +11483,44 @@ msgid "Value: "
msgstr "Wartość: "
msgid "Audio Settings"
-msgstr "Ustawienia dźwięku"
+msgstr "Dźwięk"
msgid "Settings for the audio player and audio markers."
-msgstr "Ustawienia odtwarzacza oraz znaczników dźwięku."
+msgstr "Konfiguruje ustawienia odtwarzacza oraz znaczników dźwięku"
msgid "Display the Audio menu."
-msgstr "Wyświetlaj menu „Dźwięk\""
+msgstr "Menu „Dźwięk\""
msgid "Label audio (and image and web) markers."
-msgstr ""
+msgstr "Etykiety znaczników dźwiękowych (oraz obrazu i sieci)"
msgid "Display live audio trace."
-msgstr ""
+msgstr "Zsynchronizowany ślad dźwiękowy"
msgid "Explicit waypoints with valid timestamps."
-msgstr ""
+msgstr "Czytelne punkty śladu z prawidłowymi znacznikami czasu"
msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
+msgstr "Czytelne punkty śladu z czasem określonym na podstawie położenia"
msgid "Named trackpoints."
-msgstr "Nazwane punkty tras."
+msgstr "Nazwane punkty śladu"
msgid "Modified times (time stamps) of audio files."
-msgstr ""
+msgstr "Czasy modyfikacji (znaczniki czasu) plików dźwiękowych"
msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
+msgstr "Początek śladu (zawsze używany jeśli nie ma innych znaczników)"
msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr "Pokazuj lub ukryj menu dźwięku w głównym pasku menu."
+msgstr "Przełącza wyświetlanie menu dźwięku w pasku menu"
msgid ""
"Display a moving icon representing the point on the synchronized track where "
"the audio currently playing was recorded."
msgstr ""
+"Wyświetla ruchomą ikonę reprezentującą położenie na śladzie, w którym "
+"aktualnie jest odtwarzany dźwięk"
msgid ""
"Put text labels against audio (and image and web) markers as well as their "
@@ -11480,7 +11528,7 @@ msgid ""
msgstr ""
msgid "When importing audio, make markers from..."
-msgstr ""
+msgstr "Źródła znaczników podczas importowania dźwięku..."
msgid "When importing audio, apply it to any waypoints in the GPX layer."
msgstr ""
@@ -11501,7 +11549,7 @@ msgid ""
msgstr ""
msgid "Forward/back time (seconds)"
-msgstr "Przewiń w przód/tył (sekundy)"
+msgstr "Przewinięcie w przód/tył (sekundy)"
msgid "The amount by which the speed is multiplied for fast forwarding"
msgstr "Mnożnik prędkości stosowany podczas przewijania"
@@ -11533,10 +11581,10 @@ msgid "Choose a color for {0}"
msgstr "Wybieranie koloru dla {0}"
msgid "Set to default"
-msgstr "Ustaw na domyślne"
+msgstr "Przywróć domyślne"
msgid "Set all to default"
-msgstr "Domyślne ustawienie dla wszystkich"
+msgstr "Przywróć domyślne dla wszystkich"
msgid "Colors used by different objects in JOSM."
msgstr "Kolory wykorzystywane przez różne obiekty w JOSM."
@@ -11565,7 +11613,7 @@ msgid "Draw segment order numbers"
msgstr "Numery segmentów"
msgid "Draw segment order numbers on selected way"
-msgstr ""
+msgstr "Numery segmentów zaznaczonej linii"
msgid "Draw boundaries of downloaded data"
msgstr "Granice obszaru pobranych danych"
@@ -11577,7 +11625,7 @@ msgid "Draw inactive layers in other color"
msgstr "Nieaktywne warstwy w innym kolorze"
msgid "Display discardable keys"
-msgstr "Przestarzałe klucze znaczników"
+msgstr "Porzucone klucze znaczników"
msgid "Highlight target ways and nodes"
msgstr "Podświetlanie docelowych linii i węzłów"
@@ -11619,13 +11667,13 @@ msgstr "Zaznacza nieaktywne warstwy danych innym kolorem."
msgid ""
"Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "Stosuje antyaliasing dla widoku mapy dając gładszy wygląd."
+msgstr "Stosuje antyaliasing dla widoku mapy uzyskując gładszy wygląd"
msgid ""
"Apply antialiasing to the map view in wireframe mode resulting in a smoother "
"appearance."
msgstr ""
-"Stosuje antyaliasing dla mapy w widoku szkieletowym dając gładszy wygląd"
+"Stosuje antyaliasing dla szkieletowego widoku mapy uzyskując gładszy wygląd"
msgid "Hightlight target nodes and ways while drawing or selecting"
msgstr "Podświetl docelowe węzły i linie podczas rysowania i zaznaczania"
@@ -11633,12 +11681,14 @@ msgstr "Podświetl docelowe węzły i linie podczas rysowania i zaznaczania"
msgid ""
"This option suppresses the filling of areas, overriding anything specified "
"in the selected style."
-msgstr ""
+msgstr "Nie wypełnia obszarów określonych w wybranym stylu"
msgid ""
"Display keys which have been deemed uninteresting to the point that they can "
"be silently removed."
msgstr ""
+"Wyświetla klucze uznane za nieinteresujące do tego stopnia, że mogą zostać "
+"usunięte"
msgid "Options that affect drawing performance"
msgstr "Wydajność rysowania"
@@ -11711,11 +11761,14 @@ msgstr ""
msgid "Track date"
msgstr "Data śladu"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Jeden kolor (moze być zmieniony dla nazwanej warstwy)"
msgid "Car"
-msgstr "Samochody"
+msgstr "Samochód"
msgid "Bicycle"
msgstr "Rowery"
@@ -11723,6 +11776,18 @@ msgstr "Rowery"
msgid "Foot"
msgstr "Ruch pieszy"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Drzewa/las pierwotny"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Tworzenie znaczników podczas wczytywania GPX"
@@ -11735,6 +11800,9 @@ msgstr "Dynamiczny zestaw kolorów w zależności od ograniczeń danych"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Wygładzanie linii GPX (antyaliasing)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11771,7 +11839,7 @@ msgstr ""
"liniach."
msgid "Draw direction arrows for lines, connecting GPS points."
-msgstr "Oznaczaj kierunek wszystkich odcinków, łączących punkty GPS."
+msgstr "Oznacza kierunek wszystkich linii łączących punkty GPS."
msgid ""
"Draw the direction arrows using table lookups instead of complex math."
@@ -11790,10 +11858,10 @@ msgid "Minimum distance (pixels)"
msgstr "Minimalna odległość (w pikselach)"
msgid "Draw a circle from HDOP value."
-msgstr "Rysuj okręgi na postawie wartości HDOP."
+msgstr "Rysuje okręgi na postawie wartości HDOP"
msgid "Draw larger dots for the GPS points."
-msgstr "Rysuj większe kropki dla punktów GPS."
+msgstr "Rysuje większe kropki dla punktów GPS"
msgid "Width of drawn GPX line (0 for default)"
msgstr "Szerokość linii GPX (0 dla domyślnej)"
@@ -11803,14 +11871,19 @@ msgstr "Szerokość rysowania linii GPX"
msgid ""
"Apply antialiasing to the GPX lines resulting in a smoother appearance."
-msgstr "Stosuje antyaliasing dla linii GPX dając gładszy wygląd"
+msgstr "Stosuje antyaliasing dla linii GPX uzyskując gładszy wygląd"
+
+msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
-"Wszystkie punkty i segmenty ścieżki będą tego samego koloru. Można to "
-"zmodyfikować w Zarządcy Warstw."
+"Wyświetla wszystkie punkty i segmenty śladu w tym samym kolorze. Można "
+"dostosować w menedżerze warstw."
msgid "Colors points and track segments by velocity."
msgstr "Koloruje punkty i segmenty śladu według prędkości"
@@ -11828,10 +11901,17 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "Koloruje punkty i segmenty śladu według ich znaczników czasu."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
"Pozwana na dostrojenie kolorowania ścieżek dla różnych prędkości średnich."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Kolorowanie śladów i punktów"
@@ -12016,10 +12096,10 @@ msgid "No bounding box was found for this layer."
msgstr "Brak obszaru edycji dla tej warstwy"
msgid "1. Enter getCapabilities URL"
-msgstr ""
+msgstr "Wprowadź adres URL getCapabilities"
msgid "2. Enter name for this layer"
-msgstr ""
+msgstr "2. Wprowadź nazwę dla tej warstwy"
msgid "{0} cache, total cache size: {1} bytes"
msgstr "Pamięć podręczna {0}, łączny rozmiar pamięci: {1} bajtów"
@@ -12058,19 +12138,19 @@ msgid "Tiles zoom offset:"
msgstr "Przesunięcie przybliżenia kafelków:"
msgid "Imagery Preferences"
-msgstr "Właściwości podkładów"
+msgstr "Podkłady"
msgid "Modify list of imagery layers displayed in the Imagery menu"
-msgstr "Zmodyfikuj listę warstw podkładów wyświetlaną w menu Podkłady mapy"
+msgstr "Modyfikuje listę warstw podkładów wyświetlaną w menu Podkłady"
msgid "Common Settings"
-msgstr "Ustawienia"
+msgstr "Ogólne"
msgid "WMS Settings"
-msgstr "Ustawienia WMS"
+msgstr "Usługa WMS"
msgid "TMS Settings"
-msgstr "Ustawienia TMS"
+msgstr "Usługa TMS"
msgid "Imagery providers"
msgstr "Dostawcy zdjęć"
@@ -12164,7 +12244,7 @@ msgid "Tile size:"
msgstr "Wielkość kafelka:"
msgid "Auto save enabled"
-msgstr "Aktywne automatyczne zapisywanie"
+msgstr "Automatyczne zapisywanie"
msgid "Auto save interval (seconds)"
msgstr "Częstość zapisywania (sekundy)"
@@ -12186,11 +12266,12 @@ msgstr ""
"kolejnym uruchomienu.)</i>"
msgid "Keep backup files when saving data layers"
-msgstr "Zachowaj kopie zapasowe nawet gdy warstwy są zapisywane"
+msgstr "Przechowywanie kopii zapasowych nawet po zapisaniu warstw"
msgid "When saving, keep backup files ending with a ~"
msgstr ""
-"Podczas zapisywania, pozostawia kopie zapasowe pliku dodając ~ do nazwy"
+"Podczas zapisywania, pozostawia pliki kopii zapasowych dodając znak ~ na "
+"końcu nazwy pliku"
msgid ""
"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
@@ -12200,13 +12281,13 @@ msgstr ""
"nazwy piku dodaje „~'' i zapisuje w tym samym folderze.)</i>"
msgid "Notification at each save"
-msgstr "Powiadomienie przy każdym zapisie"
+msgstr "Powiadamianie o każdym zapisie"
msgid "When saving, display a small notification"
msgstr "Podczas zapisywania pokaż niewielkie powiadomienie"
msgid "File backup"
-msgstr "Plik kopii zapasowej"
+msgstr "Kopia zapasowa"
msgid "Configure whether to create backup files"
msgstr "Konfiguruj kiedy tworzyć plik kopii zapasowej"
@@ -12318,28 +12399,28 @@ msgstr ""
"chcesz go użyć?<br><br><table width=600>Błąd: {1}</table></html>"
msgid "Sort presets menu alphabetically"
-msgstr "Sortuj menu szablonów alfabetycznie"
+msgstr "Sortowanie alfabetyczne menu szablonów"
msgid "Tagging Presets"
msgstr "Szablony"
msgid "Available presets:"
-msgstr "Dostępne szablony:"
+msgstr "Dostępne:"
msgid "Active presets:"
-msgstr "Aktywne szablony::"
+msgstr "Aktywne:"
msgid "Add a new preset by entering filename or URL"
-msgstr "Dodaj nowy szablon z pliku lub adresu URL"
+msgstr "Dodaje nowy szablon z pliku lub adresu URL"
msgid "New preset entry:"
msgstr "Nowy wpis szablonu:"
msgid "Remove the selected presets from the list of active presets"
-msgstr "Usuń wybrane szablony z listy aktywnych szablonów"
+msgstr "Usuwa wybrane szablony z listy aktywnych szablonów"
msgid "Edit the filename or URL for the selected active preset"
-msgstr "Edytuj nazwę pliku lub adres URL dla wybranego szablonu"
+msgstr "Edytuje nazwę pliku lub adres URL wybranego szablonu"
msgid "Add the selected available presets to the list of active presets"
msgstr "Dodaje zaznaczone dostępne szablony do listy aktywnych szablonów"
@@ -12537,10 +12618,10 @@ msgid "Validate"
msgstr "Zweryfikuj"
msgid "Parameter information..."
-msgstr ""
+msgstr "Informacje parametru..."
msgid "Parameter information"
-msgstr ""
+msgstr "Informacje parametru"
msgid "Projection name"
msgstr "Nazwa projekcji"
@@ -12618,7 +12699,7 @@ msgid "Belgian Lambert 2008"
msgstr ""
msgid "Lambert Zone (Estonia)"
-msgstr "odwzorowanie Lamberta (Estonia)"
+msgstr "Odwzorowanie Lamberta (Estonia)"
msgid "Lambert 93 (France)"
msgstr "Lambert 93 (Francja)"
@@ -12709,19 +12790,19 @@ msgid "Remote Control"
msgstr "Zdalne sterowanie"
msgid "Settings for the remote control feature."
-msgstr "Ustawienia funkcji zdalnego sterowania"
+msgstr "Konfiguruje ustawienia zdalnego sterowania"
msgid "Download objects to new layer"
-msgstr "Pobierz obiekty do nowej warstwy"
+msgstr "Pobieranie obiektów do nowej warstwy"
msgid "Confirm all Remote Control actions manually"
-msgstr "Potwierdzaj ręcznie wszystkie akcje zdalnego sterowania"
+msgstr "Potwierdzanie ręczne wszystkie czynności zdalnego sterowania"
msgid ""
"Allows JOSM to be controlled from other applications, e.g. from a web "
"browser."
msgstr ""
-"Umożliwia sterowanie JOSM z innych aplikacji, np. z przeglądarki "
+"Umożliwia sterowanie programem z innych aplikacji, np. z przeglądarki "
"internetowej."
msgid ""
@@ -12730,14 +12811,14 @@ msgid ""
"referenced by external applications talking to JOSM."
msgstr ""
"JOSM nasłuchuje tylko na <b>porcie {0}</b> (HTTP) oraz na <b>porcie {1}</b> "
-"(HTTPS) na maszynie lokalnej.<br>Te porty nie są konfigurowalne, ponieważ "
-"odwołują się do nich inne aplikacje komunikujące się z JOSM-em."
+"(HTTPS) komputera lokalnego.<br>Tych portów nie można skonfigurować, "
+"ponieważ odwołują się do nich inne aplikacje komunikujące się z programem."
msgid "Enable remote control"
-msgstr "Włącz zdalne sterowanie"
+msgstr "Zdalne sterowanie"
msgid "Enable HTTPS support"
-msgstr "Włącz obsługę HTTPS"
+msgstr "Obsługa HTTPS"
msgid "Install..."
msgstr "Zainstaluj..."
@@ -12801,7 +12882,7 @@ msgid ""
msgstr ""
msgid "Connection to API failed"
-msgstr "Połączenie z API nie powiodło się."
+msgstr "Nie udało się połączyć z API"
msgid ""
"<html>Failed to retrieve a list of changesets from the OSM API server "
@@ -12840,6 +12921,8 @@ msgid ""
"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
"method ''Basic Authentication''."
msgstr ""
+"Nieobsługiwana wartość w kluczu ustawień „{0}”, jest „{1}”. Używanie metody "
+"uwierzytelniania „Proste uwierzytelnianie”."
msgid "OSM username:"
msgstr "Nazwa użytkownika OSM:"
@@ -12849,18 +12932,22 @@ msgstr "Hasło OSM:"
msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
+"Nie udało się uzyskać danych uwierzytelniających OSM z menedżera danych "
+"uwierzytelniających."
msgid "Current credential manager is of type ''{0}''"
-msgstr ""
+msgstr "Aktualny menedżer danych uwierzytelniających jest typu „{0}”"
msgid "Failed to save OSM credentials to credential manager."
msgstr ""
+"Nie udało się zapisać danych uwierzytelniających OSM w menedżerze danych "
+"uwierzytelniających."
msgid "Periodically check for new messages"
-msgstr "Okresowo sprawdzaj czy są nowe wiadomości"
+msgstr "Okresowe sprawdzanie nowych wiadomości"
msgid "Check interval (minutes):"
-msgstr "Sprawdzaj co (w minutach):"
+msgstr "Okres sprawdzania (w minutach):"
msgid "Max age for closed notes (days):"
msgstr "Maksymalny wiek zamkniętych uwag (w dniach):"
@@ -12872,21 +12959,25 @@ msgstr ""
msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
+"Nie udało się uzyskać klucza dostępu z menedżera danych uwierzytelniających"
msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
+"Nie udało się przesłać klucza dostępu do menedżera danych uwierzytelniających"
msgid "Save to preferences"
-msgstr "Zapisz do ustawień"
+msgstr "Zapisanie do ustawień"
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
"Please authorize first."
msgstr ""
+"Brak klucza dostępu do serwera OSM za pomocą OAuth. Proszę się najpierw "
+"uwierzytelnić."
msgid ""
"You already have an Access Token to access the OSM server using OAuth."
-msgstr ""
+msgstr "W posiadaniu jest już klucz dostępu do serwera OSM za pomocą OAuth."
msgid "Click to step through the OAuth authorization process"
msgstr ""
@@ -12897,10 +12988,10 @@ msgstr "Nowy klucz dostępu"
msgid ""
"Click to step through the OAuth authorization process and generate a new "
"Access Token"
-msgstr "Klucz dostępu"
+msgstr "Rozpoczyna proces uwierzytelniania i generuje nowy klucz dostępu"
msgid "Click test access to the OSM server with the current access token"
-msgstr ""
+msgstr "Sprawdza dostęp do serwera OSM za pomocą aktualnego klucza dostępu"
msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
msgstr ""
@@ -12929,7 +13020,7 @@ msgid "Please enter the OSM API URL."
msgstr "Podaj OSM API URL."
msgid "Use Overpass server for object downloads"
-msgstr "Używaj serwera Overpass do pobierania obiektów"
+msgstr "Używanie serwera Overpass do pobierania obiektów"
msgid "Overpass server: "
msgstr "Serwer Overpass: "
@@ -13012,19 +13103,19 @@ msgid "Shortcut Background: Modified"
msgstr ""
msgid "Use default"
-msgstr "Użyj domyślny"
+msgstr "Użycie domyślnego"
msgid "Key:"
-msgstr "Klucz:"
+msgstr "Klawisz:"
msgid "Attention: Use real keyboard keys only!"
-msgstr "Uwaga: Używaj jedynie rzeczywistych klawiszy klawiatury!"
+msgstr "Uwaga: proszę używać jedynie rzeczywistych klawiszy!"
msgid "Keyboard Shortcuts"
-msgstr "Skróty klawiaturowe"
+msgstr "Skróty klawiszowe"
msgid "Changing keyboard shortcuts manually."
-msgstr "Ręczna zmiana skrótów klawiaturowych."
+msgstr "Umożliwia zmianę skrótów klawiszowych"
msgid "Data validator"
msgstr "Weryfikacja danych"
@@ -13033,8 +13124,7 @@ msgid ""
"An OSM data validator that checks for common errors made by users and editor "
"programs."
msgstr ""
-"Weryfikacja danych OSM pozwala wyłapać typowe błędy popełniane przez "
-"użytkowników i programy do edycji."
+"Wykrywa typowe błędy popełniane przez użytkowników i programy do edycji"
msgid "Available rules:"
msgstr "Dostępne reguły:"
@@ -13049,24 +13139,26 @@ msgid "New rule entry:"
msgstr "Nowa reguła:"
msgid "Remove the selected rules from the list of active rules"
-msgstr "Usuń wybrane reguły z listy aktywnych reguł"
+msgstr "Usuwa wybrane reguły z listy aktywnych reguł"
msgid "Edit the filename or URL for the selected active rule"
-msgstr ""
+msgstr "Modyfikuje nazwę pliku lub adres URL zaznaczonej reguły"
msgid "Add the selected available rules to the list of active rules"
-msgstr "Dodaj wybrane reguły do listy aktywnych reguł"
+msgstr "Dodaje wybrane reguły do listy aktywnych reguł"
msgid "Reloads the list of available rules from ''{0}''"
-msgstr ""
+msgstr "Wczytuje ponownie listę dostępnych reguł z adresu „{0}”"
msgid "Loading rule sources from ''{0}''"
-msgstr ""
+msgstr "Wczytywanie zasobów reguł z „{0}”"
msgid ""
"<html>Failed to load the list of rule sources "
"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
msgstr ""
+"<html>Nie udało się wczytać zasobów listy reguł z "
+"adresu<br>„{0}”.<br><br>Szczegóły (nieprzetłumaczone):<br>{1}</html>"
msgid "Warning: illegal format of entry in rule list ''{0}''. Got ''{1}''"
msgstr ""
@@ -13075,10 +13167,10 @@ msgid "Checks for errors on addresses"
msgstr "Szuka błędów w adresowaniu"
msgid "Tag combinations"
-msgstr "Kombinacje tagów"
+msgstr "Zestawienia znaczników"
msgid "Checks for missing tag or suspicious combinations"
-msgstr "Szuka brakujących tagów i podejrzanych kombinacji"
+msgstr "Szuka brakujących znaczników i ich podejrzanych zestawień"
msgid "Deprecated features"
msgstr "Porzucone funkcje"
@@ -13116,6 +13208,12 @@ msgstr "Szuka błędów w obiektach religijnych"
msgid "Checks for errors on relations"
msgstr "Szuka błędów w relacjach"
+msgid "Territories"
+msgstr "Obszary"
+
+msgid "Checks for territories-specific features"
+msgstr "Sprawdza cechy związane z obszarami"
+
msgid "Unnecessary tags"
msgstr "Zbędne znaczniki"
@@ -13135,25 +13233,26 @@ msgid "Choose Tag checker rules to enable"
msgstr ""
msgid "Use ignore list."
-msgstr "Użyj listy ignorowanych"
+msgstr "Używanie listy ignorowanych"
msgid "Use the ignore list to suppress warnings."
-msgstr "Używa listę ignorowanych problemów by pominąć niektóre ostrzeżenia."
+msgstr ""
+"Uwzględnia listę ignorowanych problemów, aby pominąć niektóre ostrzeżenia."
msgid "Use error layer."
-msgstr "Użyj warstwy błędów"
+msgstr "Używanie warstwy błędów"
msgid "Use the error layer to display problematic elements."
-msgstr "Używa warstwę z błędami aby wyświetlić problemowe elementy."
+msgstr "Wyświetla problematyczne elementy na oddzielnej warstwie."
msgid "Show informational level."
-msgstr "Pokaż poziom informowania."
+msgstr "Poziom informacyjny."
msgid "Show the informational tests."
-msgstr "Pokaż testy informacyjne."
+msgstr "Wyświetla testy informacyjne."
msgid "Show informational level on upload."
-msgstr ""
+msgstr "Poziom informacyjny podczas wysyłania"
msgid "Show the informational tests in the upload check windows."
msgstr ""
@@ -13211,10 +13310,12 @@ msgstr "Nowa relacja"
msgid ""
"The preset <i>{0}</i> cannot be applied since nothing has been selected!"
msgstr ""
+"Szablon <i>{0}</i>nie może być dodany dopóki nic nie zostało zaznaczone!"
msgid ""
"The preset <i>{0}</i> cannot be applied since the selection is unsuitable!"
msgstr ""
+"Szablon <i>{0}</i>nie może być dodany dopóki zaznaczenie jest nieodpowiednie!"
msgid "Change {0} object"
msgid_plural "Change {0} objects"
@@ -13229,7 +13330,7 @@ msgid "Selection unsuitable!"
msgstr "Nieodpowiednie zaznaczenie."
msgid "Change Tags"
-msgstr "Zmień tagi"
+msgstr "Zmień znaczniki"
msgid "Add or remove toolbar button"
msgstr "Dodaj lub usuń przycisk z paska narzędzi"
@@ -13259,7 +13360,7 @@ msgid "Error parsing {0}: "
msgstr "Błąd przetwarzania {0}: "
msgid "Search preset"
-msgstr "Znajdź szablon"
+msgstr "Szukaj szablonu"
msgid "Show preset search dialog"
msgstr "Otwiera okno wyszukiwania szablonów"
@@ -13277,7 +13378,7 @@ msgid "Search for objects by preset"
msgstr "Szukaj obiekty według szablonu"
msgid "Show only applicable to selection"
-msgstr "Pokaż tylko odpowiednie do zaznaczenia"
+msgstr "Tylko odpowiednie do zaznaczenia"
msgid "Search in tags"
msgstr "Wyszukanie w znacznikach"
@@ -13555,6 +13656,8 @@ msgid ""
"Cannot create a changeset query including both the query parameters ''uid'' "
"and ''display_name''"
msgstr ""
+"Nie można utworzyć zapytania o zestaw zmian gdy zapytanie zawiera "
+"jednocześnie parametry ''uid'' i ''display_name''"
msgid "Unsupported parameter ''{0}'' in changeset query string"
msgstr ""
@@ -13692,7 +13795,7 @@ msgid "Parse error: invalid document structure for GPX document."
msgstr "Błąd parsowania: błędna struktura dokumentu gpx"
msgid "(at line {0}, column {1})"
-msgstr "(w linii {0}, kolumnie {1})"
+msgstr "(w wierszu {0}, kolumnie {1})"
msgid "Unknown mode {0}."
msgstr "Nieznany tryb {0}"
@@ -13704,7 +13807,7 @@ msgid "folder"
msgstr "katalog"
msgid "Looking for image files"
-msgstr "Szukam plików obrazu"
+msgstr "Wyszukiwanie plików obrazu"
msgid "No image files found."
msgstr "Nie znaleziono plików obrazu."
@@ -13998,7 +14101,7 @@ msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
msgstr ""
msgid "Deleted relation {0} contains members"
-msgstr "Usunięta relacja {0} zawiera członki"
+msgstr "Usunięta relacja {0} zawiera członków"
msgid "Missing attribute ''ref'' on member in relation {0}."
msgstr "Brakujący atrybut „ref'' na członku w relacji {0}."
@@ -14191,6 +14294,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Zapisz nazwę użytkownika i hasło (nieszyfrowane)"
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr "Obecne wartości"
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -14212,12 +14321,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Enter: Dodaj wszystkie tagi do wybranych obiektów"
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr "Obecne wartości"
-
msgid "Enable the checkbox to accept the value"
msgstr "Zaznacz pole wyboru, aby zaakceptować wartość"
@@ -14225,40 +14328,42 @@ msgid "Accept all tags from {0} for this session"
msgstr ""
msgid "Load data from API"
-msgstr "Wczytaj dane z API"
+msgstr "Wczytanie danych z API"
msgid "Import data from URL"
-msgstr "Importuj dane z URL"
+msgstr "Importowanie danych z adresu URL"
msgid "Open local files"
-msgstr "Otwórz lokalne pliki"
+msgstr "Otwieranie lokalnych plików"
msgid "Load imagery layers"
-msgstr "Pobierz warstwy obrazu"
+msgstr "Pobieranie warstw obrazu"
msgid "Change the selection"
-msgstr "Zmień zaznaczenie"
+msgstr "Zmienianie zaznaczenia"
msgid "Change the viewport"
-msgstr "Zmień widziany obszar"
+msgstr "Zmienianie widocznego obszaru"
msgid "Create new objects"
-msgstr "Utwórz nowe obiekty"
+msgstr "Tworzenie nowych obiektów"
msgid "Read protocol version"
-msgstr "Odczytaj wersję protokołu"
+msgstr "Czytanie wersji protokołu"
msgid "Cannot start IPv4 remotecontrol server on port {0}: {1}"
msgstr ""
+"Nie można uruchomić serwera IPv4 zdalnego sterowania na procie {0}: {1}"
msgid "Cannot start IPv6 remotecontrol server on port {0}: {1}"
msgstr ""
+"Nie można uruchomić serwera IPv6 zdalnego sterowania na procie {0}: {1}"
msgid "RemoteControl::Accepting remote connections on {0}:{1}"
-msgstr ""
+msgstr "RemoteControl::Połączenia zdalne akceptowane na {0}:{1}"
msgid "RemoteControl::Server {0}:{1} stopped."
-msgstr ""
+msgstr "RemoteControl::Serwer {0}:{1} zatrzymany."
msgid "Cannot start IPv4 remotecontrol https server on port {0}: {1}"
msgstr ""
@@ -14771,11 +14876,11 @@ msgid ""
"Do not ask again and remember my decision (go to Preferences->Plugins to "
"change it later)"
msgstr ""
-"Zapamiętaj wybór i nie pytaj ponownie (aby później zmienić wybór wybierz "
-"Opcje>Wtyczki)"
+"Zapamiętanie wyboru i nie pytanie ponownie (wybór można zmienić w "
+"Ustawienia>Wtyczki)"
msgid "Invalid jar file ''{0}''"
-msgstr "Błędny plik jar „{0}”"
+msgstr "Nieprawidłowy plik jar „{0}”"
msgid "The plugin file ''{0}'' does not include a Manifest."
msgstr "Plik wtyczki „{0}” nie zawiera pliku Manifest."
@@ -14875,6 +14980,8 @@ msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
msgstr ""
+"<html>Nie udało się zainicjować połączenia z serwerem OSM{0}.<br>Sprawdź "
+"adres URL serwera w ustawieniach i swoje połączenie z internetem."
msgid ""
"<html>Failed to authenticate at the OSM server ''{0}''.<br>You are using "
@@ -14892,7 +14999,17 @@ msgid_plural ""
"referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
"the node, and upload again."
msgstr[0] ""
+"<strong>Nie udało się</strong>usunąć <strong>węzła {0}</strong>. Nadal "
+"odwołuje się do węzła {1}.<br>Proszę pobrać węzeł ponownie, usunąć odwołanie "
+"do węzła i wysłać ponownie."
msgstr[1] ""
+"<strong>Nie udało się</strong>usunąć <strong>węzła {0}</strong>. Nadal "
+"odwołuje się do węzłów {1}.<br>Proszę pobrać węzeły ponownie, usunąć "
+"odwołanie do węzła i wysłać ponownie."
+msgstr[2] ""
+"<strong>Nie udało się</strong>usunąć <strong>węzła {0}</strong>. Nadal "
+"odwołuje się do węzłów {1}.<br>Proszę pobrać węzeły ponownie, usunąć "
+"odwołanie do węzła i wysłać ponownie."
msgid ""
"<strong>Failed</strong> to delete <strong>node {0}</strong>. It is still "
@@ -14903,7 +15020,17 @@ msgid_plural ""
"referred to by ways {1}.<br>Please load the ways, remove the reference to "
"the node, and upload again."
msgstr[0] ""
+"<strong>Nie udało się</strong>usunąć <strong>węzła {0}</strong>. Nadal "
+"odwołuje się do lini {1}.<br>Proszę pobrać linię ponownie, usunąć odwołanie "
+"do węzła i wysłać ponownie."
msgstr[1] ""
+"<strong>Nie udało się</strong>usunąć <strong>węzła {0}</strong>. Nadal "
+"odwołuje się do linii {1}.<br>Proszę pobrać linie ponownie, usunąć odwołanie "
+"do węzła i wysłać ponownie."
+msgstr[2] ""
+"<strong>Nie udało się</strong>usunąć <strong>węzła {0}</strong>. Nadal "
+"odwołuje się do linii {1}.<br>Proszę pobrać linie ponownie, usunąć odwołanie "
+"do węzła i wysłać ponownie."
msgid ""
"<strong>Failed</strong> to delete <strong>node {0}</strong>. It is still "
@@ -14914,7 +15041,17 @@ msgid_plural ""
"referred to by relations {1}.<br>Please load the relations, remove the "
"reference to the node, and upload again."
msgstr[0] ""
+"<strong>Nie udało się</strong>usunąć <strong>węzła {0}</strong>. Nadal "
+"odwołuje się do relacji {1}.<br>Proszę pobrać relację ponownie, usunąć "
+"odwołanie do węzła i wysłać ponownie."
msgstr[1] ""
+"<strong>Nie udało się</strong>usunąć <strong>węzła {0}</strong>. Nadal "
+"odwołuje się do relacji {1}.<br>Proszę pobrać relacje ponownie, usunąć "
+"odwołanie do węzła i wysłać ponownie."
+msgstr[2] ""
+"<strong>Nie udało się</strong>usunąć <strong>węzła {0}</strong>. Nadal "
+"odwołuje się do relacji {1}.<br>Proszę pobrać relacje ponownie, usunąć "
+"odwołanie do węzła i wysłać ponownie."
msgid ""
"<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -14925,7 +15062,17 @@ msgid_plural ""
"referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
"the way, and upload again."
msgstr[0] ""
+"<strong>Nie udało się</strong>usunąć <strong>linii {0}</strong>. Nadal "
+"odwołuje się do węzła {1}.<br>Proszę pobrać węzeł ponownie, usunąć odwołanie "
+"do linii i wysłać ponownie."
msgstr[1] ""
+"<strong>Nie udało się</strong>usunąć <strong>linii {0}</strong>. Nadal "
+"odwołuje się do węzłów {1}.<br>Proszę pobrać węzły ponownie, usunąć "
+"odwołanie do linii i wysłać ponownie."
+msgstr[2] ""
+"<strong>Nie udało się</strong>usunąć <strong>linii {0}</strong>. Nadal "
+"odwołuje się do węzłów {1}.<br>Proszę pobrać węzły ponownie, usunąć "
+"odwołanie do linii i wysłać ponownie."
msgid ""
"<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -14936,7 +15083,17 @@ msgid_plural ""
"referred to by ways {1}.<br>Please load the ways, remove the reference to "
"the way, and upload again."
msgstr[0] ""
+"<strong>Nie udało się</strong>usunąć <strong>linii {0}</strong>. Nadal "
+"odwołuje się do linii{1}.<br>Proszę pobrać linię ponownie, usunąć odwołanie "
+"do linii i wysłać ponownie."
msgstr[1] ""
+"<strong>Nie udało się</strong>usunąć <strong>linii {0}</strong>. Nadal "
+"odwołuje się do linii {1}.<br>Proszę pobrać linie ponownie, usunąć odwołanie "
+"do linii i wysłać ponownie."
+msgstr[2] ""
+"<strong>Nie udało się</strong>usunąć <strong>linii {0}</strong>. Nadal "
+"odwołuje się do linii {1}.<br>Proszę pobrać linie ponownie, usunąć odwołanie "
+"do linii i wysłać ponownie."
msgid ""
"<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -14947,7 +15104,17 @@ msgid_plural ""
"referred to by relations {1}.<br>Please load the relations, remove the "
"reference to the way, and upload again."
msgstr[0] ""
+"<strong>Nie udało się</strong>usunąć <strong>linii {0}</strong>. Nadal "
+"odwołuje się do relacji {1}.<br>Proszę pobrać relację ponownie, usunąć "
+"odwołanie do linii i wysłać ponownie."
msgstr[1] ""
+"<strong>Nie udało się</strong>usunąć <strong>linii {0}</strong>. Nadal "
+"odwołuje się do relacji {1}.<br>Proszę pobrać relacje ponownie, usunąć "
+"odwołanie do linii i wysłać ponownie."
+msgstr[2] ""
+"<strong>Nie udało się</strong>usunąć <strong>linii {0}</strong>. Nadal "
+"odwołuje się do relacji {1}.<br>Proszę pobrać relacje ponownie, usunąć "
+"odwołanie do linii i wysłać ponownie."
msgid ""
"<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -14958,7 +15125,17 @@ msgid_plural ""
"referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
"the relation, and upload again."
msgstr[0] ""
+"<strong>Nie udało się</strong>usunąć <strong>relacji {0}</strong>. Nadal "
+"odwołuje się do węzła {1}.<br>Proszę pobrać węzeł ponownie, usunąć odwołanie "
+"do relacji i wysłać ponownie."
msgstr[1] ""
+"<strong>Nie udało się</strong>usunąć <strong>relacji {0}</strong>. Nadal "
+"odwołuje się do węzłów {1}.<br>Proszę pobrać węzły ponownie, usunąć "
+"odwołanie do relacji i wysłać ponownie."
+msgstr[2] ""
+"<strong>Nie udało się</strong>usunąć <strong>relacji {0}</strong>. Nadal "
+"odwołuje się do węzłów {1}.<br>Proszę pobrać węzły ponownie, usunąć "
+"odwołanie do relacji i wysłać ponownie."
msgid ""
"<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -14969,7 +15146,17 @@ msgid_plural ""
"referred to by ways {1}.<br>Please load the ways, remove the reference to "
"the relation, and upload again."
msgstr[0] ""
+"<strong>Nie udało się</strong>usunąć <strong>relacji {0}</strong>. Nadal "
+"odwołuje się do linii {1}.<br>Proszę pobrać linię ponownie, usunąć odwołanie "
+"do relacji i wysłać ponownie."
msgstr[1] ""
+"<strong>Nie udało się</strong>usunąć <strong>relacji {0}</strong>. Nadal "
+"odwołuje się do linii {1}.<br>Proszę pobrać linie ponownie, usunąć odwołanie "
+"do relacji i wysłać ponownie."
+msgstr[2] ""
+"<strong>Nie udało się</strong>usunąć <strong>relacji {0}</strong>. Nadal "
+"odwołuje się do linii {1}.<br>Proszę pobrać linie ponownie, usunąć odwołanie "
+"do relacji i wysłać ponownie."
msgid ""
"<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -14980,7 +15167,17 @@ msgid_plural ""
"referred to by relations {1}.<br>Please load the relations, remove the "
"reference to the relation, and upload again."
msgstr[0] ""
+"<strong>Nie udało się</strong>usunąć <strong>relacji {0}</strong>. Nadal "
+"odwołuje się do relacji {1}.<br>Proszę pobrać relację ponownie, usunąć "
+"odwołanie do relacji i wysłać ponownie."
msgstr[1] ""
+"<strong>Nie udało się</strong>usunąć <strong>relacji {0}</strong>. Nadal "
+"odwołuje się do relacji {1}.<br>Proszę pobrać relacje ponownie, usunąć "
+"odwołanie do relacji i wysłać ponownie."
+msgstr[2] ""
+"<strong>Nie udało się</strong>usunąć <strong>relacji {0}</strong>. Nadal "
+"odwołuje się do relacji {1}.<br>Proszę pobrać relacje ponownie, usunąć "
+"odwołanie do relacji i wysłać ponownie."
msgid ""
"<html>Uploading to the server <strong>failed</strong> because your "
@@ -15105,8 +15302,8 @@ msgid ""
"large.<br>Either request a smaller area or use an export file provided by "
"the OSM community."
msgstr ""
-"Obszar, który próbowałeś pobrać lub same żądanie pobrania były zbyt "
-"duże.<br>Spróbuj pobrać mniejszy obszar albo użyj wyeksportowanego pliku "
+"Obszar, który próbowano pobrać lub żądanie pobrania było zbyt "
+"duże.<br>Proszę pobrać mniejszy obszar albo użyć wyeksportowanego pliku "
"udostępnionego przez społeczność OSM."
msgid ""
@@ -15189,6 +15386,8 @@ msgid ""
"Failed to open URL. There is currently no platform set. Please set a "
"platform first."
msgstr ""
+"Nie udało się otworzyć adresu URL. Nie ustalono platformy. Proszę najpierw "
+"ustalić platformę."
msgid "Opening URL: {0}"
msgstr "Otwieranie adresu URL: {0}"
@@ -15200,7 +15399,7 @@ msgid "reserved"
msgstr "zarezerwowane"
msgid "Outdated Java version"
-msgstr "Nieaktualna wersja Java"
+msgstr "Nieaktualna wersja Javy"
msgid "Update Java"
msgstr "Uaktualnij Javę"
@@ -15273,6 +15472,9 @@ msgstr "Dodawanie certyfikatu localhost JOSM-a do zasobnika kluczy {0}"
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "Odnaleziono {0} znacznik w buforze. To jest podejrzane!"
@@ -15352,7 +15554,7 @@ msgid "Ignoring malformed geometry: {0}"
msgstr ""
msgid "Failed to load XML schema."
-msgstr ""
+msgstr "Nie udało się wczytać schematu XML."
msgid "You have encountered a bug in JOSM"
msgstr "Napotkano błąd w JOSM"
@@ -15362,9 +15564,12 @@ msgid ""
"This is always a coding error. If you are running the latest version of "
"JOSM, please consider being kind and file a bug report."
msgstr ""
+"Wystąpił nieoczekiwany wyjątek.\n"
+"Zazwyczaj winą jest błąd programowania. Jeśli używana jest najnowsza wersja "
+"JOSM, proszę rozważyć zgłoszenie błędu."
msgid "Debug information"
-msgstr ""
+msgstr "Informacje diagnozowania błędów"
msgid "Manually report at:"
msgstr ""
@@ -15373,7 +15578,7 @@ msgid "Is JOSM up to date?"
msgstr ""
msgid "Send bug report"
-msgstr ""
+msgstr "Wyślij raport o błędach"
msgid ""
"If you are running the latest version of JOSM and the plugins, please file a "
@@ -15393,7 +15598,7 @@ msgid "Suppress further error dialogs for this session."
msgstr "Nie pokazuj więcej raportów z błędami dla tej sesji."
msgid "Ignore this error."
-msgstr ""
+msgstr "Ignoruj ten błąd."
msgid ""
"Opening the bug report failed. Please report manually using this website:"
@@ -15411,19 +15616,21 @@ msgid "Include all stack traces."
msgstr ""
msgid "Your current version of JOSM is {0}"
-msgstr ""
+msgstr "Twoja obecna wersja JOSM to {0}"
msgid "JOSM is searching for updates..."
-msgstr ""
+msgstr "JOSM szuka aktualizacji..."
msgid "An error occured while checking if your JOSM instance is up to date."
-msgstr ""
+msgstr "Wystąpił błąd podczas sprawdzania czy program jest aktualny."
msgid "JOSM is up to date."
-msgstr ""
+msgstr "JOSM jest aktualny."
msgid "JOSM is out of date. The current version is {0}. Try updating JOSM."
msgstr ""
+"JOSM jest nieaktualny. Aktualna wersja to {0}. Proszę spróbować uaktualnić "
+"program."
msgid ""
"Before you file a bug report make sure you have updated to the latest "
@@ -15755,64 +15962,70 @@ msgid "Saturation:"
msgstr "Nasycenie:"
msgid "Landsat"
-msgstr ""
+msgstr "Landsat"
msgid "Bing aerial imagery"
-msgstr ""
+msgstr "Bing - zdjęcia lotnicze"
msgid "HDM (Humanitarian OpenStreetMap Team)"
-msgstr ""
+msgstr "HDM (Humanitarian OpenStreetMap Team)"
msgid "Mapbox Satellite"
-msgstr ""
+msgstr "Mapbox - zdjęcia satelitarne"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
-msgid "OpenSeaMap"
+msgid "Thunderforest Landscape"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
-msgstr ""
+msgid "OpenSeaMap"
+msgstr "OpenSeaMap"
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr "OpenStreetMap (Czarno-biała warstwa poodstawowa)"
+
msgid "OpenStreetMap (Mapnik, no labels)"
-msgstr ""
+msgstr "OpenStreetMap (Mapnik, bez podpisów)"
msgid "OpenStreetMap (French Style)"
-msgstr ""
+msgstr "OpenStreetMap (styl francuski)"
msgid "OpenStreetMap (German Style)"
-msgstr ""
+msgstr "OpenStreetMap (styl niemiecki)"
msgid "OpenStreetMap GPS Traces"
-msgstr ""
+msgstr "OpenStreetMap - ślady GPS"
msgid "Public Transport (ÖPNV)"
-msgstr ""
+msgstr "Transport publiczny (ÖPNV)"
msgid "Hike & Bike"
-msgstr ""
+msgstr "Hike & Bike"
msgid "skobbler"
-msgstr ""
+msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
msgstr ""
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr "Kambodża, Laos, Tajlandia, Wietnam, Birma dwujęzyczne"
+
msgid "OpenPT Map (overlay)"
-msgstr ""
+msgstr "OpenPT Map (nakładka)"
msgid "Strava cycling heatmap"
-msgstr ""
+msgstr "Strava: rowerowa mapa cieplna"
msgid "Strava running heatmap"
-msgstr ""
+msgstr "Strava: biegowa mapa cieplna"
msgid "Strava cycling and running heatmap"
-msgstr ""
+msgstr "Strava: rowerowa i biegowa mapa cieplna"
msgid "Locator Overlay"
msgstr ""
@@ -15821,48 +16034,60 @@ msgid "QA No Address"
msgstr ""
msgid "Waymarked Trails: Hiking"
-msgstr ""
+msgstr "Waymarked Trails: Piesze wycieczki"
msgid "Waymarked Trails: Cycling"
-msgstr ""
+msgstr "Waymarked Trails: Kolarstwo"
msgid "Waymarked Trails: MTB"
-msgstr ""
+msgstr "Waymarked Trails: Kolarstwo górskie"
msgid "Waymarked Trails: Skating"
-msgstr ""
+msgstr "Waymarked Trails: Jazda na rolkach"
msgid "Waymarked Trails: Horse Riding"
-msgstr ""
+msgstr "Waymarked Trails: Jazda konna"
msgid "Waymarked Trails: Winter Sports"
-msgstr ""
+msgstr "Waymarked Trails: Sporty zimowe"
msgid "OSM Inspector: Geometry"
-msgstr ""
+msgstr "OSM Inspector: Geometria"
msgid "OSM Inspector: Tagging"
-msgstr ""
+msgstr "OSM Inspector: Znaczniki"
msgid "OSM Inspector: Places"
-msgstr ""
+msgstr "OSM Inspector: Miejsca"
msgid "OSM Inspector: Highways"
-msgstr ""
+msgstr "OSM Inspector: Drogi"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM Inspector: wielokąt złożony"
+msgid "OSM Inspector: Area"
+msgstr "OSM Inspector: Obszary"
msgid "OSM Inspector: Routing"
-msgstr ""
+msgstr "OSM Inspector: Trasy"
msgid "OSM Inspector: Addresses"
+msgstr "OSM Inspector: Adresy"
+
+msgid "OSM Inspector: Coastline (EU)"
+msgstr "OSM Inspector: Linia brzegowa (EU)"
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -15898,11 +16123,17 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr "basemap.at"
msgid "basemap.at Orthofoto"
-msgstr ""
+msgstr "basemap.at - ortofotomapy"
msgid "Geoimage.at MaxRes"
msgstr ""
@@ -15943,10 +16174,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
+msgstr ""
+
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -15956,16 +16193,16 @@ msgid "URBISnl numerical imagery (2013)"
msgstr ""
msgid "URBIS 2009 aerial imagery"
-msgstr ""
+msgstr "URBIS 2009 zdjęcia lotnicze"
msgid "URBIS 2012 aerial imagery"
-msgstr ""
+msgstr "URBIS 2012 zdjęcia lotnicze"
msgid "URBIS 2014 aerial imagery"
-msgstr ""
+msgstr "URBIS 2014 zdjęcia lotnicze"
msgid "URBIS 2015 aerial imagery"
-msgstr ""
+msgstr "URBIS 2015 zdjęcia lotnicze"
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
@@ -15982,7 +16219,16 @@ msgstr ""
msgid "TEC bus lines (2014)"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
msgstr ""
msgid "IBGE Mapa de Setores Urbanos"
@@ -15991,6 +16237,15 @@ msgstr ""
msgid "IBGE Mapa de Setores Rurais"
msgstr ""
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -16003,12 +16258,34 @@ msgstr ""
msgid "British Columbia Mosaic"
msgstr ""
+msgid "Latest southwest British Columbia Landsat"
+msgstr ""
+
msgid "Kelowna 2012"
msgstr ""
msgid "Kelowna Roads overlay"
msgstr ""
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr ""
+
msgid "Czech CUZK:KM"
msgstr ""
@@ -16040,11 +16317,17 @@ msgid "Geodatastyrelsen Skærmkort"
msgstr ""
msgid "Stevns (Denmark)"
-msgstr ""
+msgstr "Stevns (Dania)"
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -16061,7 +16344,7 @@ msgid "Estonia Forestry (Maaamet)"
msgstr ""
msgid "BANO"
-msgstr ""
+msgstr "BANO"
msgid "BD Carthage"
msgstr ""
@@ -16078,9 +16361,6 @@ msgstr "Kataster"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -16100,10 +16380,10 @@ msgid "Géolittoral - Sentiers"
msgstr ""
msgid "Lyon - Orthophoto 2012-03 10cm - EPSG:3946"
-msgstr ""
+msgstr "Lyon - ortofotomapa 2012-03 10cm - EPSG:3946"
msgid "Lyon - Orthophoto 2015-05 8cm - EPSG:3946"
-msgstr ""
+msgstr "Lyon - ortofotomapa 2015-05 8cm - EPSG:3946"
msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
@@ -16112,7 +16392,7 @@ msgid "SIG L-R - Languedoc-Roussillon 2012 - 20 cm"
msgstr ""
msgid "Route 500™©®"
-msgstr ""
+msgstr "Route 500™©®"
msgid "Toulouse - Orthophotoplan 2015"
msgstr ""
@@ -16137,14 +16417,11 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
-msgstr ""
+msgstr "Hamburg (40 cm)"
msgid "Hamburg (20 cm)"
-msgstr ""
+msgstr "Hamburg (20 cm)"
msgid "Hamburg (DK5)"
msgstr ""
@@ -16167,9 +16444,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16203,9 +16477,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -16242,19 +16561,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -16294,32 +16622,44 @@ msgid "OSMIE T.ie Land not in Counties"
msgstr ""
msgid "Lodi - Italy"
-msgstr ""
+msgstr "Lodi - Włochy"
msgid "Lombardia - Italy (CTR)"
-msgstr ""
+msgstr "Lombardia - Włochy (CTR)"
msgid "Lombardia - Italy (CTR DBT)"
-msgstr ""
+msgstr "Lombardia - Italy (CTR DBT)"
msgid "Sicily - Italy"
-msgstr ""
+msgstr "Sycylia - Włochy"
msgid "PCN 2006 - Italy"
-msgstr ""
+msgstr "PCN 2006 - Włochy"
msgid "PCN 2008 - IT Lazio+Umbria"
msgstr ""
msgid "PCN 2012 - Italy"
-msgstr ""
+msgstr "PCN 2012 - Włochy"
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -16333,10 +16673,10 @@ msgid "1.cikla ortofotokarte - Latvia"
msgstr ""
msgid "ORT10LT (Lithuania)"
-msgstr ""
+msgstr "ORT10LT (Litwa)"
msgid "geoportail.lu"
-msgstr ""
+msgstr "geoportail.lu"
msgid "Luxembourg Inspire Railway"
msgstr ""
@@ -16353,12 +16693,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -16369,7 +16731,7 @@ msgid "Geoportal 2: Ortofotomapa (aerial image) WMTS"
msgstr "Geoportal 2: Ortofotomapa (zdjęcia lotnicze) WMTS"
msgid "Geoportal 2: PRNG (geo names)"
-msgstr ""
+msgstr "Geoportal 2: PRNG (nazwy geograficzne)"
msgid "Geoportal 2: ISOK hillshade"
msgstr "Geoportal 2: Cieniowanie rzeźby terenu ISOK"
@@ -16378,7 +16740,7 @@ msgid "Będzin: Ortofotomapa 2013 (aerial image)"
msgstr "Będzin: Ortofotomapa 2013 (zdjęcia lotnicze)"
msgid "Będzin: Budynki (buildings)"
-msgstr "Będzin: Budynki"
+msgstr "Będzin: Budynki (budynki)"
msgid "Bytom: Ortofotomapa 2012 (aerial image)"
msgstr "Bytom: Ortofotomapa 2012 (zdjęcia lotnicze)"
@@ -16387,13 +16749,13 @@ msgid "Bytom: Fotoplan 2014 (aerial image)"
msgstr "Bytom: Fotoplan 2014 (zdjęcia lotnicze)"
msgid "Bytom: Budynki (buildings)"
-msgstr "Bytom: Budynki"
+msgstr "Bytom: Budynki (budynki)"
msgid "Chorzów: Budynki (buildings)"
-msgstr "Chorzów: Budynki"
+msgstr "Chorzów: Budynki (budynki)"
msgid "Częstochowa: Budynki (buildings)"
-msgstr ""
+msgstr "Częstochowa: Budynki (buildings)"
msgid "Częstochowa: Ortofotomapa 2011 (aerial image)"
msgstr "Częstochowa: Ortofotomapa 2011 (zdjęcia lotnicze)"
@@ -16408,52 +16770,52 @@ msgid "Gliwice: Ortofotomapa 2013 (aerial image)"
msgstr "Gliwice: Ortofotomapa 2013 (zdjęcia lotnicze)"
msgid "Gliwice: Budynki (buildings)"
-msgstr "Gliwice: Budynki"
+msgstr "Gliwice: Budynki (budynki)"
msgid "Katowice: Ortofotomapa (aerial image)"
msgstr "Katowice: Ortofotomapa (zdjęcia lotnicze)"
msgid "Katowice: Budynki (buildings)"
-msgstr ""
+msgstr "Katowice: Budynki (budynki)"
msgid "Łódź: Budynki (buildings)"
-msgstr ""
+msgstr "Łódź: Budynki (budynki)"
msgid "Łódź: Ortofotomapa (aerial image)"
msgstr "Łódź: Ortofotomapa (zdjęcia lotnicze)"
msgid "Powiat dębicki: Budynki (buildings)"
-msgstr ""
+msgstr "Powiat dębicki: Budynki (budynki)"
msgid "Powiat lubaczowski: Budynki (buildings)"
-msgstr ""
+msgstr "Powiat lubaczowski: Budynki (budynki)"
msgid "Powiat łańcucki: Budynki (buildings)"
-msgstr ""
+msgstr "Powiat łańcucki: Budynki (budynki)"
msgid "Powiat poznański: Budynki (buildings)"
-msgstr ""
+msgstr "Powiat poznański: Budynki (budynki)"
msgid "Powiat poznański: Ortofotomapa (Aerial image)"
msgstr "Powiat poznański: Ortofotomapa (zdjęcia lotnicze)"
msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
-msgstr ""
+msgstr "Powiat ropczycko-sędziszowski: Budynki (budynki)"
msgid "Powiat rzeszowski: Budynki (buildings)"
-msgstr ""
+msgstr "Powiat rzeszowski: Budynki (budynki)"
msgid "Powiat rzeszowski: Ortofotomapa (Aerial image)"
msgstr "Powiat rzeszowski: Ortofotomapa (zdjęcia lotnicze)"
msgid "Powiat stalowowolski: Budynki (buildings)"
-msgstr ""
+msgstr "Powiat stalowowolski: Budynki (budynki)"
msgid "Poznań: Ortofotomapa 2014 (aerial image)"
msgstr "Poznań: Ortofotomapa 2014 (zdjęcia lotnicze)"
msgid "Przemyśl: Budynki (buildings)"
-msgstr ""
+msgstr "Przemyśl: Budynki (budynki)"
msgid "Przemyśl: Ortofotomapa (aerial image)"
msgstr "Przemyśl: Ortofotomapa (zdjęcia lotnicze)"
@@ -16465,13 +16827,13 @@ msgid "Rzeszów: Ortofotomapa (aerial image)"
msgstr "Rzeszów: Ortofotomapa (zdjęcia lotnicze)"
msgid "Rzeszów: Budynki (buildings)"
-msgstr "Rzeszów: Budynki"
+msgstr "Rzeszów: Budynki (budynki)"
msgid "Siemianowice Śląskie: Ortofotomapa (aerial image)"
msgstr "Siemianowice Śląskie: Ortofotomapa (zdjęcia lotnicze)"
msgid "Siemianowice Śląskie: Budynki (buildings)"
-msgstr ""
+msgstr "Siemianowice Śląskie: Budynki (budynki)"
msgid "Świętochłowice: Ortofotomapa 2008 (aerial image)"
msgstr "Świętochłowice: Ortofotomapa 2008 (zdjęcia lotnicze)"
@@ -16485,9 +16847,6 @@ msgstr "Świętochłowice: Ortofotomapa 2012 (zdjęcia lotnicze)"
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Zabrze: Ortofotomapa 2011 (zdjęcia lotnicze)"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Szlaki"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr "Wrocław: Ortofotomapa 2015 (zdjęcia lotnicze)"
@@ -16497,6 +16856,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -16518,12 +16891,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -16540,11 +16931,14 @@ msgid "ITACyL - Castile and León"
msgstr ""
msgid "IDEIB - Balearic Islands"
-msgstr ""
+msgstr "IDEIB - Baleary"
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -16587,6 +16981,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -16608,6 +17005,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -16623,6 +17026,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -16650,9 +17056,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -16674,9 +17125,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -16686,9 +17134,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -17000,7 +17445,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr "Twórz siatki linii."
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -17013,7 +17458,7 @@ msgid ""
msgstr ""
msgid "Download your GPX tracks from openstreetmap.org"
-msgstr "Ściąga z openstreetmap.org twoje ślady GPX."
+msgstr "Pobiera ślady GPX z openstreetmap.org."
msgid ""
"This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -17093,6 +17538,9 @@ msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
"Wygeneruj granice XML dla warstwy obrazu na podstawie wielokąta złożonego."
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -17460,10 +17908,10 @@ msgid "concrete:lanes"
msgstr "beton (ślady)"
msgid "paving_stones"
-msgstr "kostka"
+msgstr "kostka brukowa (cementowa)"
msgid "sett"
-msgstr "kostka brukowa"
+msgstr "kostka brukowa (kamienna)"
msgid "cobblestone"
msgstr "bruk kamienny"
@@ -17505,52 +17953,61 @@ msgid "Smoothness"
msgstr "Jakość nawierzchni"
msgid "excellent"
-msgstr ""
+msgstr "doskonała"
msgid "Thin Rollers: rollerblade, skateboard"
-msgstr ""
+msgstr "Koła o małym przekroju: rolki, deskorolka i wszystko ponizej"
msgid "good"
-msgstr ""
+msgstr "dobra"
msgid "Thin Wheels: racing bike"
-msgstr ""
+msgstr "Małe koła: rowery wyścigowe i wszystko poniżej"
msgid "intermediate"
-msgstr ""
+msgstr "przeciętna"
msgid "Wheels: city bike, wheelchair, scooter"
msgstr ""
+"Koła: rowery miejskie, samochody sportowe, wózek inwalidzkie, skutery i "
+"wszystkie poniżej"
msgid "bad"
-msgstr ""
+msgstr "zła"
msgid "Robust Wheels: trekking bike, car, rickshaw"
msgstr ""
+"Solidne koła: rowery górskie, normalne samochody, ryksze i wszystko poniżej"
msgid "very_bad"
-msgstr ""
+msgstr "bardzo zła"
msgid "High Clearance: light duty off-road vehicle"
msgstr ""
+"Wysoki prześwit: samochody z wysokim prześwitem, lekkie, nie uprawnione do "
+"jazdy po drogach i wszystko poniżej"
msgid "horrible"
-msgstr ""
+msgstr "okropna"
msgid "Off-Road: heavy duty off-road vehicle"
msgstr ""
+"Koła pojazdów off road: ciężkie, nie uprawnione do jazdy po drogach i "
+"wszystko poniżej"
msgid "very_horrible"
-msgstr ""
+msgstr "bardzo okropna"
msgid "Specialized off-road: tractor, ATV"
msgstr ""
+"Typowe dla pojazdów off road: ciągniki, ATV, rowery górskie i wszelkiego "
+"rodzaju pojazdów poza drogami"
msgid "impassable"
-msgstr ""
+msgstr "nie do przebycia"
msgid "No wheeled vehicle"
-msgstr ""
+msgstr "Żadne pojazdy kołowe"
msgctxt "riding"
msgid "horse_riding"
@@ -17669,11 +18126,11 @@ msgstr ""
msgctxt "electrified"
msgid "no"
-msgstr ""
+msgstr "nie"
msgctxt "electrified"
msgid "yes"
-msgstr ""
+msgstr "tak"
msgctxt "electrified"
msgid "rail"
@@ -18418,19 +18875,19 @@ msgid "Water access rules:"
msgstr "Dostęp dla żeglugi:"
msgid "Ship"
-msgstr "Statki"
+msgstr "Statek"
msgid "designated"
msgstr "dla wyznaczonych pojazdów"
msgid "Boat"
-msgstr "Łodzie"
+msgstr "Łódź"
msgid "Motorboat"
-msgstr "Motorówki"
+msgstr "Motorówka"
msgid "Canoe"
-msgstr "Kajaki"
+msgstr "Kajak"
msgid "Substance"
msgstr "Substancja"
@@ -18784,6 +19241,8 @@ msgid ""
"Some road types already imply some access restrictions which should not be "
"set again."
msgstr ""
+"Niektóre rodzaje dróg determinują już pewne ograniczenia, które nie powinny "
+"być ponownie ustalane."
msgid "No exit (cul-de-sac)"
msgstr "Ślepa ulica"
@@ -18851,15 +19310,15 @@ msgstr "tak"
msgctxt "overtaking"
msgid "both"
-msgstr ""
+msgstr "obie strony"
msgctxt "overtaking"
msgid "forward"
-msgstr ""
+msgstr "naprzód"
msgctxt "overtaking"
msgid "backward"
-msgstr ""
+msgstr "wstecz"
msgctxt "overtaking"
msgid "no"
@@ -19117,10 +19576,10 @@ msgid "Escalator"
msgstr "Schody ruchome"
msgid "forward"
-msgstr ""
+msgstr "naprzód"
msgid "backward"
-msgstr ""
+msgstr "wstecz"
msgid "reversible"
msgstr ""
@@ -19511,6 +19970,9 @@ msgstr "Strumień"
msgid "River"
msgstr "Rzeka"
+msgid "Lock"
+msgstr "Zamykana"
+
msgid "Canal"
msgstr "Kanał"
@@ -20097,7 +20559,7 @@ msgid "With shop"
msgstr "Ze sklepem"
msgid "convenience"
-msgstr "sklep ogólnospożywczy"
+msgstr "sklep osiedlowy"
msgid "kiosk"
msgstr "kiosk"
@@ -20213,9 +20675,6 @@ msgstr "Używane"
msgid "only"
msgstr "tylko"
-msgid "Repair"
-msgstr "Warsztat naprawczy"
-
msgid "Parts"
msgstr "Części zamienne"
@@ -20559,6 +21018,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr "Pokoje gościnne/pensjonat"
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Chata górska"
@@ -20625,8 +21090,14 @@ msgstr "Ogródek"
msgid "Takeaway"
msgstr "Na wynos"
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
-msgstr "Fast food"
+msgstr "Bar szybkie obsługi"
msgid "Food Court"
msgstr "Przestrzeń restauracyjna"
@@ -20843,7 +21314,7 @@ msgid "Picnic Table"
msgstr "Stół piknikowy"
msgid "Public Grill"
-msgstr "Publiczny grill"
+msgstr "Publiczny gril"
msgctxt "grill"
msgid "Fuel"
@@ -21568,31 +22039,19 @@ msgstr "do obserwacji przyrody"
msgid "Hunting Stand"
msgstr "Ambona myśliwska"
-msgid "Height"
-msgstr "Wysokość"
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr "Zamaskowana"
-msgid "Lock"
-msgstr "Zamykana"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr "Punkt pobierania wody"
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr "Kompresor"
@@ -22184,6 +22643,10 @@ msgid "hut"
msgstr "chata"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr "internat/akademik"
@@ -22289,7 +22752,7 @@ msgstr ""
msgctxt "content"
msgid "sewage"
-msgstr ""
+msgstr "ścieki"
msgctxt "content"
msgid "silage"
@@ -22301,11 +22764,11 @@ msgstr ""
msgctxt "content"
msgid "water"
-msgstr ""
+msgstr "woda"
msgctxt "content"
msgid "wine"
-msgstr ""
+msgstr "wino"
msgid "Bunker Silo"
msgstr "Silos bunkrowy"
@@ -22574,7 +23037,7 @@ msgid "cantilever"
msgstr ""
msgid "covered"
-msgstr ""
+msgstr "zadaszony"
msgid "low_water_crossing"
msgstr ""
@@ -22589,7 +23052,7 @@ msgid "Structure"
msgstr "Typ konstrukcji"
msgid "arch"
-msgstr ""
+msgstr "łukowy"
msgid "beam"
msgstr ""
@@ -22601,7 +23064,7 @@ msgid "floating"
msgstr ""
msgid "suspension"
-msgstr ""
+msgstr "wiszący"
msgid "cable-stayed"
msgstr ""
@@ -22619,16 +23082,16 @@ msgid "bascule"
msgstr ""
msgid "drawbridge"
-msgstr ""
+msgstr "zwodzony"
msgid "lift"
-msgstr ""
+msgstr "podnoszony"
msgid "submersible"
msgstr ""
msgid "swing"
-msgstr ""
+msgstr "obracany"
msgid "transporter"
msgstr ""
@@ -22665,21 +23128,21 @@ msgid "Bunker"
msgstr "Bunkier"
msgid "pillbox"
-msgstr ""
+msgstr "bunkier obronny"
msgid "munitions"
-msgstr ""
+msgstr "schron na amunicję"
msgid "hardened_aircraft_shelter"
-msgstr ""
+msgstr "wzmocniony hangar do przechowywania i chronienia samolotów"
msgctxt "bunker"
msgid "underground"
-msgstr ""
+msgstr "podziemny"
msgctxt "bunker"
msgid "overground"
-msgstr ""
+msgstr "naziemny"
msgid "Historic"
msgstr "Historyczny"
@@ -22728,7 +23191,7 @@ msgstr "Metoda"
msgctxt "generator method"
msgid "anaerobic_digestion"
-msgstr ""
+msgstr "fermentacja beztlenowa"
msgctxt "generator method"
msgid "combustion"
@@ -22742,7 +23205,7 @@ msgid "bioreactor"
msgstr "bioreaktor"
msgid "anaerobic_digestion / combustion"
-msgstr ""
+msgstr "fermentacja beztlenowa / spalanie"
msgid "pyrolysis"
msgstr "piroliza"
@@ -22776,59 +23239,59 @@ msgstr "Reaktor atomowy"
msgctxt "generator method"
msgid "fission"
-msgstr ""
+msgstr "rozszczepienie"
msgctxt "generator method"
msgid "fusion"
-msgstr ""
+msgstr "fuzja"
msgid "Boiling Water Reactor 1 (BWR-1)"
-msgstr ""
+msgstr "Wrzący reaktor wodny 1 (BWR-1)"
msgid "fission"
-msgstr ""
+msgstr "rozszczepieniowy"
msgid "Boiling Water Reactor 2 (BWR-2)"
-msgstr ""
+msgstr "Wrzący reaktor wodny 2 (BWR-2)"
msgid "Boiling Water Reactor 3 (BWR-3)"
-msgstr ""
+msgstr "Wrzący reaktor wodny 3 (BWR-3)"
msgid "Boiling Water Reactor 4 (BWR-4)"
-msgstr ""
+msgstr "Wrzący reaktor wodny 4 (BWR-4)"
msgid "Boiling Water Reactor 5 (BWR-5)"
-msgstr ""
+msgstr "Wrzący reaktor wodny 5 (BWR-5)"
msgid "Boiling Water Reactor 6 (BWR-6)"
-msgstr ""
+msgstr "Wrzący reaktor wodny 6 (BWR-6)"
msgid "CANada Deuterium Uranium reactor (CANDU)"
-msgstr ""
+msgstr "Ciężkowodny reaktor jądrowy (CANDU)"
msgid "cold-fusion"
-msgstr ""
+msgstr "zimna fuzja"
msgid "fusion"
-msgstr ""
+msgstr "fuzja"
msgid "China Pressurized Reactor (CPR-1000)"
-msgstr ""
+msgstr "Chiński reaktor ciśnieniowy (CPR-1000)"
msgid "European Pressurized Reactor (EPR)"
-msgstr ""
+msgstr "Europejski Reaktor Ciśnieniowy (EPR)"
msgid "Inertial Confinement Fusion (ICF)"
-msgstr ""
+msgstr "Imercyjna synteza zamknięta (ICF)"
msgid "Pressurized water reactor (PWR)"
-msgstr ""
+msgstr "Reaktor Wodny Ciśnieniowy (PWR)"
msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
-msgstr ""
+msgstr "Reaktor Kanałowy Dużej Mocy 1000 (RBMK-1000)"
msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
-msgstr ""
+msgstr "Reaktor Kanałowy Dużej Mocy 1500 (RBMK-1500)"
msgid "stellarator"
msgstr ""
@@ -22837,7 +23300,7 @@ msgid "tokamak"
msgstr ""
msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
-msgstr ""
+msgstr "Wodno-Wodny Reaktor Energetyczny (VVER)"
msgid "Solar Power Generator"
msgstr "Elektrownia słoneczna"
@@ -22900,13 +23363,13 @@ msgid "run-of-the-river"
msgstr ""
msgid "kaplan_turbine"
-msgstr ""
+msgstr "turbina Kaplana"
msgid "run-of-the-river / water-storage"
msgstr ""
msgid "pelton_turbine"
-msgstr ""
+msgstr "turbina Peltona"
msgid "Tidal Water Turbine"
msgstr "Elektrownia pływowa"
@@ -23465,7 +23928,7 @@ msgid "Supermarket"
msgstr "Supermarket"
msgid "Convenience Store"
-msgstr "Sklep ogólnospożywczy"
+msgstr "Sklep osiedlowy"
msgid "Kiosk"
msgstr "Kiosk"
@@ -23479,6 +23942,9 @@ msgstr "Sklep mięsny"
msgid "Seafood"
msgstr "Sklep rybny"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Delikatesy"
@@ -23738,10 +24204,10 @@ msgid "Vending products"
msgstr "Sprzedawane produkty"
msgid "admission_tickets"
-msgstr ""
+msgstr "bilet wstępu"
msgid "animal_feed"
-msgstr ""
+msgstr "karma dla zwierząt"
msgid "bicycle_tube"
msgstr "dętki do roweru"
@@ -23765,7 +24231,7 @@ msgid "food"
msgstr "jedzenie"
msgid "milk"
-msgstr ""
+msgstr "mleko"
msgid "newspapers"
msgstr "gazety"
@@ -24015,7 +24481,7 @@ msgid "Shoemaker"
msgstr "Usługi szewskie"
msgid "Photographer"
-msgstr "Wykonywanie zdjęć, wideofilmowanie"
+msgstr "Studio fotograficzne"
msgid "Metal construction"
msgstr "Usługi metalurgiczne"
@@ -24293,9 +24759,6 @@ msgstr "Rząd drzew"
msgid "A line of trees."
msgstr "Rząd drzew"
-msgid "Wood"
-msgstr "Drzewa/las pierwotny"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -25264,13 +25727,13 @@ msgid ""
msgstr ""
msgid "Same value of {0} and {1}"
-msgstr ""
+msgstr "Taka sama wartość {0} i {1}"
msgid "{0} without {1}"
msgstr "{0} bez {1}"
msgid "missing tag"
-msgstr ""
+msgstr "brakujący znacznik"
msgid "{0} without {1} or {2}"
msgstr "{0} bez {1} lub {2}"
@@ -25279,43 +25742,43 @@ msgid "{0} without {1}, {2} or {3}"
msgstr "{0} bez {1}, {2} lub {3}"
msgid "{0} together with {1}"
-msgstr ""
+msgstr "{0} razem z {1}"
msgid "suspicious tag combination"
-msgstr ""
+msgstr "Podejrzane połączenie znaczników"
msgid "two objects, one with {0} and one with {1} + {2} + {3}"
msgstr ""
msgid "incomplete object: only {0}"
-msgstr ""
+msgstr "niekompletny obiekt: tylko {0}"
msgid "incomplete object: only {0} and {1}"
-msgstr ""
+msgstr "niekompletny obiekt: tylko {0} i {1}"
msgid "{0} together with addr:*"
-msgstr ""
+msgstr "{0} razem z addr:*"
msgid "{0} together with {1} and conflicting values"
-msgstr ""
+msgstr "{0} razem z {1} są sprzecznymi wartościami"
msgid "{0} on suspicious object"
-msgstr ""
+msgstr "{0} na podejrzanych obiektach"
msgid "natural water used for swimming pool"
-msgstr ""
+msgstr "naturalny zbiornik wodny użyty do oznaczenia basenu"
msgid "sport without physical feature"
-msgstr ""
+msgstr "sport bez tagów opisujących miejsce"
msgid "alternative name without {0}"
-msgstr ""
+msgstr "alternatywna nazwa bez {0}"
msgid "incomplete usage of {0} on a way without {1}"
msgstr ""
msgid "Same value of {0}, {1} and {2}"
-msgstr ""
+msgstr "Ta sama wartość klucza {0}, {1} i {2}"
msgid "{0} and {1} together with {2} and conflicting values"
msgstr ""
@@ -25336,22 +25799,27 @@ msgid ""
msgstr ""
msgid "{0} together with {1} and {2}. Remove {1} and {2}"
-msgstr ""
+msgstr "{0} razem z {1} i {2}. Usuń {1} i {2}"
msgid "Different number of lanes in the keys {0} and {1}"
-msgstr ""
+msgstr "Różna liczba linii w kluczach {0} i {1}"
msgid "possibly missing {0} tag"
+msgstr "przypuszczalnie brakujący znacznik {0}"
+
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
msgstr ""
msgid "{0} is deprecated"
msgstr "{0} jest przestarzały"
msgid "deprecated tagging"
-msgstr ""
+msgstr "przestarzałe znaczniki"
msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
msgstr ""
+"„{0}” jest niejednoznaczny, proszę użyć bardziej konkretnych znaczników, np. "
+"„{1}”"
msgid ""
"''{0}'' does not specify the official mode of transportation, use ''{1}'' "
@@ -25388,10 +25856,10 @@ msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
msgstr ""
msgid "{0} should be replaced with {1}"
-msgstr ""
+msgstr "{0} powinno być zastąpione przez {1}"
msgid "{0} = {1}; remove {0}"
-msgstr ""
+msgstr "{0} = {1}; usuń {0}"
msgid ""
"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
@@ -25399,23 +25867,25 @@ msgid ""
msgstr ""
msgid "Unspecific tag {0}"
-msgstr ""
+msgstr "Nieokreślony znacznik {0}"
msgid "Definition of {0} is unclear"
-msgstr ""
+msgstr "Definicja {0} jest niejasna"
msgid "{0} + {1} + {2}"
-msgstr ""
+msgstr "{0} + {1} + {2}"
msgid ""
"{0} is not recommended. Use the Reverse Ways function from the Tools menu."
msgstr ""
+"Odradza się stosowania znacznika {0}. Proszę użyć polecenia „Odwróć kierunek "
+"linii” z menu „Narzędzia”."
msgid "{0}"
-msgstr ""
+msgstr "{0}"
msgid "key with uncommon character"
-msgstr ""
+msgstr "klucz z nietypowym znakiem"
msgid "uncommon short key"
msgstr ""
@@ -25433,8 +25903,14 @@ msgid "questionable key (ending with a number)"
msgstr ""
msgid "The key {0} has an uncommon value."
+msgstr "Klucz {0} ma nietypową wartość."
+
+msgid "misspelled value"
msgstr ""
+msgid "wrong value: {0}"
+msgstr "niewłaściwa wartość: {0}"
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -25457,13 +25933,13 @@ msgid "{0} on a node"
msgstr ""
msgid "Building inside building"
-msgstr "Budynek wewnątrz budynku."
+msgstr "Budynek wewnątrz budynku"
msgid "Overlapping Water Areas"
msgstr "Nakładające się obszary wodne"
msgid "Overlapping Areas"
-msgstr "Nakładające się obszary."
+msgstr "Nakładające się obszary"
msgid "{0} inside {1}"
msgstr "{0} wewnątrz {1}"
@@ -25484,7 +25960,7 @@ msgid "{0} node connected to a highway"
msgstr ""
msgid "suspicious roundabout direction"
-msgstr ""
+msgstr "Podejrzany kierunek ronda"
msgid "{0} on a large area"
msgstr ""
@@ -25493,7 +25969,7 @@ msgid "{0} on a small area"
msgstr ""
msgid "Too large building"
-msgstr ""
+msgstr "Zbyt duży budynek"
msgid ""
"Node connects a power line or cable with an object which is not related to "
@@ -25511,11 +25987,16 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
msgid "wrong highway tag on a node"
-msgstr ""
+msgstr "niewłaściwy znacznik drogi na węźle"
msgid "wrong crossing tag on a way"
msgstr ""
@@ -25535,6 +26016,9 @@ msgstr "{0} użyte z {1}"
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25573,7 +26057,7 @@ msgid ""
msgstr ""
msgid "unusual {0} format"
-msgstr ""
+msgstr "Niespotykany format {0}"
msgid ""
"{0}: kilometers is default; period is separator; if units, put space then "
@@ -25584,13 +26068,13 @@ msgid "voltage should be in volts with no units/delimiter/spaces"
msgstr ""
msgid "unusual {0} specification"
-msgstr ""
+msgstr "Niespotykana specyfikacja {0}"
msgid "unusual train track gauge; use mm with no separator"
msgstr ""
msgid "unusual incline; use percentages/degrees or up/down"
-msgstr ""
+msgstr "Niespotykane nachylenie; użyj procentów/stopni lub do góry/w dół"
msgid "{0} must be a numeric value"
msgstr ""
@@ -25599,7 +26083,7 @@ msgid "{0} must be a positive integer number"
msgstr ""
msgid "unusual value of {0}"
-msgstr ""
+msgstr "Niespotykana wartość {0}"
msgid "relation without type"
msgstr ""
@@ -25702,19 +26186,22 @@ msgstr "Polecenia"
msgid ""
"No command has been found. Would you like to download and install default "
"commands now?"
-msgstr ""
+msgstr "Nie odnaleziono poleceń. Pobrać i zainstalować domyślne polecenia?"
msgid "No command found"
msgstr "Nie znaleziono poleceń"
msgid "Default commands have been successfully installed"
-msgstr ""
+msgstr "Zainstalowano domyślne polecenia"
msgid ""
"Failed to download and install default commands.\n"
"\n"
"Error: {0}"
msgstr ""
+"Nie udało się pobrać i zainstalować domyślnych poleceń.\n"
+"\n"
+"Błąd: {0}"
msgid "Processing..."
msgstr "Przetwarzanie..."
@@ -25723,7 +26210,7 @@ msgid "Aborted"
msgstr "Anulowano"
msgid "Error executing the script: "
-msgstr "Bład podczas wykonywania skryptu: "
+msgstr "Błąd wykonywania skryptu: "
msgid "Command line"
msgstr "Wiersz poleceń"
@@ -25881,10 +26368,10 @@ msgid "Importing..."
msgstr "Importowanie..."
msgid "DXF files [ImportDxf plugin] (*.dxf)"
-msgstr ""
+msgstr "Pliki DXF [wtyczka ImportDxf] (*.dxf)"
msgid "Please open or create data layer before importing"
-msgstr ""
+msgstr "Proszę otworzyć lub utworzyć warstwę danych przed importowaniem"
msgid "Import dxf"
msgstr ""
@@ -25899,10 +26386,10 @@ msgid "m"
msgstr "m"
msgid "Shows elevation profile"
-msgstr "Pokazuje profil wysokości"
+msgstr "Wyświetla profil wysokości"
msgid "Elevation Profile"
-msgstr "Profil Wysokości"
+msgstr "Profil wysokości"
msgid "Elevation Grid Layer (experimental!)"
msgstr ""
@@ -25992,7 +26479,7 @@ msgid "Draw closed polygons only"
msgstr "Rysuj tylko zamknięte wielokąty"
msgid "FastDraw configuration"
-msgstr ""
+msgstr "Ustawienia FastDraw"
msgid "Try copying tags from properties table"
msgstr ""
@@ -26021,7 +26508,7 @@ msgid "Please move the mouse to draw new way"
msgstr ""
msgid "Are you sure you do not want to save the line containing {0} points?"
-msgstr ""
+msgstr "Zapisać linię zawierającą {0} punktów?"
msgid ""
"{0} m - length of the line\n"
@@ -26034,7 +26521,7 @@ msgid "Line information"
msgstr ""
msgid "Cannot place node outside of the world."
-msgstr "Nie można wstawiać punktów poza światem"
+msgstr "Nie można wstawiać węzłów poza światem."
msgid "Draw the way by mouse"
msgstr ""
@@ -26184,10 +26671,10 @@ msgid "Guessing address values"
msgstr "Zgaduje wartości adresu"
msgid "Removes address related tags from the object."
-msgstr "Usuwa tagi adresu z obiektu."
+msgstr "Usuwa znaczniki adresu z obiektu."
msgid "Remove address tags"
-msgstr "Usuń tagi adresu"
+msgstr "Usuń znaczniki adresu"
msgid "Marks selected addresses in the map"
msgstr "Zaznacza wybrane adresy na mapie"
@@ -26319,6 +26806,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -26361,8 +26858,8 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
-msgstr ""
+msgid "Submitting changeset to server…"
+msgstr "Wysyłanie zestawu zmian na serwer…"
msgid "Export all images"
msgstr ""
@@ -26600,7 +27097,7 @@ msgid "Login successful, return to JOSM."
msgstr ""
msgid "Supported image formats (JPG and PNG)"
-msgstr ""
+msgstr "Obsługiwane formaty obrazów (JPG i PNG)"
msgid "Downloading Mapillary images"
msgstr ""
@@ -27111,7 +27608,7 @@ msgid "Errr..."
msgstr ""
msgid "Browser not supported."
-msgstr "Przeglądarka nie jest wspierana."
+msgstr "Przeglądarka nie jest obsługiwana."
msgid "Building address"
msgstr "Adres budynku"
@@ -27164,6 +27661,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -27205,8 +27705,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27291,7 +27791,7 @@ msgid "Buildings tags:"
msgstr "Znaczniki budynków:"
msgid "Cannot place building outside of the world."
-msgstr "Nie można wstawiać budynków poza światem"
+msgstr "Nie można umieścić budynków poza światem."
msgid "Create building"
msgstr "Utwórz budynek"
@@ -27574,7 +28074,7 @@ msgid "Image filter interpolation:"
msgstr ""
msgid "Nearest-Neighbor (fastest) [ Default ]"
-msgstr ""
+msgstr "Najbliższego Sąsiada (najszybsza) [Domyślna]"
msgid "Bilinear (fast)"
msgstr "Bilinear (szybki)"
@@ -27798,7 +28298,7 @@ msgid "Improve georeferencing (only raster images)"
msgstr ""
msgid "Reset cookie"
-msgstr "Resetuj ciasteczka"
+msgstr "Wyczyść ciasteczka"
msgid "Get a new cookie (session timeout)"
msgstr ""
@@ -28813,6 +29313,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr "Warstwa kalibracji"
@@ -29049,7 +29608,7 @@ msgid "Import vector graphics"
msgstr "Importuje grafikę wektorową"
msgid "SVG files [ImportVec plugin] (*.svg)"
-msgstr ""
+msgstr "Pliki SVG [wtyczka ImportVec] (*.svg)"
msgid "Concourse wizard ..."
msgstr ""
@@ -29562,7 +30121,7 @@ msgid "Open the measurement window."
msgstr "Otwiera okno z wynikami pomiarów."
msgid "Reset current measurement results and delete measurement path."
-msgstr "Resetuje bieżące wyniki pomiarów i kasuje ścieżki pomiarowe."
+msgstr "Zeruje bieżące wyniki pomiarów i usuwa ścieżki pomiarowe."
msgid "Path Length"
msgstr "Długość ścieżki"
@@ -29926,7 +30485,7 @@ msgid "Overpass API server:"
msgstr "Serwer Overpass API:"
msgid "Overpass API server used to download OSM data"
-msgstr ""
+msgstr "Serwer Overpass API używany do pobierania danych OSM"
msgid "XAPI server:"
msgstr "Serwer XAPI:"
@@ -29934,6 +30493,8 @@ msgstr "Serwer XAPI:"
msgid ""
"XAPI server used to download OSM data when Overpass API is not available"
msgstr ""
+"Serwer XAPI używany do pobierania danych OSM, gdy Overpass API jest nie "
+"dostępne"
msgid "Download modules"
msgstr "Pobierz moduły"
@@ -30077,7 +30638,7 @@ msgid "An error occurred in module {0}"
msgstr ""
msgid "Last module update more than {0} days ago."
-msgstr "Ostatnia aktualizacja modułu więcej niż {0} dni temu."
+msgstr "Ostatnia aktualizacja modułu odbyła się przed {0} dniami."
msgid "Click to update the activated modules"
msgstr "Kliknij aby zaktualizować wybrane moduły"
@@ -30823,7 +31384,7 @@ msgid "Add new address point"
msgstr ""
msgid "Tags copied to clipboard."
-msgstr ""
+msgstr "Skopiowano znaczniki do schowka."
msgid "New address point added."
msgstr ""
@@ -30862,16 +31423,16 @@ msgid "Print..."
msgstr "Drukuj..."
msgid "Print the map"
-msgstr "Drukuj mapę"
+msgstr "Drukuje mapę"
msgid "Print the Map"
-msgstr "Drukuj mapę"
+msgstr "Drukowanie mapy"
msgid "Printer"
msgstr "Drukarka"
msgid "Media"
-msgstr ""
+msgstr "Nośnik"
msgid "Orientation"
msgstr "Orientacja"
@@ -30880,34 +31441,34 @@ msgid "Printer settings"
msgstr "Ustawienia drukarki"
msgid "Scale"
-msgstr "Skaluj"
+msgstr "Skala"
msgid "Resolution"
msgstr "Rozdzielczość"
msgid "Map information"
-msgstr ""
+msgstr "Informacje o mapie"
msgid "Map Preview"
msgstr "Podgląd mapy"
msgid "Zoom To Page"
-msgstr ""
+msgstr "Przybliż do strony"
msgid "Zoom To Actual Size"
-msgstr ""
+msgstr "Przybliż do rzeczywistego rozmiaru"
msgid "Print"
msgstr "Wydrukuj"
msgid "Printing has been cancelled."
-msgstr "Drukowanie zostało anulowane."
+msgstr "Anulowano drukowanie."
msgid "Printing stopped"
msgstr "Zatrzymano drukowanie"
msgid "Printing has failed."
-msgstr "Drukowanie nie powiodło się."
+msgstr "Nie udało się wydrukować."
msgid "Add stop position"
msgstr "Dodaj miejsce zatrzymywania"
@@ -30922,7 +31483,7 @@ msgid "Remember my choice and do not ask me again in this session"
msgstr ""
msgid "PT_Assistant Fetch Request"
-msgstr ""
+msgstr "PT_Assistant - żądanie pobierania"
msgid ""
"Route relations have incomplete members.\n"
@@ -30992,9 +31553,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -31152,9 +31710,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr ""
@@ -31212,6 +31767,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -31311,7 +31869,7 @@ msgid "Filters"
msgstr "Filtry"
msgid "Choose Filter"
-msgstr "Wybierz filtr"
+msgstr "Wybiera filtr"
msgid "JSlider initialization error. Make sure your meta-inf is correct."
msgstr ""
@@ -31409,9 +31967,6 @@ msgstr "Odbuduj wielokąt"
msgid "Multipolygon must consist only of ways"
msgstr "Wielokąt złożony może zawierać tylko linie"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Odbuduj wielokąt na podstawie relacji {0}"
@@ -31526,7 +32081,7 @@ msgid "Confirm"
msgstr "Potwierdź"
msgid "Fetching missing primitives"
-msgstr ""
+msgstr "Pobieranie brakujących podstawowoych elementów"
msgid "Downloading changeset"
msgstr "Pobieranie zestawu zmian"
@@ -31831,7 +32386,7 @@ msgid "Input angle here"
msgstr ""
msgid "Rotate"
-msgstr ""
+msgstr "Obróć"
msgid "Align building "
msgstr ""
@@ -31993,7 +32548,7 @@ msgid "Could not read surveyor definition: {0}"
msgstr ""
msgid "Error parsing {0}: {1}"
-msgstr ""
+msgstr "Błąd przetwarzania {0}: {1}"
msgid "Surveyor waypoint layer"
msgstr ""
@@ -32019,31 +32574,31 @@ msgid ""
msgstr ""
msgid "Edit tags"
-msgstr "Edytuj tagi"
+msgstr "Edytuj znaczniki"
msgid "Launches the tag editor dialog"
-msgstr ""
+msgstr "Wyświetla okno edytora znaczników"
msgid "JOSM Tag Editor Plugin"
-msgstr ""
+msgstr "Wtyczka edycji znaczników"
msgid "Abort tag editing and close dialog"
-msgstr ""
+msgstr "Anuluje edycje znaczników i zamyka okno"
msgid "Apply edited tags and close dialog"
-msgstr ""
+msgstr "Wprowadza zmienione znaczniki i zamyka okno"
msgid "Highlight"
-msgstr ""
+msgstr "Wyróżnij"
msgid "Group"
-msgstr "Grupowanie"
+msgstr "Grupa"
msgid "Item"
-msgstr ""
+msgstr "Element"
msgid "unexpected column number {0}"
-msgstr ""
+msgstr "nieoczekiwany numer kolumny {0}"
msgid "Tagging Preset Tester"
msgstr "Tester szablonów"
@@ -32365,7 +32920,7 @@ msgid "Points per circle:"
msgstr ""
msgid "Tag:"
-msgstr "Tag:"
+msgstr "Znacznik:"
msgid "Preferred values:"
msgstr "Wartości preferowane"
@@ -32774,13 +33329,13 @@ msgid "Selects the offending relation."
msgstr ""
msgid "Add turn"
-msgstr "Dodaj skręt"
+msgstr "Dodaj zakręt"
msgid "Delete lane."
msgstr "Usuń pas"
msgid "Delete turn."
-msgstr "Usuń skręt"
+msgstr "Usuń zakręt"
msgid "{0} lanes are not referenced in any turn-relation."
msgstr ""
@@ -32888,16 +33443,16 @@ msgstr[2] ""
"ograniczenia skrętu. Powinny być one naprawione najpierw."
msgid "Do you want to save anyway?"
-msgstr "Czy mimo to chcesz to zapisać?"
+msgstr "Zapisać mimo to?"
msgid "Yes, save anyway"
-msgstr "Tak, zapisz mimo wszystko"
+msgstr "Zapisz"
msgid "Save the turn restriction despite of errors and/or warnings"
msgstr "Zapisz ograniczenia skrętu pomimo błędów lub/i ostrzeżeń"
msgid "No, resolve issues first"
-msgstr "Nie, najpierw napraw usterki"
+msgstr "Nie zapisuj"
msgid "Cancel saving and start resolving pending issues first"
msgstr "Anuluj zapis i rozpocznij naprawę znalezionych usterek"
@@ -33626,7 +34181,7 @@ msgid "Duplicate tags from the first"
msgstr ""
msgid "Set tags for multiple objects"
-msgstr ""
+msgstr "Dodaj tagi dla wielu obiektów"
msgid "Delete from history"
msgstr "Usuń z historii"
@@ -34020,24 +34575,25 @@ msgstr ""
"punktu."
msgid "Fetch Wikidata IDs"
-msgstr ""
+msgstr "Pobierz Wikdata ID"
msgid "Fetch Wikidata IDs using the ''wikipedia'' tag"
-msgstr ""
+msgstr "Pobierz Wikdata ID używając \"wikidata\" tag"
msgid "Fetching Wikidata IDs"
-msgstr ""
+msgstr "Pobieranie Wikdata ID''s"
msgid "Add Wikidata"
-msgstr ""
+msgstr "Dodaj Wikidata"
msgid "No Wikidata ID found for: {0}"
-msgstr ""
+msgstr "Nie znaleziono Wikidata ID dla: {0}"
msgid "Fetching {0} Wikidata ID for language ''{1}''"
msgid_plural "Fetching {0} Wikidata IDs for language ''{1}''"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Pobieranie {0} Wikidata ID dla języka „{1}”"
+msgstr[1] "Pobieranie {0} Wikidata ID dla języka „{1}”"
+msgstr[2] "Pobieranie {0} Wikidata ID dla języka „{1}”"
msgid "Add Wikidata for language ''{0}''"
msgstr ""
@@ -34063,19 +34619,19 @@ msgstr[0] ""
msgstr[1] ""
msgid "Search Wikidata items"
-msgstr ""
+msgstr "Wyszukaj obiekty Wikidata"
msgid "Target key: "
msgstr ""
msgid "Search Wikipedia category"
-msgstr ""
+msgstr "Szukaj kategorii w Wikipedii"
msgid "Load category"
-msgstr ""
+msgstr "Załaduj kategorię"
msgid "Fetch Wikipedia articles with coordinates"
-msgstr "Połącz artykuły z Wikipedi ze współrzędnymi"
+msgstr "Pobierz artykuły z Wikipedii ze współrzędnymi"
msgid ""
"Double click on item to search for object with article name (and center "
@@ -34098,7 +34654,7 @@ msgid "Wikidata"
msgstr "Wikidata"
msgid "Fetches all coordinates from Wikidata in the current view"
-msgstr ""
+msgstr "Pobieranie wszystkich współrzędnych z Wikidata w bieżącym widoku"
msgid "Fetches all coordinates from Wikipedia in the current view"
msgstr "Pobiera wszystkie współrzędne z Wikipedii dla aktualnego widoku"
@@ -34136,7 +34692,7 @@ msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
msgstr ""
-"Dodaje tag „wikipedia” powiązany z tym artykułem do zaznaczonych obiektów"
+"Dodaje tag „wikidata” powiązany z tym artykułem do zaznaczonych obiektów"
msgid "The Ultimate WMS Super-speed Turbo Challenge II"
msgstr "The Ultimate WMS Super-speed Turbo Challenge II"
diff --git a/i18n/po/pt.po b/i18n/po/pt.po
index be30051..9371adc 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
"PO-Revision-Date: 2016-09-10 17:36+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: 2016-11-07 05:03+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:08+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: pt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr "A construir o menu inicial"
msgid "Help"
msgstr "Ajuda"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "A inicializar a API do OpenStreetMap"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "A inicializar o mecanismo de validação"
@@ -212,6 +218,12 @@ msgstr ""
"Seleciona no mapa os elementos selecionados na lista acima, desselecionando "
"os restantes."
+msgid "Select WMS layers"
+msgstr "Selecione as camadas WMS"
+
+msgid "Add layers"
+msgstr "Adicionar camadas"
+
msgid "Add imagery layer {0}"
msgstr "Adicionar camada de imagem de fundo {0}"
@@ -233,12 +245,6 @@ msgstr "Erro"
msgid "Select image format for WMS layer"
msgstr "Selecione o formato de imagem para a camada WMS"
-msgid "Select WMS layers"
-msgstr "Selecione as camadas WMS"
-
-msgid "Add layers"
-msgstr "Adicionar camadas"
-
msgid "Add Node..."
msgstr "Adicionar Nó Pelas Coordenadas..."
@@ -764,6 +770,9 @@ msgstr "Ir para a Posição"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Abre uma janela que permite ir a determinada localização"
+msgid "Jump to Position"
+msgstr "Ir para a Posição"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Introduza a Latitude/longitude da localização."
@@ -785,9 +794,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Ir"
-msgid "Jump to Position"
-msgstr "Ir para a Posição"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Não foi possível processar a Latitude, Longitude ou Enquadramento (zoom). "
@@ -845,6 +851,9 @@ msgstr "Fundir camadas"
msgid "Merge the current layer into another layer"
msgstr "Fundir a camada atual com outra camada"
+msgid "{0} completed in {1}"
+msgstr "{0} completado em {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Fundir camadas com políticas de envio diferentes"
@@ -1018,12 +1027,24 @@ msgstr[1] "A abrir {0} ficheiros..."
msgid "Opening file ''{0}'' ..."
msgstr "A abrir o ficheiro ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr "Que tarefas a fazer?"
+
+msgid "Ok"
+msgstr "Ok"
+
msgid "Open Location..."
msgstr "Abrir URL..."
msgid "Open an URL."
msgstr "Abrir uma URL."
+msgid "Enter URL to download:"
+msgstr "Introduza o URL a descarregar:"
+
+msgid "Enter an URL from where data should be downloaded"
+msgstr "Introduza o endereço web de onde os dados devem ser descarregados"
+
msgid "Separate Layer"
msgstr "Camada separada"
@@ -1031,12 +1052,6 @@ msgid "Select if the data should be downloaded into a new layer"
msgstr ""
"Selecione se prefere que os dados sejam descarregados numa nova camada"
-msgid "Enter URL to download:"
-msgstr "Introduza o URL a descarregar:"
-
-msgid "Enter an URL from where data should be downloaded"
-msgstr "Introduza o endereço web de onde os dados devem ser descarregados"
-
msgid "Download Location"
msgstr "Localização do Descarregamento"
@@ -1052,12 +1067,6 @@ msgstr "Fechar janela e cancelar o descarregamento"
msgid "Download Data"
msgstr "Descarregar Dados"
-msgid "Which tasks to perform?"
-msgstr "Que tarefas a fazer?"
-
-msgid "Ok"
-msgstr "Ok"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1949,9 +1958,6 @@ msgstr "Pedir e descarregar conjuntos de alterações ..."
msgid "Errors during download"
msgstr "Erros ao descarregar"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr "Descarregar dados GPS"
@@ -4358,9 +4364,6 @@ msgstr "A linha de área não está fechada"
msgid "No outer way for multipolygon"
msgstr "Multi-polígono sem linha exterior definida na relação"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "Função de ''{0}'' devia ser ''{1}''"
-
msgid "No area style for multipolygon"
msgstr "Falta etiqueta na relação do multi-polígono a defini-lo"
@@ -4396,12 +4399,27 @@ msgstr "Etiqueta de área na linha de contorno deve estar na relação"
msgid "Multipolygon is not closed"
msgstr "O multi-polígono não está fechado"
-msgid "Multipolygon inner way is outside"
-msgstr "Linha interior de multi-polígono está como linha exterior"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "Linhas de multi-polígonos que se cruzam"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "Função de ''{0}'' devia ser ''{1}''"
+
+msgid "Multipolygon inner way is outside"
+msgstr "Linha interior de multi-polígono está como linha exterior"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "Nenhuma função útil no membro do multi-polígono"
@@ -5144,12 +5162,18 @@ msgstr "Impedir o acesso as seguintes recursos(s), separados por vírgula"
msgid "options provided as Java system properties"
msgstr "opções fornecidas como propriedades de sistema Java"
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/CAMINHO/PARA/PREFERENCIAS/JOSM "
msgid "Set the preferences directory"
msgstr "Definir a pasta das preferências"
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/CAMINHO/PARA/DADOSUTILIZADOR/JOSM"
@@ -5166,11 +5190,9 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/CAMINHO/PARA/PASTA/PRINCIPAL/JOSM "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Mudar todas as 3 pastas para a pasta principal do JOSM. A pasta da cache "
-"será pasta_principal/cache"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5522,9 +5544,6 @@ msgstr "Clique para fazer a tarefa em segundo plano"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} completado em {1}"
-
msgid "Enlarge"
msgstr "Aumentar"
@@ -5670,86 +5689,6 @@ msgstr "Conflito em segundo plano: remover membro"
msgid "Conflict foreground: remove member"
msgstr "Conflito em primeiro plano: remover membro"
-msgid "My with Their"
-msgstr "Minha versão com a o servidor"
-
-msgid "My with Merged"
-msgstr "Minha versão com a de fusão"
-
-msgid "Their with Merged"
-msgstr "Versão do servidor com a da fusão"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "A função {0} não está a participar no par de comparação {1}."
-
-msgid "Properties"
-msgstr "Propriedades"
-
-msgid "Tags"
-msgstr "Etiquetas"
-
-msgid "Nodes"
-msgstr "Nós"
-
-msgid "Members"
-msgstr "Membros"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Sem conflitos pendentes a resolver em etiquetas"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Etiquetas ({0} conflito)"
-msgstr[1] "Etiquetas ({0} conflitos)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} conflito pendente a resolver em etiquetas"
-msgstr[1] "{0} conflitos pendentes a resolver em etiquetas"
-
-msgid "Nodes(resolved)"
-msgstr "Nós (resolvidos)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Lista de nós fundidos congelada. Não há conflitos pendentes na lista de nós "
-"desta linha"
-
-msgid "Nodes(with conflicts)"
-msgstr "Nós (com conflitos)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Conflitos pendentes na lista de nós desta linha"
-
-msgid "Members(resolved)"
-msgstr "Membros (resolvidos)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Lista de nós fundidos congelada. Não há conflitos pendentes na lista de "
-"membros desta relação"
-
-msgid "Members(with conflicts)"
-msgstr "Membros (com conflitos)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Conflitos pendentes na lista de membros desta relação"
-
-msgid "No pending property conflicts"
-msgstr "Sem conflitos pendentes de propriedades"
-
-msgid "Properties(with conflicts)"
-msgstr "Propriedades (com conflitos)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Conflitos pendentes de propriedades por resolver"
-
-msgid "Conflict Resolution"
-msgstr "Resolução de Conflitos"
-
msgid "{0} more..."
msgstr "{0} restantes..."
@@ -5931,6 +5870,86 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Versão no servidor ({0} entrada)"
msgstr[1] "Versão no servidor ({0} entradas)"
+msgid "My with Their"
+msgstr "Minha versão com a o servidor"
+
+msgid "My with Merged"
+msgstr "Minha versão com a de fusão"
+
+msgid "Their with Merged"
+msgstr "Versão do servidor com a da fusão"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "A função {0} não está a participar no par de comparação {1}."
+
+msgid "Properties"
+msgstr "Propriedades"
+
+msgid "Tags"
+msgstr "Etiquetas"
+
+msgid "Nodes"
+msgstr "Nós"
+
+msgid "Members"
+msgstr "Membros"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Sem conflitos pendentes a resolver em etiquetas"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Etiquetas ({0} conflito)"
+msgstr[1] "Etiquetas ({0} conflitos)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} conflito pendente a resolver em etiquetas"
+msgstr[1] "{0} conflitos pendentes a resolver em etiquetas"
+
+msgid "Nodes(resolved)"
+msgstr "Nós (resolvidos)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Lista de nós fundidos congelada. Não há conflitos pendentes na lista de nós "
+"desta linha"
+
+msgid "Nodes(with conflicts)"
+msgstr "Nós (com conflitos)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Conflitos pendentes na lista de nós desta linha"
+
+msgid "Members(resolved)"
+msgstr "Membros (resolvidos)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Lista de nós fundidos congelada. Não há conflitos pendentes na lista de "
+"membros desta relação"
+
+msgid "Members(with conflicts)"
+msgstr "Membros (com conflitos)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Conflitos pendentes na lista de membros desta relação"
+
+msgid "No pending property conflicts"
+msgstr "Sem conflitos pendentes de propriedades"
+
+msgid "Properties(with conflicts)"
+msgstr "Propriedades (com conflitos)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Conflitos pendentes de propriedades por resolver"
+
+msgid "Conflict Resolution"
+msgstr "Resolução de Conflitos"
+
msgid "Node"
msgstr "Nó"
@@ -5994,10 +6013,8 @@ msgstr "Função"
msgid "Primitive"
msgstr "Objeto"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"nós combinados não congelados ainda. Não é possível construir comando de "
-"resolução"
msgid "<undefined>"
msgstr "<nenhum>"
@@ -7517,114 +7534,13 @@ msgstr ""
msgid ""
"Select changesets based on the date/time they have been created or closed"
msgstr ""
-"Selecionar conjuntos de alterações com base na data e hora em que eles foram "
-"criados ou fechados"
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr ""
-"Selecionar apenas os conjuntos de alterações relacionados com uma caixa de "
-"limites específica"
-
-msgid "Query open changesets only"
-msgstr "Obter apenas conjuntos de alterações abertos"
-
-msgid "Query closed changesets only"
-msgstr "Obter apenas conjuntos de alterações fechados"
-
-msgid "Query both open and closed changesets"
-msgstr "Obter conjuntos de alterações abertos e fechados"
-
-msgid "Only changesets owned by myself"
-msgstr "Apenas conjuntos de alterações da minha autoria"
-
-msgid "User ID:"
-msgstr "Identificador de utilizador:"
-
-msgid "User name:"
-msgstr "Nome de utilizador:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
-"Apenas conjuntos de alterações da autoria do seguinte utilizador com o "
-"identificador"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-"Apenas conjuntos de alterações da autoria do seguinte nome de utilizador"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Apenas conjuntos de alterações da minha autoria (desativado. O JOSM está "
-"configurado com utilizador anónimo)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Não é possível restringir o pedido ao conjunto de alterações do utilizador "
-"atual porque está como anónimo"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "O valor ''{0}'' do identificador de utilizador não é válido"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"Não é possível restringir o pedido do conjunto de alterações no nome de "
-"utilizador ''{0}''"
-
-msgid "Please enter a valid user ID"
-msgstr "Por favor introduza um identificador de utilizador válido"
-
-msgid "Invalid user ID"
-msgstr "O identificador de utilizador é inválido"
-
-msgid "Please enter a non-empty user name"
-msgstr "Por favor introduza um nome de utilizador"
-
-msgid "Invalid user name"
-msgstr "O nome de utilizador é inválido"
-
-msgid "Date: "
-msgstr "Data: "
-
-msgid "Time:"
-msgstr "Hora:"
-
-msgid "Closed after - "
-msgstr "Fechado após - "
-
-msgid "Date:"
-msgstr "Data:"
-
-msgid "Created before - "
-msgstr "Criado antes de - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Apenas conjuntos de alterações fechados após a seguinte data e hora"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-"Apenas conjuntos de alterações fechados após e criados antes de uma data e "
-"hora específicos"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"Não foi possível criar um pedido de conjuntos de alterações com restrições "
-"de hora porque os valores introduzidos não são válidos."
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr ""
-"<html>Por favor introduza os valores de hora/data válidos para "
-"restringir<br>o pedido a um intervalo de tempo.</html>"
+"Selecionar conjuntos de alterações com base na data e hora em que eles foram "
+"criados ou fechados"
-msgid "Invalid date/time values"
-msgstr "Valores de data/hora inválidos"
+msgid "Select only changesets related to a specific bounding box"
+msgstr ""
+"Selecionar apenas os conjuntos de alterações relacionados com uma caixa de "
+"limites específica"
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
@@ -7644,29 +7560,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Caixa de limites não válida"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"O identificador de utilizador não é válido. Por favor introduza um número "
-"inteiro > 0"
-
-msgid "Please enter an integer value > 0"
-msgstr "Por favor introduza um número inteiro > 0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Por favor, introduza a data no formato utilizado na sua zona.<br>Exemplo: "
-"{0}<br>Exemplo: {1}<br>Exemplo: {2}<br>Exemplo: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Por favor, introduza uma data válida no formato utilizado na sua "
-"zona.<br>Exemplo: {0}<br>Exemplo: {1}<br>Exemplo: {2}<br>Exemplo: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Descarregar apenas os meus conjuntos de alterações"
@@ -7764,6 +7657,78 @@ msgstr "Endereço web de pedido de conjuntos de alterações incorreto"
msgid "Close the dialog and abort querying of changesets"
msgstr "Fechar a janela e abortar o pedido de conjuntos de alterações"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Por favor, introduza a data no formato utilizado na sua zona.<br>Exemplo: "
+"{0}<br>Exemplo: {1}<br>Exemplo: {2}<br>Exemplo: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Obter apenas conjuntos de alterações abertos"
+
+msgid "Query closed changesets only"
+msgstr "Obter apenas conjuntos de alterações fechados"
+
+msgid "Query both open and closed changesets"
+msgstr "Obter conjuntos de alterações abertos e fechados"
+
+msgid "Date: "
+msgstr "Data: "
+
+msgid "Time:"
+msgstr "Hora:"
+
+msgid "Closed after - "
+msgstr "Fechado após - "
+
+msgid "Date:"
+msgstr "Data:"
+
+msgid "Created before - "
+msgstr "Criado antes de - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Apenas conjuntos de alterações fechados após a seguinte data e hora"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+"Apenas conjuntos de alterações fechados após e criados antes de uma data e "
+"hora específicos"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Não foi possível criar um pedido de conjuntos de alterações com restrições "
+"de hora porque os valores introduzidos não são válidos."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Por favor introduza os valores de hora/data válidos para "
+"restringir<br>o pedido a um intervalo de tempo.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Valores de data/hora inválidos"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Por favor, introduza uma data válida no formato utilizado na sua "
+"zona.<br>Exemplo: {0}<br>Exemplo: {1}<br>Exemplo: {2}<br>Exemplo: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"O identificador de utilizador não é válido. Por favor introduza um número "
+"inteiro > 0"
+
+msgid "Please enter an integer value > 0"
+msgstr "Por favor introduza um número inteiro > 0"
+
msgid "URL: "
msgstr "URL: "
@@ -7786,6 +7751,58 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Este endereço web do pedido de conjunto de alterações não é válido"
+msgid "Only changesets owned by myself"
+msgstr "Apenas conjuntos de alterações da minha autoria"
+
+msgid "User ID:"
+msgstr "Identificador de utilizador:"
+
+msgid "User name:"
+msgstr "Nome de utilizador:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr ""
+"Apenas conjuntos de alterações da autoria do seguinte utilizador com o "
+"identificador"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+"Apenas conjuntos de alterações da autoria do seguinte nome de utilizador"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Apenas conjuntos de alterações da minha autoria (desativado. O JOSM está "
+"configurado com utilizador anónimo)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Não é possível restringir o pedido ao conjunto de alterações do utilizador "
+"atual porque está como anónimo"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "O valor ''{0}'' do identificador de utilizador não é válido"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"Não é possível restringir o pedido do conjunto de alterações no nome de "
+"utilizador ''{0}''"
+
+msgid "Please enter a valid user ID"
+msgstr "Por favor introduza um identificador de utilizador válido"
+
+msgid "Invalid user ID"
+msgstr "O identificador de utilizador é inválido"
+
+msgid "Please enter a non-empty user name"
+msgstr "Por favor introduza um nome de utilizador"
+
+msgid "Invalid user name"
+msgstr "O nome de utilizador é inválido"
+
msgid "Activate"
msgstr "Ativar"
@@ -9002,6 +9019,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10673,6 +10693,9 @@ msgstr "Sentido do trânsito"
msgid "Velocity, {0}"
msgstr "Velocidade, {0}"
+msgid "Wave Audio files (*.wav)"
+msgstr "Ficheiros de Áudio Wave (*.wav)"
+
msgid "Import Audio"
msgstr "Importar Áudio"
@@ -10688,9 +10711,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Não é possível importar"
-msgid "Wave Audio files (*.wav)"
-msgstr "Ficheiros de Áudio Wave (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Marcadores Áudio de {0}"
@@ -10799,16 +10819,6 @@ msgstr "(o URL era: "
msgid "Select the map painting styles"
msgstr "Selecione os estilos de visualização do mapa"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-"Ocorreu um erro ao carregar os estilos de visualização do mapa ''{0}''. Erro "
-"encontrado: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr "a carregar estilo ''{0}''..."
@@ -10827,6 +10837,11 @@ msgstr[1] ""
"\"info\" no menu que aparece ao clicar com o botão direito do rato sobre o "
"estilo."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+"Ocorreu um erro ao carregar os estilos de visualização do mapa ''{0}''. Erro "
+"encontrado: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
"Ocorreu um erro ao processar os estilos de visualização do mapa ''{0}''. "
@@ -11979,6 +11994,9 @@ msgstr ""
msgid "Track date"
msgstr "Data do trilho"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Uma Cor (Pode ser personalizado no painel de camadas)"
@@ -11991,6 +12009,18 @@ msgstr "Bicicleta"
msgid "Foot"
msgstr "A pé"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Bosque"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Criar marcadores ao ler ficheiros GPX"
@@ -12003,6 +12033,9 @@ msgstr "Intervalo de cores dinâmico baseado no limite de dados"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Melhorar visualização de trilhos GPS (antialiasing)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -12074,6 +12107,11 @@ msgid ""
msgstr "Aplicar antialiasing nas linhas GPX para melhorar a imagem."
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -12096,10 +12134,17 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "Colorir pontos e segmentos de trilhos conforme a marca de tempo."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
"Permite ajustar a coloração dos trilhos para velocidades médias diferentes."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Cores dos Pontos e Trilhos GPS"
@@ -13437,6 +13482,12 @@ msgstr "Verifica se existem erros em objetos com etiquetas sobre religião"
msgid "Checks for errors on relations"
msgstr "Verifica se existem errros em relações"
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr "Etiquetas desnecessárias"
@@ -14606,6 +14657,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Gravar nome de utilizador e palavra-passe (sem encriptação)"
+msgid "Assume"
+msgstr "Aceitar"
+
+msgid "Existing values"
+msgstr "Valores existentes"
+
msgid "<delete from {0} objects>"
msgstr "<eliminar de {0} objetos>"
@@ -14627,12 +14684,6 @@ msgstr "Adicionar etiquetas selecionadas aos objetos selecionados"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "SHIFT+ENTER: Adicionar todas as etiquetas aos objetos selecionados"
-msgid "Assume"
-msgstr "Aceitar"
-
-msgid "Existing values"
-msgstr "Valores existentes"
-
msgid "Enable the checkbox to accept the value"
msgstr "Ative a caixa de seleção para aceitar o valor"
@@ -15828,6 +15879,9 @@ msgstr ""
"Conflito silencioso de atalho de teclado: ''{0}'' alterado de ''{1}'' para "
"''{2}''."
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -16353,14 +16407,17 @@ msgstr "Satélite Mapbox"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr "OpenSeaMap"
-msgid "OpenStreetMap Carto (Standard layer)"
-msgstr "OpenStreetMap Carto (camada padrão)"
+msgid "OpenStreetMap Carto (Standard)"
+msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik Preto e Branco)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, sem etiquetas)"
@@ -16383,8 +16440,11 @@ msgstr "Hike & Bike"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Camboja, Laos, Tailândia Vietname bilingue"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPublicTtransport Map (sobreposição)"
@@ -16434,8 +16494,8 @@ msgstr "OSM Inspector: Locais"
msgid "OSM Inspector: Highways"
msgstr "OSM Inspector: Vias"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM Inspector: Multi-polígonos"
+msgid "OSM Inspector: Area"
+msgstr ""
msgid "OSM Inspector: Routing"
msgstr "OSM Inspector: Rotas"
@@ -16443,11 +16503,23 @@ msgstr "OSM Inspector: Rotas"
msgid "OSM Inspector: Addresses"
msgstr "OSM Inspector: Endereços"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM Inspector: Fronteiras (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
-msgid "IGN Argentina (WMTS)"
-msgstr "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
+msgstr ""
msgid "IGN Argentina (WMS)"
msgstr "IGN Argentina (WMS)"
@@ -16482,6 +16554,12 @@ msgstr "LPI NSW Fronteiras Administrativas - Floresta Estadual"
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr "LPI NSW Fronteiras Administrativas - Subúrbio - Reserva NPWS"
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -16527,11 +16605,17 @@ msgstr "VoGIS: Flächenwidmungsplan"
msgid "VoGIS: Höhen und Gelände"
msgstr "VoGIS: Höhen und Gelände"
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
-msgstr "AGIV imagens aéreas 10cm 2013-15"
+msgid "AGIV Flanders GRB"
+msgstr ""
msgid "URBISfr numerical imagery (2013)"
msgstr "URBISfr imagens numéricas (2013)"
@@ -16566,7 +16650,16 @@ msgstr "SPW(allonie) 2009-2010 imagens aéreas"
msgid "TEC bus lines (2014)"
msgstr "TEC linhas de autocarros (2014)"
-msgid "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
msgstr ""
msgid "IBGE Mapa de Setores Urbanos"
@@ -16575,6 +16668,15 @@ msgstr "IBGE Mapa de Setores Urbanos (Brasil)"
msgid "IBGE Mapa de Setores Rurais"
msgstr "IBGE Mapa de Setores Rurais (Brasil)"
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Geobase - Hidrografia"
@@ -16587,12 +16689,34 @@ msgstr "Canvec (Canadá)"
msgid "British Columbia Mosaic"
msgstr "British Columbia Mosaic"
+msgid "Latest southwest British Columbia Landsat"
+msgstr ""
+
msgid "Kelowna 2012"
msgstr "Kelowna (Canadá) 2012"
msgid "Kelowna Roads overlay"
msgstr "Kelowna (Canadá) Estradas sobrepostas"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr ""
+
msgid "Czech CUZK:KM"
msgstr "Checoslováquia - CUZK:KM"
@@ -16629,6 +16753,12 @@ msgstr "Stevns (Dinamarca)"
msgid "Vejmidte (Denmark)"
msgstr "Vejmidte (Dinamarca)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Estónia - Mapa Base (Maaamet)"
@@ -16662,9 +16792,6 @@ msgstr "Cadastro"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr "CRAIG - Auvérnia 2013 - 25 cm"
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "GrandNancy Ortofotografia 2012"
@@ -16723,9 +16850,6 @@ msgstr ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
"- 1 m"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Língua Sorábia)"
-
msgid "Hamburg (40 cm)"
msgstr "Hamburgo (40 cm)"
@@ -16753,9 +16877,6 @@ msgstr "Berlim aerial photograph 2015"
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr "Estugarda (imagens aéreas)"
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16790,9 +16911,54 @@ msgstr "NRW-Atlas: Carta Topográfica 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Imagens de Drone (Haiti)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Imagens de Drone 2014 (Haiti)"
@@ -16830,14 +16996,8 @@ msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
"Bacia hidrográfica do Danúbio emBudapeste, Szentendre e Szigetmonostor"
-msgid "Budapest district XII ortophoto 2013"
-msgstr "Budapeste distritoXII ortofoto 2013"
-
-msgid "Interspect Budapest ortophoto 2014"
-msgstr "Interspect Budapeste ortofoto2014"
-
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
-msgstr "5 distritos de Budapeste: III, IV, XIII, XIV, XV"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Hungria (rotas pedestres)"
@@ -16845,6 +17005,21 @@ msgstr "OpenStreetMap Hungria (rotas pedestres)"
msgid "Hillshade Hungary"
msgstr "Hillshade Hungria"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Departamento de Guerra da Irlanda Britânica 1:25k GSGS 3906"
@@ -16906,9 +17081,21 @@ msgstr "PCN 2012 - Itália"
msgid "South Tyrol Orthofoto 2011"
msgstr "Tirol do Sul - Ortofoto 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr "Tirol do Sul - Mapa Topográfico"
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "USSR - Letónia"
@@ -16942,12 +17129,34 @@ msgstr "Delta do Níger Outubro 2012 Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard -Ortofoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Faixa de Gaza - Pléiades - 2014/07/06"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Faixa de Gaza - Pléiades - 2014/07/06 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Pangasinán/Bulacan (Filipinas Alta Resolução)"
@@ -17074,9 +17283,6 @@ msgstr "Świętochłowice: Ortofotomapa 2012 (imagens aéreas)"
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Zabrze: Ortofotomapa 2011 (imagem aérea)"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Szlaki (caminhos)"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr "Wrocław: Ortofotomapa 2015 (imagens aéreas)"
@@ -17086,6 +17292,20 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk - Carro"
@@ -17107,12 +17327,30 @@ msgstr "RABA-KGZ: Eslovénia - uso do solo agrícola"
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr "RABA-KGZ: Eslovénia - áreas com contruções"
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr "África do Sul CD:NGI Aérea"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr "Espanha - Catastro"
@@ -17134,6 +17372,9 @@ msgstr "Ilhas Baleares - IDEIB"
msgid "GRAFCAN Express - Canary Islands"
msgstr "Ilhas Canárias GRAFCAN Express"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Cantão da Argóvia 25cm (AGIS 2011)"
@@ -17179,6 +17420,9 @@ msgstr "Cantão de Friburgo 50cm (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Stadt Bern 10cm/25cm (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Ortofoto Yverdon-les-Bains 25cm (2007)"
@@ -17200,6 +17444,12 @@ msgstr "Bonvillars Ortofoto 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Fiez Ortofoto 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr "Taiwan e-Map Open Data"
@@ -17215,6 +17465,9 @@ msgstr "Taiwan Land-Section Data"
msgid "NLSC Open Data WMTS"
msgstr "NLSC Dados Abertos WMTS"
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "Mapas MSR - Topográfico"
@@ -17242,9 +17495,54 @@ msgstr "NC Ortofotos Recentes"
msgid "U.S. Forest Service roads"
msgstr "Estradas Florestais dos E.U.A."
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ucrânia - Ortofotomapas 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr "Ucrânia - Kyev 2014 (DZK)"
@@ -17266,9 +17564,6 @@ msgstr "Surrey Air Survey"
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-polegadas Escócia 1842-82"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr "NLS - OS 6polegadas County Series 1888-1913"
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -17278,9 +17573,6 @@ msgstr "NLS - OS 1-polegada 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr "NLS - OS 25polegadas (Escócia) 1892-1905"
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25k histórico (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "OS 1:25k histórico (Limitado ao OSM)"
@@ -17610,8 +17902,8 @@ msgstr "Descarrega dados do OpenStreetMap à medida que se deloca o mapa."
msgid "Create a grid of ways."
msgstr "Criar uma grelha de linhas."
-msgid "Customization of public transport stops."
-msgstr "Personalização de paragens de trensporte público"
+msgid "Customization of public public transport stops."
+msgstr ""
msgid ""
"Creating and handling address nodes and buildings within Czech Republic."
@@ -17723,6 +18015,9 @@ msgstr "Ferramenta simples para etiquetar números de casas."
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "Gera limites de Imagens de Fundo XML a partir de um multi-polígono"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -20279,6 +20574,9 @@ msgstr "Ribeiro"
msgid "River"
msgstr "Rio"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Canal"
@@ -21331,6 +21629,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Chalé"
@@ -21397,6 +21701,12 @@ msgstr "Esplanada"
msgid "Takeaway"
msgstr "Refeições para fora (take-away)"
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Comida Rápida (Fast Food)"
@@ -22343,31 +22653,19 @@ msgstr "abrigo para observação da vida selvagem"
msgid "Hunting Stand"
msgstr "Plataforma de Caça"
-msgid "Height"
-msgstr "Altura (metros)"
-
-msgctxt "height"
-msgid "low"
-msgstr "baixo"
-
-msgctxt "height"
-msgid "half"
-msgstr "médio"
-
-msgctxt "height"
-msgid "full"
-msgstr "alto"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
-msgstr "Trancado"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr "Ar Comprimido"
@@ -22961,6 +23259,10 @@ msgid "hut"
msgstr "cabana"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr "dormitório"
@@ -24255,6 +24557,9 @@ msgstr "Talho"
msgid "Seafood"
msgstr "Peixaria"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Loja de Gourmet"
@@ -25071,9 +25376,6 @@ msgstr "Linha de Árvores"
msgid "A line of trees."
msgstr "Linha de árvores."
-msgid "Wood"
-msgstr "Bosque"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
"Bosque no qual não é predominante a produção de madeira para uso comercial."
@@ -26138,6 +26440,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "''{0}'' está em desuso"
@@ -26238,6 +26543,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr "A chave {0} tem um valor incomum."
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} num nó. Deve ser usado numa linha."
@@ -26314,6 +26625,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} deve estar no nó onde{1} e {2} se cruzam"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "nome abreviado da rua"
@@ -26338,6 +26654,9 @@ msgstr "{0} usada em simultâneo com {1}"
msgid "street name contains ss"
msgstr "nome da rua contém ss"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -27156,6 +27475,16 @@ msgstr "Enviar conjunto de alterações atual"
msgid "Submit the current changeset to Mapillary"
msgstr "Enviar conjunto de alterações atual para o Mapillary"
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr "Enviar imagens"
@@ -27198,7 +27527,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -28115,6 +28444,9 @@ msgstr "Selecione uma área (por ex. um edifício) de uma imagem por baixo"
msgid "Area Selector"
msgstr "Selecionador de Área"
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr "Área criada"
@@ -28160,11 +28492,9 @@ msgid "Algorithm"
msgstr "Algoritmo"
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
-"Máximo de pixeis que um ponto pode estar afastado de uma linha e ser "
-"considerado parte dessa linha (padrão: {0})."
msgid "Distance Tolerance"
msgstr "Distância de Tolerância"
@@ -29881,6 +30211,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Abrir um ficheiro de imagem de fundo XML"
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr "Camada de Calibração"
@@ -32198,9 +32587,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -32361,9 +32747,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr "[descontinuidade]"
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "Gestão de rotas..."
@@ -32421,6 +32804,9 @@ msgstr "esquerdo"
msgid "Maximum distance from route"
msgstr "Distância máxima da rota"
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "Transporte Público: Alterar tipo de paragem"
@@ -32622,11 +33008,6 @@ msgstr "Reconstruir linha fechada (elimina a relação)"
msgid "Multipolygon must consist only of ways"
msgstr "O multi-polígono deve ser constituído apenas por linhas"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-"A reconstrução de linhas fechadas apenas pode ser feita em linhas exteriores "
-"(com a função ''outer'')"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Reconstruir linhas fechadas da relação {0}"
diff --git a/i18n/po/pt_BR.po b/i18n/po/pt_BR.po
index 6a3a56d..64f8797 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: 2016-11-06 22:51+0100\n"
-"PO-Revision-Date: 2016-11-06 07:02+0000\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
+"PO-Revision-Date: 2017-01-04 23:23+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: 2016-11-07 05:14+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:20+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: pt_BR\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -65,9 +65,15 @@ msgstr "Criando o menu principal"
msgid "Help"
msgstr "Ajuda"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Inicializando a API do OSM"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Inicializando validador"
@@ -213,6 +219,12 @@ msgstr ""
"Defina os elementos selecionados no mapa para os itens selecionados na lista "
"acima."
+msgid "Select WMS layers"
+msgstr "Selecionar camadas WMS"
+
+msgid "Add layers"
+msgstr "Adicionar camadas"
+
msgid "Add imagery layer {0}"
msgstr "Adicionar camada de imagem {0}"
@@ -234,12 +246,6 @@ msgstr "Erro"
msgid "Select image format for WMS layer"
msgstr "Selecione o formato da imagem para a camada WMS"
-msgid "Select WMS layers"
-msgstr "Selecionar camadas WMS"
-
-msgid "Add layers"
-msgstr "Adicionar camadas"
-
msgid "Add Node..."
msgstr "Adicionar Nó..."
@@ -757,6 +763,9 @@ msgstr "Ir Para Posição"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Abre uma janela que permite ir para uma posição específica"
+msgid "Jump to Position"
+msgstr "Pular para a posição"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Introduzir Lat/Lon para ir a uma posição."
@@ -776,10 +785,7 @@ msgid "URL"
msgstr "URL"
msgid "Jump there"
-msgstr "Ir ali"
-
-msgid "Jump to Position"
-msgstr "Pular para a posição"
+msgstr "Ir para lá"
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -836,6 +842,9 @@ msgstr "Combinar camada"
msgid "Merge the current layer into another layer"
msgstr "Combinar camada atual em outra camada"
+msgid "{0} completed in {1}"
+msgstr "{0} concluído em {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Combinando camadas com diferentes políticas de envio"
@@ -1008,24 +1017,30 @@ msgstr[1] "Abrindo {0} arquivos..."
msgid "Opening file ''{0}'' ..."
msgstr "Abrindo arquivo ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr "Quais tarefas devem ser realizadas?"
+
+msgid "Ok"
+msgstr "Ok"
+
msgid "Open Location..."
msgstr "Abrir Local..."
msgid "Open an URL."
msgstr "Abrir uma URL."
-msgid "Separate Layer"
-msgstr "Separar camadas"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Indique se os dados devem ser baixados em uma nova camada"
-
msgid "Enter URL to download:"
msgstr "Digitar URL para baixar:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Digite a URL de onde os dados devem ser baixados"
+msgid "Separate Layer"
+msgstr "Separar camadas"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Indique se os dados devem ser baixados em uma nova camada"
+
msgid "Download Location"
msgstr "Transferir Local"
@@ -1041,12 +1056,6 @@ msgstr "Feche a mensagem e cancele a transferência"
msgid "Download Data"
msgstr "Baixar dados"
-msgid "Which tasks to perform?"
-msgstr "Quais tarefas devem ser realizadas?"
-
-msgid "Ok"
-msgstr "Ok"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1920,9 +1929,6 @@ msgstr "Pesquisando e baixando conjuntos de alterações ..."
msgid "Errors during download"
msgstr "Erros durante a obtenção de dados"
-msgid "Download Geo URL"
-msgstr "Baixar Geo URL"
-
msgid "Download GPS"
msgstr "Baixar GPS"
@@ -4303,9 +4309,6 @@ msgstr "O estilo de caminho da área não está fechado"
msgid "No outer way for multipolygon"
msgstr "Sem caminho externo para o multipolígono"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "Função para ''{0}'' deve ser ''{1}''"
-
msgid "No area style for multipolygon"
msgstr "Sem estilo área para multipolígono"
@@ -4343,12 +4346,27 @@ msgstr "Estilo da área em outra via"
msgid "Multipolygon is not closed"
msgstr "O multipolígono não está fechado"
-msgid "Multipolygon inner way is outside"
-msgstr "A linha interna do multipolígono está do lado de fora"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "Interseção entre vias multipolígonais"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "Função para ''{0}'' deve ser ''{1}''"
+
+msgid "Multipolygon inner way is outside"
+msgstr "A linha interna do multipolígono está do lado de fora"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "Nenhuma regra últil para membro multipoligonal"
@@ -5068,12 +5086,18 @@ msgstr "Desative o acesso ao recurso especificado(s), separados por vírgula"
msgid "options provided as Java system properties"
msgstr "opções providas como propriedades do sistema Java"
+msgid "Change the JOSM directory name"
+msgstr "Alterar o nome do diretório JOSM"
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/PATH/TO/JOSM/PREF "
msgid "Set the preferences directory"
msgstr "Definir o diretório de preferências"
+msgid "Default: {0}"
+msgstr "Padrão: {0}"
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/PATH/TO/JOSM/USERDATA"
@@ -5090,11 +5114,9 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/PATH/TO/JOSM/HOMEDIR "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Realocar todos os 3 diretórios para homedir. Diretório do cache será "
-"homedir/cache"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5445,9 +5467,6 @@ msgstr "Clique para executar o tarefa em segundo plano"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} concluído em {1}"
-
msgid "Enlarge"
msgstr "Ampliar"
@@ -5593,86 +5612,6 @@ msgstr "Conflito de fundo: remover membro"
msgid "Conflict foreground: remove member"
msgstr "Conflito em primeiro plano: remover membro"
-msgid "My with Their"
-msgstr "Meu com o deles"
-
-msgid "My with Merged"
-msgstr "Meus com Combinados"
-
-msgid "Their with Merged"
-msgstr "Versão deles com combinada"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "Regra {0} não participa no par de comparação {1}."
-
-msgid "Properties"
-msgstr "Propriedades"
-
-msgid "Tags"
-msgstr "Etiquetas"
-
-msgid "Nodes"
-msgstr "Nós"
-
-msgid "Members"
-msgstr "Membros"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Nenhum conflito de tags pendentes a ser resolvido"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Tags ({0} conflito)"
-msgstr[1] "Tags ({0} conflitos)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} conflito de tags pendente de resolução"
-msgstr[1] "{0} conflitos de tags pendentes de resolução"
-
-msgid "Nodes(resolved)"
-msgstr "Nós (resolvido)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Nós mesclados da lista estão congelados. Não existe conflitos pendentes na "
-"lista de nós deste caminho"
-
-msgid "Nodes(with conflicts)"
-msgstr "Nós (com conflitos)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Conflitos pendentes na lista de nós deste caminho"
-
-msgid "Members(resolved)"
-msgstr "Membros(resolvido)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Membros mesclados da lista estão congelados. Não existe conflitos pendentes "
-"na lista de membros desta relação"
-
-msgid "Members(with conflicts)"
-msgstr "Membros(com conflitos)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Conflitos pendentes na lista de membros desta relação"
-
-msgid "No pending property conflicts"
-msgstr "Nenhum conflito de propriedades pendente"
-
-msgid "Properties(with conflicts)"
-msgstr "Propriedades(com conflitos)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Conflito de propriedades pendente de solução"
-
-msgid "Conflict Resolution"
-msgstr "Resolução de Conflito"
-
msgid "{0} more..."
msgstr "{0} mais..."
@@ -5862,6 +5801,86 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Versão deles ({0} entrada)"
msgstr[1] "Versão deles ({0} entradas)"
+msgid "My with Their"
+msgstr "Meu com o deles"
+
+msgid "My with Merged"
+msgstr "Meus com Combinados"
+
+msgid "Their with Merged"
+msgstr "Versão deles com combinada"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "Regra {0} não participa no par de comparação {1}."
+
+msgid "Properties"
+msgstr "Propriedades"
+
+msgid "Tags"
+msgstr "Etiquetas"
+
+msgid "Nodes"
+msgstr "Nós"
+
+msgid "Members"
+msgstr "Membros"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Nenhum conflito de tags pendentes a ser resolvido"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Tags ({0} conflito)"
+msgstr[1] "Tags ({0} conflitos)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} conflito de tags pendente de resolução"
+msgstr[1] "{0} conflitos de tags pendentes de resolução"
+
+msgid "Nodes(resolved)"
+msgstr "Nós (resolvido)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Nós mesclados da lista estão congelados. Não existe conflitos pendentes na "
+"lista de nós deste caminho"
+
+msgid "Nodes(with conflicts)"
+msgstr "Nós (com conflitos)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Conflitos pendentes na lista de nós deste caminho"
+
+msgid "Members(resolved)"
+msgstr "Membros(resolvido)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Membros mesclados da lista estão congelados. Não existe conflitos pendentes "
+"na lista de membros desta relação"
+
+msgid "Members(with conflicts)"
+msgstr "Membros(com conflitos)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Conflitos pendentes na lista de membros desta relação"
+
+msgid "No pending property conflicts"
+msgstr "Nenhum conflito de propriedades pendente"
+
+msgid "Properties(with conflicts)"
+msgstr "Propriedades(com conflitos)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Conflito de propriedades pendente de solução"
+
+msgid "Conflict Resolution"
+msgstr "Resolução de Conflito"
+
msgid "Node"
msgstr "Nó"
@@ -5925,10 +5944,8 @@ msgstr "Regra"
msgid "Primitive"
msgstr "Primitivo"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"nós combinados não congelados ainda. Não é possível construir comando de "
-"resolução"
msgid "<undefined>"
msgstr "<indefinido>"
@@ -7226,12 +7243,13 @@ msgstr ""
"Baixar do servidor o conteúdo dos conjuntos de alterações selecionados"
msgid "Download changed objects"
-msgstr ""
+msgstr "Download dos objetos modificados"
msgid ""
"Download the current version of the changed objects in the selected "
"changesets"
msgstr ""
+"Download da versão atual dos objetos modificados nas changesets selecionadas."
msgid "My changesets"
msgstr "Meus conjuntos de alterações"
@@ -7445,144 +7463,22 @@ msgstr ""
"Selecione apenas conjuntos de alterações relacionados com um bounding box "
"específico"
-msgid "Query open changesets only"
-msgstr "Pesquisar apenas conjuntos de alterações abertos"
-
-msgid "Query closed changesets only"
-msgstr "Buscar somente conjuntos de alterações fechados"
-
-msgid "Query both open and closed changesets"
-msgstr "Buscar conjuntos de alterações abertos e fechados"
-
-msgid "Only changesets owned by myself"
-msgstr "Somente conjuntos de alterações que pertencem a mim"
-
-msgid "User ID:"
-msgstr "ID do usuário:"
-
-msgid "User name:"
-msgstr "Nome do usuário:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Somente conjuntos de alterações do usuário com o seguinte ID"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-"Apenas conjuntos de alterações que pertencem ao usuário com o seguinte nome "
-"de usuário"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Só changesets de minha prorpriedade (desativado. JOSM é atualmente gerido "
-"por um usuário anônimo)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Não é possível restringir a busca de conjuntos de alterações ao usuário "
-"atual porque o usuário atual é anônimo"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "Valor atual ''{0}'' para usuário ID não é válido"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"Não é possível restringir a pesquisa de conjuntos de alterações para o nome "
-"de usuário ''{0}''"
-
-msgid "Please enter a valid user ID"
-msgstr "Por favor entre com um ID de usuário válido"
-
-msgid "Invalid user ID"
-msgstr "ID de usuário inválido"
-
-msgid "Please enter a non-empty user name"
-msgstr "Por favor entre com um nome de usuário que não seja vazio"
-
-msgid "Invalid user name"
-msgstr "Nome do usuário inválido"
-
-msgid "Date: "
-msgstr "Data: "
-
-msgid "Time:"
-msgstr "Hora:"
-
-msgid "Closed after - "
-msgstr "Fechado depois de - "
-
-msgid "Date:"
-msgstr "Data:"
-
-msgid "Created before - "
-msgstr "Criado antes de - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Apenas conjuntos de alterações fechados após este dia/hora"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-"Apenas conjuntos de alterações fechados depois, e criados antes deste "
-"dia/hora"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"Não é possível construir uma busca de conjuntos de alterações baseada em "
-"restrições de tempo. A entrada é inválida."
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr ""
-"<html>Por favor informe valores válidos de data/hora para restringir<br>a "
-"busca a um intervalo de tempo específico.</html>"
-
-msgid "Invalid date/time values"
-msgstr "Valores de data/hora inválidos"
-
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
-msgstr ""
-"Não é possível restringir a pesquisa de conjuntos de alterações para um "
-"bounding box específico. A entrada é inválida."
-
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
-msgstr ""
-"<html>Por favor informe valores válidos de latitude/longitude para "
-"restringir<br>a busca para uma determinada área retangular.</html>"
-
-msgid "Invalid bounding box"
-msgstr "Retângulo de seleção inválido"
-
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"O valor atual não é um ID de usuário. Por gentileza digite um inteiro > 0"
-
-msgid "Please enter an integer value > 0"
-msgstr "Por favor digite um valor iteiro > 0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+"invalid."
msgstr ""
-"Por favor informe uma data no formato usual da sua localidade.<br>Exemplo: "
-"{0}<br>Exemplo: {1}<br>Exemplo: {2}<br>Exemplo: {3}<br>"
+"Não é possível restringir a pesquisa de conjuntos de alterações para um "
+"bounding box específico. A entrada é inválida."
msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-"Por favor informe um tempo no formato usual da sua localidade.<br>Exemplo: "
-"{0}<br>Exemplo: {1}<br>Exemplo: {2}<br>Exemplo: {3}<br>"
+"<html>Por favor informe valores válidos de latitude/longitude para "
+"restringir<br>a busca para uma determinada área retangular.</html>"
+
+msgid "Invalid bounding box"
+msgstr "Retângulo de seleção inválido"
msgid "Download my changesets only"
msgstr "Baixar somente os meus conjuntos de alterações"
@@ -7680,6 +7576,77 @@ msgstr "URL de pesquisa de conjunto de alterações ilegal"
msgid "Close the dialog and abort querying of changesets"
msgstr "Fechar a janela e abortar a pesquisa de conjuntos de alterações"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Por favor informe uma data no formato usual da sua localidade.<br>Exemplo: "
+"{0}<br>Exemplo: {1}<br>Exemplo: {2}<br>Exemplo: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Pesquisar apenas conjuntos de alterações abertos"
+
+msgid "Query closed changesets only"
+msgstr "Buscar somente conjuntos de alterações fechados"
+
+msgid "Query both open and closed changesets"
+msgstr "Buscar conjuntos de alterações abertos e fechados"
+
+msgid "Date: "
+msgstr "Data: "
+
+msgid "Time:"
+msgstr "Hora:"
+
+msgid "Closed after - "
+msgstr "Fechado depois de - "
+
+msgid "Date:"
+msgstr "Data:"
+
+msgid "Created before - "
+msgstr "Criado antes de - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Apenas conjuntos de alterações fechados após este dia/hora"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+"Apenas conjuntos de alterações fechados depois, e criados antes deste "
+"dia/hora"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Não é possível construir uma busca de conjuntos de alterações baseada em "
+"restrições de tempo. A entrada é inválida."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Por favor informe valores válidos de data/hora para restringir<br>a "
+"busca a um intervalo de tempo específico.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Valores de data/hora inválidos"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Por favor informe um tempo no formato usual da sua localidade.<br>Exemplo: "
+"{0}<br>Exemplo: {1}<br>Exemplo: {2}<br>Exemplo: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"O valor atual não é um ID de usuário. Por gentileza digite um inteiro > 0"
+
+msgid "Please enter an integer value > 0"
+msgstr "Por favor digite um valor iteiro > 0"
+
msgid "URL: "
msgstr "URL: "
@@ -7701,6 +7668,57 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Esta URL de pesquisa de conjunto de alterações é inválida"
+msgid "Only changesets owned by myself"
+msgstr "Somente conjuntos de alterações que pertencem a mim"
+
+msgid "User ID:"
+msgstr "ID do usuário:"
+
+msgid "User name:"
+msgstr "Nome do usuário:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Somente conjuntos de alterações do usuário com o seguinte ID"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+"Apenas conjuntos de alterações que pertencem ao usuário com o seguinte nome "
+"de usuário"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Só changesets de minha prorpriedade (desativado. JOSM é atualmente gerido "
+"por um usuário anônimo)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Não é possível restringir a busca de conjuntos de alterações ao usuário "
+"atual porque o usuário atual é anônimo"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "Valor atual ''{0}'' para usuário ID não é válido"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"Não é possível restringir a pesquisa de conjuntos de alterações para o nome "
+"de usuário ''{0}''"
+
+msgid "Please enter a valid user ID"
+msgstr "Por favor entre com um ID de usuário válido"
+
+msgid "Invalid user ID"
+msgstr "ID de usuário inválido"
+
+msgid "Please enter a non-empty user name"
+msgstr "Por favor entre com um nome de usuário que não seja vazio"
+
+msgid "Invalid user name"
+msgstr "Nome do usuário inválido"
+
msgid "Activate"
msgstr "Ativar"
@@ -8898,6 +8916,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -8997,10 +9018,11 @@ msgid ""
msgstr ""
msgid "Check \"Upload\" to upload the changes to the OSM server."
-msgstr ""
+msgstr "Marque \"Enviar\" para enviar as modificações para o servidor OSM."
msgid "Check \"Save\" to save the layer to the file specified on the left."
msgstr ""
+"Marque \"Salvar\" para salvar a camada no arquivo especificado à esquerda."
msgid "Provide a brief comment for the changes you are uploading:"
msgstr "Faça um comentário breve sobre as mudanças que está enviando:"
@@ -9282,7 +9304,7 @@ msgid "Unsaved changes - Save/Upload before deleting?"
msgstr "Modificações não salvas - Salvar/Enviar antes de apagar?"
msgid "Unsaved changes - Save/Upload before restarting?"
-msgstr ""
+msgstr "Modificações não salvas - Salvar/Enviar após reiniciar?"
msgid "Uploading and saving modified layers ..."
msgstr "Enviando e salvando camadas modificadas..."
@@ -9352,10 +9374,10 @@ msgid "Exit JOSM without saving. Unsaved changes are lost."
msgstr "Saindo do JOSM sem salvar. Mudanção não salvas serão perdidas."
msgid "Restart now!"
-msgstr ""
+msgstr "Reiniciar agora!"
msgid "Restart JOSM without saving. Unsaved changes are lost."
-msgstr ""
+msgstr "Reiniciar o JOSM sem salvar. Modificações são salvas serão perdidas."
msgid "Delete now!"
msgstr "Apagar agora!"
@@ -10002,7 +10024,7 @@ msgid "All projections are supported"
msgstr "Todas as projecções são suportadas"
msgid "The layer {0} does not support the new projection {1}."
-msgstr ""
+msgstr "A camada {0} não suporta a nova projeção {1}."
msgid "Supported projections are: {0}"
msgstr "Projeções suportadas são {0}"
@@ -10512,13 +10534,13 @@ msgid "Download near:"
msgstr "Baixar próximo:"
msgid "track only"
-msgstr "somente trilha"
+msgstr "apenas caminhos"
msgid "waypoints only"
-msgstr "somente pontos"
+msgstr "apenas nós"
msgid "track and waypoints"
-msgstr "trilhas e pontos"
+msgstr "caminhos e nós"
msgid "Click to download"
msgstr "Clique para baixar"
@@ -10565,6 +10587,9 @@ msgstr "Direção"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "Arquivos de áudio WAV (*.wav)"
+
msgid "Import Audio"
msgstr "Importar Áudio"
@@ -10580,9 +10605,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Importação não possível"
-msgid "Wave Audio files (*.wav)"
-msgstr "Arquivos de áudio WAV (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Marcadores de áudio de {0}"
@@ -10692,14 +10714,6 @@ msgstr "(A URL era: "
msgid "Select the map painting styles"
msgstr "Selecione os estilos de pintura do mapa"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "Falha ao carregar estilos Mappaint de ''{0}''. A exceção foi: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr "carregando estilo ''{0}''..."
@@ -10716,6 +10730,9 @@ msgstr[1] ""
"Ocorreram {0} erros ao carregar este estilo. Para mais detalhes, clique com "
"o botão direito e selecione \"Informações\""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "Falha ao carregar estilos Mappaint de ''{0}''. A exceção foi: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Falha ao analisar estilos Mappaint de ''{0}''. Erro foi: {1}"
@@ -11505,7 +11522,7 @@ msgid "Please select the row to edit."
msgstr "Por favor, selecione a linha para editar."
msgid "Select Setting Type:"
-msgstr "Selecione o tipo de ambiente:"
+msgstr "Selecione o tipo de configuração:"
msgid "Simple"
msgstr "Simples"
@@ -11692,7 +11709,7 @@ msgid "Only on the head of a way."
msgstr "Somente no sentido da via."
msgid "Draw oneway arrows."
-msgstr "Desenhe setas oneway."
+msgstr "Desenhar setas oneway."
msgid "Draw segment order numbers"
msgstr "Desenhar número de sequência dos segmentos"
@@ -11716,7 +11733,7 @@ msgid "Highlight target ways and nodes"
msgstr "Destacar vias alvo e nós"
msgid "Draw rubber-band helper line"
-msgstr "Desenha linha auxiliar"
+msgstr "Desenhar linha auxiliar"
msgid "Smooth map graphics (antialiasing)"
msgstr "Gráficos do mapa suavizados (anti-alias)"
@@ -11849,6 +11866,9 @@ msgstr "Diluição da posição (vermelho = alta, verde = baixo, se disponível)
msgid "Track date"
msgstr "Data da trilha"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Cor única (pode ser personalizado para camadas nomeadas)"
@@ -11861,6 +11881,18 @@ msgstr "Bicicleta"
msgid "Foot"
msgstr "A Pé"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Floresta"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Criar marcadores quando lendo GPX"
@@ -11873,6 +11905,9 @@ msgstr "Gama dinâmica de cores com base em limites de dados"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Suavizar gráficos GPX (antialiasing)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11944,6 +11979,11 @@ msgstr ""
"Aplicar suavização das linhas de GPX, resultando em uma aparência mais suave."
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11966,12 +12006,19 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "Pontos de cores e segmentos de pista por seu timestamp."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
"Permita ajustar a cor da trilha para diferentes médias de velocidade."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
-msgstr "Coloração de trilhas e pontos"
+msgstr "Coloração de caminhos e pontos"
msgid "Colors points and track segments by data limits."
msgstr "Pontos de cores e segmentos de pista por limites de dados."
@@ -13272,6 +13319,12 @@ msgstr "Verifica se há erros em objetos religiosos"
msgid "Checks for errors on relations"
msgstr "Verifica se há erros em relações"
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr "Tags desnecessárias"
@@ -14419,6 +14472,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Salvar usuário e senha (sem encriptação)"
+msgid "Assume"
+msgstr "Presumir"
+
+msgid "Existing values"
+msgstr "Valores existentes"
+
msgid "<delete from {0} objects>"
msgstr "<excluir de {0} objetos>"
@@ -14440,12 +14499,6 @@ msgstr "Adicionar tags verificadas para os objetos selecionados"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Enter: Adiciona todas as tags de objetos selecionados"
-msgid "Assume"
-msgstr "Presumir"
-
-msgid "Existing values"
-msgstr "Valores existentes"
-
msgid "Enable the checkbox to accept the value"
msgstr "Ative a caixa de seleção para aceitar o valor"
@@ -15634,6 +15687,9 @@ msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
"Silencioso conflito em atalho: ''{0}'' movido por ''{1}'' para ''{2}''."
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "Houve {0} tag encontrada no buffer, ela é suspeita!"
@@ -16146,14 +16202,17 @@ msgstr "Satélite Mapbox"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr "OpenSeaMap"
-msgid "OpenStreetMap Carto (Standard layer)"
-msgstr "OpenStreetMap Carto (camada padrãp)"
+msgid "OpenStreetMap Carto (Standard)"
+msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik Branco & Preto)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, sem etiquetas)"
@@ -16176,8 +16235,11 @@ msgstr "Hike & Bike"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Camboja, Laos, Tailândia, Vietnã bilíngue"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
@@ -16227,8 +16289,8 @@ msgstr "OSM Inspector: Lugares"
msgid "OSM Inspector: Highways"
msgstr "OSM Inspector: Rodovias"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM Inspector: Multipolígono"
+msgid "OSM Inspector: Area"
+msgstr ""
msgid "OSM Inspector: Routing"
msgstr "OSM Inspector: Roteamento"
@@ -16236,10 +16298,22 @@ msgstr "OSM Inspector: Roteamento"
msgid "OSM Inspector: Addresses"
msgstr "OSM Inspector: Endereços"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM Inspector: Fronteiras (UE)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -16275,6 +16349,12 @@ msgstr "LPI NSW Administrative Boundaries State Forest"
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr "LPI NSW Administrative Boundaries NPWS Reserve"
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -16320,10 +16400,16 @@ msgstr "VoGIS: Flächenwidmungsplan"
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -16359,7 +16445,16 @@ msgstr "SPW(allonie) 2009-2010 aerial imagery"
msgid "TEC bus lines (2014)"
msgstr "TEC bus lines (2014)"
-msgid "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
msgstr ""
msgid "IBGE Mapa de Setores Urbanos"
@@ -16368,6 +16463,15 @@ msgstr "IBGE Mapa de Setores Urbanos"
msgid "IBGE Mapa de Setores Rurais"
msgstr "IBGE Mapa de Setores Rurais"
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Geobase Hydrography"
@@ -16380,12 +16484,34 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "Mosaico Columbia Britânica"
+msgid "Latest southwest British Columbia Landsat"
+msgstr ""
+
msgid "Kelowna 2012"
msgstr "Kelowna 2012"
msgid "Kelowna Roads overlay"
msgstr "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr ""
+
msgid "Czech CUZK:KM"
msgstr "Czech CUZK:KM"
@@ -16419,8 +16545,14 @@ msgstr "Geodatastyrelsen Skærmkort"
msgid "Stevns (Denmark)"
msgstr "Stevns (Denmark)"
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Dinamarca)"
+msgid "Vejmidte (Denmark)"
+msgstr "Vejmidte (Dinamarca)"
+
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
msgid "Estonia Basemap (Maaamet)"
msgstr "Estónia Basemap (Maaamet)"
@@ -16455,9 +16587,6 @@ msgstr "Cadastro"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr "CRAIG - Auvergne 2013 - 25 cm"
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Alpes Marítimos 2009-40 cm"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "GrandNancy Orthophotographie 2012"
@@ -16516,9 +16645,6 @@ msgstr ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
"- 1 m"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Sorbian Language)"
-
msgid "Hamburg (40 cm)"
msgstr "Hamburg (40 cm)"
@@ -16546,9 +16672,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr "Stuttgart (aerial imagery)"
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16583,9 +16706,54 @@ msgstr "NRW-Atlas: Topographische Karte 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Drone Imagery (Haiti)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone Imagery 2014 (Haiti)"
@@ -16622,21 +16790,30 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
-msgstr "Interspect Budapest ortophoto 2014"
-
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
-msgstr "Cinco distritos de Budapeste: III, IV, XIII, XIV, XV"
-
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
msgid "Hillshade Hungary"
msgstr ""
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
+msgstr ""
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -16697,9 +16874,21 @@ msgstr "PCN 2012 - Itália"
msgid "South Tyrol Orthofoto 2011"
msgstr "South Tyrol Orthofoto 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr "South Tyrol Topomap"
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "USSR - Latvia"
@@ -16733,12 +16922,34 @@ msgstr "Niger Delta Oct 2012 Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard -Orthophoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Gaza Strip - Pléiades - 2014/07/06"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
@@ -16865,9 +17076,6 @@ msgstr "Świętochłowice: Ortofotomapa 2012 (aerial image)"
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Częstochowa: Ortofotomapa 2011 (imagem aérea)"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Szlaki (paths)"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr "Wrocław: Ortofotomapa 2015 (aerial image)"
@@ -16877,6 +17085,20 @@ msgstr "fator de escala"
msgid "ScanEx SPOT"
msgstr "fator de escala"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Car"
@@ -16898,12 +17120,30 @@ msgstr "RABA-KGZ: Slovenia farmland use"
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr "RABA-KGZ: Slovenia built-up areas"
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr "South Africa CD:NGI Aerial"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr "Catastro Espanha"
@@ -16925,6 +17165,9 @@ msgstr "IDEIB - Ilhas Baleares"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Ilhas Canárias"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Kanton Aargau 25cm (AGIS 2011)"
@@ -16967,6 +17210,9 @@ msgstr "Canton de Fribourg 50cm (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Stadt Bern 10cm/25cm (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -16988,6 +17234,12 @@ msgstr "Bonvillars Orthophoto 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Fiez Orthophoto 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr "Taiwan e-Map Open Data"
@@ -17003,6 +17255,9 @@ msgstr "Taiwan Land-Section Data"
msgid "NLSC Open Data WMTS"
msgstr "NLSC Open Data WMTS"
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "MSR Maps Topo"
@@ -17030,9 +17285,54 @@ msgstr "NC Últimas Ortoimagens"
msgid "U.S. Forest Service roads"
msgstr "U.S. Forest Service roads"
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ukraine - Orthophotomaps 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -17054,9 +17354,6 @@ msgstr "Surrey Air Survey"
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Scotland 1842-82"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr "NLS - OS 6-inch County Series 1888-1913"
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -17066,9 +17363,6 @@ msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr "NLS - OS 25-inch (Scotland) 1892-1905"
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25k historic (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "OS 1:25k historic (OSM-Limited)"
@@ -17404,7 +17698,7 @@ msgstr "Faz download de novos dados ao movimentar o mapa"
msgid "Create a grid of ways."
msgstr "Cria uma grade de caminhos."
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -17511,6 +17805,9 @@ msgstr "Ferramenta simples para etiquetar os números da casa."
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "Gera imagens XML dos limites de um multipolígno"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -17694,7 +17991,7 @@ msgstr ""
"Pode-se executar esta funcionalidade no menu de contexto da camada de imagem."
msgid "Make photos movable and position them on the map."
-msgstr "Tornaa as fotos móveis e posicioná-las no mapa."
+msgstr "Torna as fotos móveis e as posiciona no mapa."
msgid ""
"This plugin allows to display any picture as a background in the editor and "
@@ -18680,13 +18977,13 @@ msgid "Plants that are leafless for a certain period during the year."
msgstr "Plantas que não tem folhas por um certo período durante o ano."
msgid "evergreen"
-msgstr "sempre-viva"
+msgstr "perenifólia"
msgid "Plants that are never entirely without green foliage."
msgstr "Plantas que nunca ficam inteiramente sem folhas verdes."
msgid "semi_deciduous"
-msgstr "semi_deciduous"
+msgstr "semidecídua"
msgid ""
"Plants that lose their foliage for a very short period, when old leaves fall "
@@ -19110,7 +19407,7 @@ msgid "Residential"
msgstr "Residencial"
msgid "Bicycle Road"
-msgstr "Rua para ciclistas"
+msgstr "Rota de Ciclismo"
msgid "Highway type"
msgstr "Tipo de estrada"
@@ -20023,6 +20320,9 @@ msgstr "Córrego"
msgid "River"
msgstr "Rio"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Canal Navegável"
@@ -20113,10 +20413,10 @@ msgid "river"
msgstr "rio"
msgid "lock"
-msgstr ""
+msgstr "eclusa"
msgid "wastewater"
-msgstr ""
+msgstr "residual"
msgid "Salt Water"
msgstr "Água salgada"
@@ -20942,7 +21242,7 @@ msgid "Shelter"
msgstr "Abrigo"
msgid "Waste Basket/Trash Can"
-msgstr "Cesta de Lixo/Lata de lixo"
+msgstr "Lixeira"
msgctxt "railway"
msgid "Station"
@@ -21018,7 +21318,7 @@ msgid "Taxiway"
msgstr "Pista de taxiamento"
msgid "Holding Position"
-msgstr ""
+msgstr "Ponto de Espera"
msgid "Helipad"
msgstr "Heliponto"
@@ -21077,6 +21377,12 @@ msgstr "Motel/Hotel de estrada"
msgid "Guest House/Bed & Breakfast"
msgstr "Pousada/Dormitório com café da manhã"
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Chalé"
@@ -21143,6 +21449,12 @@ msgstr "Lugares ao ar livre"
msgid "Takeaway"
msgstr "Alimento para Viagem"
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Lanchonete"
@@ -21380,7 +21692,7 @@ msgid "Fishing"
msgstr "Pescaria"
msgid "Bird Hide"
-msgstr ""
+msgstr "Observação de Aves"
msgid "Night Club"
msgstr "Casa noturna"
@@ -22089,31 +22401,19 @@ msgstr "observatório de vida selvagem"
msgid "Hunting Stand"
msgstr "Stand de caça"
-msgid "Height"
-msgstr "Altura"
-
-msgctxt "height"
-msgid "low"
-msgstr "baixo"
-
-msgctxt "height"
-msgid "half"
-msgstr "meio"
-
-msgctxt "height"
-msgid "full"
-msgstr "alto"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
-msgstr "Fechado"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr "Ponto de água"
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr "Ar comprimido"
@@ -22587,7 +22887,7 @@ msgstr "universidade"
msgctxt "building"
msgid "college"
-msgstr ""
+msgstr "escola técnica"
msgctxt "building"
msgid "hospital"
@@ -22675,7 +22975,7 @@ msgstr "público"
msgctxt "building"
msgid "ruins"
-msgstr ""
+msgstr "ruínas"
msgctxt "building"
msgid "Levels"
@@ -22705,6 +23005,10 @@ msgid "hut"
msgstr "cabana"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr "dormitório"
@@ -24000,6 +24304,9 @@ msgstr "Açougue"
msgid "Seafood"
msgstr "Peixaria / Frutos do Mar"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Deli (comida requintada)"
@@ -24471,16 +24778,16 @@ msgid "Government"
msgstr "Governo"
msgid "ministry"
-msgstr ""
+msgstr "ministerio"
msgid "prosecutor"
-msgstr ""
+msgstr "promotoria"
msgid "tax"
-msgstr ""
+msgstr "impostos"
msgid "register_office"
-msgstr ""
+msgstr "escritório de registros"
msgctxt "office"
msgid "Insurance"
@@ -24791,16 +25098,16 @@ msgid "Islet"
msgstr "Ilhota"
msgid "Reef"
-msgstr ""
+msgstr "Recife"
msgid "coral"
msgstr "coral"
msgid "oyster"
-msgstr ""
+msgstr "ostra"
msgid "rock"
-msgstr ""
+msgstr "rocha"
msgid "Nature"
msgstr "Natureza"
@@ -24817,9 +25124,6 @@ msgstr "Fileira de árvores"
msgid "A line of trees."
msgstr "Uma linha de árvores."
-msgid "Wood"
-msgstr "Floresta"
-
msgid "Woodland where timber production does not dominate use."
msgstr "Floresta onde a produção de madeira não é o uso dominante."
@@ -24895,7 +25199,7 @@ msgid "An accumulation of loose angular rocks."
msgstr ""
msgid "Shingle"
-msgstr ""
+msgstr "Seixal"
msgid "An accumulation of loose rounded rocks on a beach or riverbed."
msgstr ""
@@ -25062,13 +25366,13 @@ msgid "Plant Nursery"
msgstr "Viveiro de plantas"
msgid "Aquaculture"
-msgstr ""
+msgstr "Aquicultura"
msgid "shrimp"
-msgstr ""
+msgstr "camarão"
msgid "mussels"
-msgstr ""
+msgstr "mexilhão"
msgid "Allotments"
msgstr "Hortas comunitárias"
@@ -25591,7 +25895,7 @@ msgid "Mountain Biking Route"
msgstr "Rota de Mountain Biking"
msgid "Hiking Route"
-msgstr "Rota de caminhada"
+msgstr "Rota de Hiking"
msgid "infrastructure"
msgstr "infra-estrutura"
@@ -25883,6 +26187,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0} está obsoleta"
@@ -25987,6 +26294,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} em um nó. Deveria ser usado em uma via."
@@ -26063,6 +26376,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} deve ser no nó onde {1} e {2} se cruzam"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "nome da rua abreviado"
@@ -26087,6 +26405,9 @@ msgstr "{0} use com {1}"
msgid "street name contains ss"
msgstr "nome da ruas contem ss"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -26901,6 +27222,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr "Enviar imagens"
@@ -26943,8 +27274,8 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
-msgstr "Enviar"
+msgid "Submitting changeset to server…"
+msgstr ""
msgid "Export all images"
msgstr "Exportar todas as imagens"
@@ -27857,6 +28188,9 @@ msgstr ""
msgid "Area Selector"
msgstr "Seletor de área"
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr "Criar área"
@@ -27902,11 +28236,9 @@ msgid "Algorithm"
msgstr "Algoritmo"
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
-"Máximo de pixels que um ponto pode estar afastado de uma linha e ainda ser "
-"considerado um membro desta linha (padrão: {0})."
msgid "Distance Tolerance"
msgstr "Distância de Tolerância"
@@ -29635,6 +29967,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Abrir arquivo XML da imagem"
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr "Camadas de calibração"
@@ -31936,9 +32327,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -32098,9 +32486,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr "[gap]"
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "Padrões de rotas ..."
@@ -32158,6 +32543,9 @@ msgstr "lado da mão esquerda"
msgid "Maximum distance from route"
msgstr "Distância máxima do percurso"
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "Transporte Público: Alterar o tipo de parada"
@@ -32360,10 +32748,6 @@ msgstr "Reconstruir polígono"
msgid "Multipolygon must consist only of ways"
msgstr "Multipolígonos devem consistir apenas de vias"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-"Reconstrução de polígonos pode ser feita apenas a partir de formas exteriores"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Reconstruir polígonos da relação {0}"
diff --git a/i18n/po/rm.po b/i18n/po/rm.po
index ac36728..92f0073 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:04+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:09+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr ""
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr ""
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -708,6 +714,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -729,9 +738,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -782,6 +788,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -931,16 +940,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -949,6 +958,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -964,12 +979,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1762,9 +1771,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3950,9 +3956,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3982,12 +3985,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4680,12 +4698,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4702,8 +4726,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5024,9 +5048,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5165,82 +5186,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5406,6 +5351,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5465,7 +5486,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6857,212 +6878,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8168,6 +8189,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9654,6 +9678,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9666,9 +9693,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9765,14 +9789,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9785,6 +9801,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10773,6 +10792,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10785,6 +10807,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10797,6 +10831,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10856,6 +10893,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10874,9 +10916,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12071,6 +12120,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13106,6 +13161,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13127,12 +13188,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14092,6 +14147,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14580,13 +14638,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14610,7 +14671,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14661,7 +14725,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14670,10 +14734,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14709,6 +14785,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14754,10 +14836,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14790,34 +14878,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14856,6 +14984,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14889,9 +15023,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14948,9 +15079,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14978,9 +15106,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15014,9 +15139,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15053,19 +15223,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15128,9 +15307,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15164,12 +15355,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15296,9 +15509,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15308,6 +15518,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15329,12 +15553,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15356,6 +15598,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15398,6 +15643,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15419,6 +15667,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15434,6 +15688,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15461,9 +15718,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15485,9 +15787,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15497,9 +15796,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15811,7 +16107,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15899,6 +16195,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18295,6 +18594,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19343,6 +19645,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19409,6 +19717,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20352,31 +20666,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20968,6 +21270,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22261,6 +22567,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23074,9 +23383,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24121,6 +24427,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24212,6 +24521,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24288,6 +24603,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24312,6 +24632,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25085,6 +25408,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25127,7 +25460,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25930,6 +26263,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25971,8 +26307,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27570,6 +27906,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29731,9 +30126,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29891,9 +30283,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29951,6 +30340,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30148,9 +30540,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/ro.po b/i18n/po/ro.po
index 1495c4e..e896c3a 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:04+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:10+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"X-Poedit-Country: ROMANIA\n"
"Language: ro\n"
"X-Poedit-Language: Romanian\n"
@@ -70,9 +70,15 @@ msgstr ""
msgid "Help"
msgstr "Ajutor"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Inițializare API OSM"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Inițializare validator"
@@ -219,6 +225,12 @@ msgstr ""
"Setaţi elementele selectate de pe hartă ca elemente selectate din lista de "
"mai sus."
+msgid "Select WMS layers"
+msgstr "Alege straturile WMS"
+
+msgid "Add layers"
+msgstr "Adaugă straturi"
+
msgid "Add imagery layer {0}"
msgstr "Adaugă strat de fundal {0}"
@@ -240,12 +252,6 @@ msgstr "Eroare"
msgid "Select image format for WMS layer"
msgstr "Alege formatul raster pentru stratul WMS"
-msgid "Select WMS layers"
-msgstr "Alege straturile WMS"
-
-msgid "Add layers"
-msgstr "Adaugă straturi"
-
msgid "Add Node..."
msgstr "Adaugă Nod..."
@@ -756,6 +762,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr "Salt la poziție"
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -777,9 +786,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr "Salt la poziție"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -830,6 +836,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr "{0} completat în {1}"
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -979,12 +988,24 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid "Open Location..."
msgstr ""
msgid "Open an URL."
msgstr "Deschide un URL..."
+msgid "Enter URL to download:"
+msgstr ""
+
+msgid "Enter an URL from where data should be downloaded"
+msgstr ""
+
msgid "Separate Layer"
msgstr "Separă Strat"
@@ -993,12 +1014,6 @@ msgstr ""
"Selectaţi în cazul în care datele ar trebui să fie descărcate într-un nou "
"strat"
-msgid "Enter URL to download:"
-msgstr ""
-
-msgid "Enter an URL from where data should be downloaded"
-msgstr ""
-
msgid "Download Location"
msgstr ""
@@ -1014,12 +1029,6 @@ msgstr "Închide fereastra și anulează descărcarea"
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1812,9 +1821,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -4004,9 +4010,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -4036,12 +4039,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4734,12 +4752,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4756,8 +4780,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5078,9 +5102,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr "{0} completat în {1}"
-
msgid "Enlarge"
msgstr ""
@@ -5219,82 +5240,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5460,6 +5405,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5519,7 +5540,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6913,212 +6934,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8224,6 +8245,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9712,6 +9736,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9724,9 +9751,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9823,14 +9847,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9843,6 +9859,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10833,6 +10852,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10845,6 +10867,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10857,6 +10891,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10918,6 +10955,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10936,9 +10978,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12133,6 +12182,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13169,6 +13224,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Salvează nume utilizator şi parolă (necriptate)"
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13190,12 +13251,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14155,6 +14210,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14643,13 +14701,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14673,7 +14734,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14724,7 +14788,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14733,10 +14797,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14772,6 +14848,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14817,10 +14899,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14853,34 +14941,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14919,6 +15047,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14952,9 +15086,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -15011,9 +15142,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15041,9 +15169,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15077,9 +15202,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15116,19 +15286,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15191,9 +15370,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15227,12 +15418,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15359,9 +15572,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15371,6 +15581,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15392,12 +15616,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15419,6 +15661,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15461,6 +15706,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15482,6 +15730,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15497,6 +15751,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15524,9 +15781,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15548,9 +15850,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15560,9 +15859,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15874,7 +16170,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15962,6 +16258,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18358,6 +18657,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19406,6 +19708,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19472,6 +19780,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20415,31 +20729,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -21031,6 +21333,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22324,6 +22630,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23137,9 +23446,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24184,6 +24490,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24275,6 +24584,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24351,6 +24666,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24375,6 +24695,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25148,6 +25471,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25190,7 +25523,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25993,6 +26326,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26034,8 +26370,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27633,6 +27969,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29794,9 +30189,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29954,9 +30346,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -30014,6 +30403,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30211,9 +30603,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/ru.po b/i18n/po/ru.po
index 2b53024..7460739 100644
--- a/i18n/po/ru.po
+++ b/i18n/po/ru.po
@@ -7,17 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-06 22:51+0100\n"
-"PO-Revision-Date: 2016-11-01 07:58+0000\n"
-"Last-Translator: Nkolay Parukhin <parukhin at gmail.com>\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
+"PO-Revision-Date: 2017-01-06 18:58+0000\n"
+"Last-Translator: Aleksey Kabanov <Unknown>\n"
"Language-Team: Koptev Oleg <koptev.oleg at gmail.com>\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%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: 2016-11-07 05:05+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:10+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: ru_RU\n"
msgid "Use OAuth"
@@ -74,9 +74,15 @@ msgstr "Создание основного меню"
msgid "Help"
msgstr "Справка"
+msgid "Initializing internal boundaries data"
+msgstr "Инициализация внутренних данных о границах"
+
msgid "Initializing OSM API"
msgstr "Инициализация API OSM"
+msgid "Initializing internal traffic data"
+msgstr "Инициализация внутренних данных о дорожном движении"
+
msgid "Initializing validator"
msgstr "Инициализация валидатора"
@@ -224,6 +230,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr "Выделить на карте объекты, выбранные в списке вверху."
+msgid "Select WMS layers"
+msgstr "Выбрать WMS слои"
+
+msgid "Add layers"
+msgstr "Добавить слои"
+
msgid "Add imagery layer {0}"
msgstr "Добавить слой снимка {0}"
@@ -245,12 +257,6 @@ msgstr "Ошибка"
msgid "Select image format for WMS layer"
msgstr "Выберите формат изображения для WMS слоя"
-msgid "Select WMS layers"
-msgstr "Выбрать WMS слои"
-
-msgid "Add layers"
-msgstr "Добавить слои"
-
msgid "Add Node..."
msgstr "Добавить точку..."
@@ -767,6 +773,9 @@ msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
"Открывает диалоговое окно, которое позволяет перейти к определенной местности"
+msgid "Jump to Position"
+msgstr "Перейти к позиции"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Введите Широту/Долготу, чтобы перейти к позиции."
@@ -788,9 +797,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Перейти туда"
-msgid "Jump to Position"
-msgstr "Перейти к позиции"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Невозможно разобрать широту, долготу и масштаб. Пожалуйста, проверьте."
@@ -848,6 +854,9 @@ msgstr "Объединить слои..."
msgid "Merge the current layer into another layer"
msgstr "Объединить текущий слой с другим слоем"
+msgid "{0} completed in {1}"
+msgstr "{0} завершено за {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Объединение слоёв с различными политиками передачи на сервер"
@@ -1028,24 +1037,30 @@ msgstr[2] "Открытие {0} файлов..."
msgid "Opening file ''{0}'' ..."
msgstr "Открытие файла ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr "Что нужно сделать?"
+
+msgid "Ok"
+msgstr "Ok"
+
msgid "Open Location..."
msgstr "Открыть адрес..."
msgid "Open an URL."
msgstr "Открыть ссылку."
-msgid "Separate Layer"
-msgstr "На отдельный слой"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Отметьте, если данные должны быть скачаны в новый слой"
-
msgid "Enter URL to download:"
msgstr "Введите URL для скачивания с сервера:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Введите URL, откуда должны быть скачаны данные"
+msgid "Separate Layer"
+msgstr "На отдельный слой"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Отметьте, если данные должны быть скачаны в новый слой"
+
msgid "Download Location"
msgstr "Скачивание по ссылке"
@@ -1061,12 +1076,6 @@ msgstr "Закрыть диалог и отменить скачивание"
msgid "Download Data"
msgstr "Скачать данные"
-msgid "Which tasks to perform?"
-msgstr "Что нужно сделать?"
-
-msgid "Ok"
-msgstr "Ok"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1937,9 +1946,6 @@ msgstr "Запросить и скачать с сервера пакеты пр
msgid "Errors during download"
msgstr "Ошибки при скачивании с сервера"
-msgid "Download Geo URL"
-msgstr "Скачать Geo URL"
-
msgid "Download GPS"
msgstr "Скачать GPS данные"
@@ -4357,9 +4363,6 @@ msgstr "Линия стиля \"полигон\" не замкнута"
msgid "No outer way for multipolygon"
msgstr "У мультиполигона отсутствует внешняя линия"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "Роль для ''{0}'' должна быть ''{1}''"
-
msgid "No area style for multipolygon"
msgstr "Отсутствует стиль области для мультиполигона"
@@ -4400,12 +4403,27 @@ msgstr "Стиль области на внешней линии"
msgid "Multipolygon is not closed"
msgstr "Мультиполигон не замкнут"
-msgid "Multipolygon inner way is outside"
-msgstr "Внутренняя линия мультиполигона находится за его пределами"
+msgid "Multipolygon rings share node(s)"
+msgstr "Контуры мультиполигона имеют общие точки"
msgid "Intersection between multipolygon ways"
msgstr "Пересечение между линиями мультиполигона"
+msgid "Multipolygon rings are equal"
+msgstr "Контуры мультиполигона одинаковы"
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "Роль для ''{0}'' должна быть ''{1}''"
+
+msgid "Multipolygon inner way is outside"
+msgstr "Внутренняя линия мультиполигона находится за его пределами"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr "Контур мультиполигона содержит один и тот же сегмент дважды"
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr "Внешняя линия мультиполигона имеет общие сегменты с другим контуром"
+
msgid "No useful role for multipolygon member"
msgstr "Роль для участника мультиполигона задана неудачно"
@@ -5119,12 +5137,18 @@ msgstr "Отключить доступ к указанным ресурсам (
msgid "options provided as Java system properties"
msgstr "системные настройки Java"
+msgid "Change the JOSM directory name"
+msgstr "Изменить имя каталога JOSM"
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/PATH/TO/JOSM/PREF "
msgid "Set the preferences directory"
msgstr "Указать каталог настроек"
+msgid "Default: {0}"
+msgstr "По умолчанию: {0}"
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/PATH/TO/JOSM/USERDATA"
@@ -5141,10 +5165,10 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/PATH/TO/JOSM/HOMEDIR "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Переместить все 3 каталога в homedir. Каталог кэша будет в homedir/cache"
+"Задать каталог настроек+данных+кэша (каталогом кэша будет josm.home/cache)"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5501,9 +5525,6 @@ msgstr "Нажмите, для запуска задачи в фоновом р
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} завершено за {1}"
-
msgid "Enlarge"
msgstr "Расширить"
@@ -5649,88 +5670,6 @@ msgstr "Фон конфликта: убрать участника"
msgid "Conflict foreground: remove member"
msgstr "Передний план конфликта: убрать участника"
-msgid "My with Their"
-msgstr "Мою с их"
-
-msgid "My with Merged"
-msgstr "Мою с объединённой"
-
-msgid "Their with Merged"
-msgstr "Их с объединённой"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "роль {0} не участвует в паре сравнения {1}"
-
-msgid "Properties"
-msgstr "Параметры"
-
-msgid "Tags"
-msgstr "Теги"
-
-msgid "Nodes"
-msgstr "Точки"
-
-msgid "Members"
-msgstr "Участники"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Нет конфликтов тегов"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Теги({0} конфликт)"
-msgstr[1] "Теги({0} конфликта)"
-msgstr[2] "Теги({0} конфликтов)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "Предстоит уладить {0} отложенный конфликт тегов"
-msgstr[1] "Предстоит уладить {0} отложенных конфликта тегов"
-msgstr[2] "Предстоит уладить {0} отложенных конфликтов тегов"
-
-msgid "Nodes(resolved)"
-msgstr "Точки (без конфликтов)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Список объединённых точек заморожен. Нет неулаженных конфликтов в списке "
-"точек этой линии."
-
-msgid "Nodes(with conflicts)"
-msgstr "Точки (с конфликтами)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Неулаженные конфликты в списке точек этой линии"
-
-msgid "Members(resolved)"
-msgstr "Члены (без конфликтов)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Объединённый список участников отношения заморожен. Нет неулаженных "
-"конфликтов в списке участников этого отношения."
-
-msgid "Members(with conflicts)"
-msgstr "Участники отношения (с конфликтами)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Неулаженные конфликты в списке участников этого отношения"
-
-msgid "No pending property conflicts"
-msgstr "Нет актуальных конфликтов свойств"
-
-msgid "Properties(with conflicts)"
-msgstr "Свойства (с конфликтами)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Конфликты свойств, ожидающие улаживания"
-
-msgid "Conflict Resolution"
-msgstr "Конфликт в разрешении изображения"
-
msgid "{0} more..."
msgstr "Ещё {0} ..."
@@ -5919,6 +5858,88 @@ msgstr[0] "Их версия ({0} запись)"
msgstr[1] "Их версия ({0} записей)"
msgstr[2] "Их версия ({0} записей)"
+msgid "My with Their"
+msgstr "Мою с их"
+
+msgid "My with Merged"
+msgstr "Мою с объединённой"
+
+msgid "Their with Merged"
+msgstr "Их с объединённой"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "роль {0} не участвует в паре сравнения {1}"
+
+msgid "Properties"
+msgstr "Параметры"
+
+msgid "Tags"
+msgstr "Теги"
+
+msgid "Nodes"
+msgstr "Точки"
+
+msgid "Members"
+msgstr "Участники"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Нет конфликтов тегов"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Теги({0} конфликт)"
+msgstr[1] "Теги({0} конфликта)"
+msgstr[2] "Теги({0} конфликтов)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "Предстоит уладить {0} отложенный конфликт тегов"
+msgstr[1] "Предстоит уладить {0} отложенных конфликта тегов"
+msgstr[2] "Предстоит уладить {0} отложенных конфликтов тегов"
+
+msgid "Nodes(resolved)"
+msgstr "Точки (без конфликтов)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Список объединённых точек заморожен. Нет неулаженных конфликтов в списке "
+"точек этой линии."
+
+msgid "Nodes(with conflicts)"
+msgstr "Точки (с конфликтами)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Неулаженные конфликты в списке точек этой линии"
+
+msgid "Members(resolved)"
+msgstr "Члены (без конфликтов)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Объединённый список участников отношения заморожен. Нет неулаженных "
+"конфликтов в списке участников этого отношения."
+
+msgid "Members(with conflicts)"
+msgstr "Участники отношения (с конфликтами)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Неулаженные конфликты в списке участников этого отношения"
+
+msgid "No pending property conflicts"
+msgstr "Нет актуальных конфликтов свойств"
+
+msgid "Properties(with conflicts)"
+msgstr "Свойства (с конфликтами)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Конфликты свойств, ожидающие улаживания"
+
+msgid "Conflict Resolution"
+msgstr "Конфликт в разрешении изображения"
+
msgid "Node"
msgstr "Точка"
@@ -5982,10 +6003,8 @@ msgstr "Роль"
msgid "Primitive"
msgstr "Элемент"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"Объединённые точки ещё не заблокированы. Невозможно построить команду "
-"устранения конфликтов"
msgid "<undefined>"
msgstr "<не определено>"
@@ -7513,102 +7532,6 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr "Выбрать пакеты правок в указанных границах"
-msgid "Query open changesets only"
-msgstr "Запросить только открытые пакеты правок"
-
-msgid "Query closed changesets only"
-msgstr "Запросить только закрытые пакеты правок"
-
-msgid "Query both open and closed changesets"
-msgstr "Запросить открытые и закрытые пакеты правок"
-
-msgid "Only changesets owned by myself"
-msgstr "Только мои пакеты правок"
-
-msgid "User ID:"
-msgstr "ID пользователя:"
-
-msgid "User name:"
-msgstr "Имя пользователя:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Только пакеты правок пользователя с идентификатором"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "Только пакеты правок пользователя с именем"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Только мои пакеты правок (отключено. JOSM сейчас запущен анонимным "
-"пользователем)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Невозможно выбрать пакеты правок текущего пользователя, поскольку текущий "
-"пользователь - анонимный"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "Неверное текущее значение ''{0}'' для ID пользователя"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"Невозможно ограничить запрос пакета правок для пользователя с именем ''{0}''"
-
-msgid "Please enter a valid user ID"
-msgstr "Пожалуйста, введите правильный ID пользователя"
-
-msgid "Invalid user ID"
-msgstr "Неверный ID пользователя"
-
-msgid "Please enter a non-empty user name"
-msgstr "Пожалуйста, введите имя пользователя"
-
-msgid "Invalid user name"
-msgstr "Неверное имя пользователя"
-
-msgid "Date: "
-msgstr "Дата: "
-
-msgid "Time:"
-msgstr "Время:"
-
-msgid "Closed after - "
-msgstr "Закрыт после - "
-
-msgid "Date:"
-msgstr "Дата:"
-
-msgid "Created before - "
-msgstr "Создан до - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Только пакеты правок, закрытые после даты/времени"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-"Только пакеты правок, закрытые после и открытые до указанной даты/времени"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"Невозможно выполнить запрос пакета правок на основе ограничений по времени. "
-"Введено неверное значение."
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr ""
-"<html>Пожалуйста, укажите правильные значения для даты/времени, чтобы "
-"ограничить<br>запрос указанными временными рамками.</html>"
-
-msgid "Invalid date/time values"
-msgstr "Неверные значения даты/времени"
-
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
"invalid."
@@ -7625,29 +7548,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Неверная граница выбора"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"Текущее значение это неверный ID пользователя. Пожалуйста, введите целое "
-"значение > 0"
-
-msgid "Please enter an integer value > 0"
-msgstr "Введите целое число > 0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Пожалуйста, введите дату в обычном формате для вашего региона.<br>Пример: "
-"{0}<br>Пример: {1}<br>Пример: {2}<br>Пример: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Пожалуйста, введите правильное время в обычном формате для вашего "
-"региона.<br>Пример: {0}<br>Пример: {1}<br>Пример: {2}<br>Пример: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Скачать с сервера только мои пакеты правок"
@@ -7737,26 +7637,145 @@ msgstr "Неверный URL для запроса пакета правок"
msgid "Close the dialog and abort querying of changesets"
msgstr "Закрыть диалог и прекратить формирование запросов пакетов правок"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Пожалуйста, введите дату в обычном формате для вашего региона.<br>Пример: "
+"{0}<br>Пример: {1}<br>Пример: {2}<br>Пример: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Запросить только открытые пакеты правок"
+
+msgid "Query closed changesets only"
+msgstr "Запросить только закрытые пакеты правок"
+
+msgid "Query both open and closed changesets"
+msgstr "Запросить открытые и закрытые пакеты правок"
+
+msgid "Date: "
+msgstr "Дата: "
+
+msgid "Time:"
+msgstr "Время:"
+
+msgid "Closed after - "
+msgstr "Закрыт после - "
+
+msgid "Date:"
+msgstr "Дата:"
+
+msgid "Created before - "
+msgstr "Создан до - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Только пакеты правок, закрытые после даты/времени"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+"Только пакеты правок, закрытые после и открытые до указанной даты/времени"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Невозможно выполнить запрос пакета правок на основе ограничений по времени. "
+"Введено неверное значение."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Пожалуйста, укажите правильные значения для даты/времени, чтобы "
+"ограничить<br>запрос указанными временными рамками.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Неверные значения даты/времени"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Пожалуйста, введите правильное время в обычном формате для вашего "
+"региона.<br>Пример: {0}<br>Пример: {1}<br>Пример: {2}<br>Пример: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"Текущее значение это неверный ID пользователя. Пожалуйста, введите целое "
+"значение > 0"
+
+msgid "Please enter an integer value > 0"
+msgstr "Введите целое число > 0"
+
msgid "URL: "
msgstr "URL: "
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+"Пожалуйста, введите или вставьте URL для получения пакетов правок из OSM API."
+
+msgid "Examples"
+msgstr "Примеры"
+
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+"Обратите внимание, что запросы пакетов правок в настоящее время всегда "
+"направляются в ''{0}'', независимо от хоста, порта и пути URL, введённых "
+"ниже."
+
+msgid "This changeset query URL is invalid"
+msgstr "Неправильный URL запроса пакета правок"
+
+msgid "Only changesets owned by myself"
+msgstr "Только мои пакеты правок"
+
+msgid "User ID:"
+msgstr "ID пользователя:"
+
+msgid "User name:"
+msgstr "Имя пользователя:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Только пакеты правок пользователя с идентификатором"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "Только пакеты правок пользователя с именем"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Только мои пакеты правок (отключено. JOSM сейчас запущен анонимным "
+"пользователем)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Невозможно выбрать пакеты правок текущего пользователя, поскольку текущий "
+"пользователь - анонимный"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "Неверное текущее значение ''{0}'' для ID пользователя"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-"Пожалуйста, введите или вставьте URL для получения пакетов правок из OSM API."
+"Невозможно ограничить запрос пакета правок для пользователя с именем ''{0}''"
-msgid "Examples"
-msgstr "Примеры"
+msgid "Please enter a valid user ID"
+msgstr "Пожалуйста, введите правильный ID пользователя"
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
-msgstr ""
-"Обратите внимание, что запросы пакетов правок в настоящее время всегда "
-"направляются в ''{0}'', независимо от хоста, порта и пути URL, введённых "
-"ниже."
+msgid "Invalid user ID"
+msgstr "Неверный ID пользователя"
-msgid "This changeset query URL is invalid"
-msgstr "Неправильный URL запроса пакета правок"
+msgid "Please enter a non-empty user name"
+msgstr "Пожалуйста, введите имя пользователя"
+
+msgid "Invalid user name"
+msgstr "Неверное имя пользователя"
msgid "Activate"
msgstr "Активировать"
@@ -8969,6 +8988,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr "Редактор"
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10700,6 +10722,9 @@ msgstr "Направление"
msgid "Velocity, {0}"
msgstr "Скорость, {0}"
+msgid "Wave Audio files (*.wav)"
+msgstr "Аудиофайлы Wave (*.wav)"
+
msgid "Import Audio"
msgstr "Импортировать аудиофайлы"
@@ -10715,9 +10740,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Импорт невозможен"
-msgid "Wave Audio files (*.wav)"
-msgstr "Аудиофайлы Wave (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Аудиомаркеры из {0}"
@@ -10832,17 +10854,6 @@ msgstr "(по ссылке: "
msgid "Select the map painting styles"
msgstr "Выберите стили отрисовки карты"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "Не удалось загрузить стили Mappaint из ''{0}''. Ошибка: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-"JOSM больше не поддерживает стили mappaint, написанные в старом формате "
-"XML.\n"
-"Обновите ''{0}'' на MapCSS"
-
msgid "loading style ''{0}''..."
msgstr "загрузка стиля ''{0}''..."
@@ -10862,6 +10873,9 @@ msgstr[2] ""
"Произошло {0} ошибок при загрузке стиля. Подробности смотрите в пункте "
"\"Информация\" из контекстного меню."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "Не удалось загрузить стили Mappaint из ''{0}''. Ошибка: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Не удалось выполнить разбор стилей Mappaint из ''{0}''. Ошибка: {1}"
@@ -11978,6 +11992,9 @@ msgstr ""
msgid "Track date"
msgstr "Дата трека"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Одним цветом (может быть определено для именованных слоёв)"
@@ -11990,6 +12007,18 @@ msgstr "Вело"
msgid "Foot"
msgstr "Пешком"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Лес"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Создать маркеры при чтении GPX"
@@ -12002,6 +12031,9 @@ msgstr "Динамический цветовой диапазон на осно
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Сглаживать GPX треки"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -12069,6 +12101,11 @@ msgid ""
msgstr "Применить сглаживание к GPX линиям, чтобы улучшить их вид."
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -12091,9 +12128,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "Раскрасить точки и сегменты трека по меткам времени."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr "Позволяет настраивать окраску трека для различных средних скоростей."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Раскрасить треки и точки"
@@ -13396,6 +13440,12 @@ msgstr "Проверка на ошибки религиозных объекто
msgid "Checks for errors on relations"
msgstr "Проверка ошибок в отношениях"
+msgid "Territories"
+msgstr "Территории"
+
+msgid "Checks for territories-specific features"
+msgstr "Проверка на свойства, специфичные для отдельных территорий"
+
msgid "Unnecessary tags"
msgstr "Ненужные теги"
@@ -14551,6 +14601,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Сохранить имя пользователя и пароль (не зашифровано)"
+msgid "Assume"
+msgstr "Присвоить"
+
+msgid "Existing values"
+msgstr "Существующие значения"
+
msgid "<delete from {0} objects>"
msgstr "<удалить из {0} объектов>"
@@ -14572,12 +14628,6 @@ msgstr "Добавить помеченные теги к выделенным
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Enter: добавить все теги к выделенным объектам"
-msgid "Assume"
-msgstr "Присвоить"
-
-msgid "Existing values"
-msgstr "Существующие значения"
-
msgid "Enable the checkbox to accept the value"
msgstr "Поставьте флажок чтобы применить значение"
@@ -15796,6 +15846,9 @@ msgstr ""
"Автоустранён конфликт Горячих клавиш: ''{0}'' переназначено с ''{1}'' на "
"''{2}''."
+msgid "Unknown territory id: {0}"
+msgstr "Неизвестный идентификатор территории: {0}"
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "В буфере найден {0} тег, это подозрительно!"
@@ -16322,14 +16375,17 @@ msgstr "Спутниковые снимки Mapbox"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr "Рельеф от Thunderforest"
+
msgid "OpenSeaMap"
msgstr "OpenSeaMap"
-msgid "OpenStreetMap Carto (Standard layer)"
-msgstr "OpenStreetMap Carto (cтандартный слой)"
+msgid "OpenStreetMap Carto (Standard)"
+msgstr "OpenStreetMap Carto (стандартный)"
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik чёрно-белый)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr "OpenStreetMap (стандартный чёрно-белый)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, без подписей)"
@@ -16352,8 +16408,11 @@ msgstr "Hike & Bike"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Камбоджа, Лаос, Таиланд, Вьетнам 2-язычная"
+msgid "Stamen Terrain"
+msgstr "Рельеф от Stamen"
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr "Камбоджа, Лаос, Таиланд, Вьетнам, Мьянма (двуязычная)"
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (оверлей)"
@@ -16403,8 +16462,8 @@ msgstr "OSM Inspector: места"
msgid "OSM Inspector: Highways"
msgstr "OSM Inspector: дороги"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM Inspector: мультиполигоны"
+msgid "OSM Inspector: Area"
+msgstr "OSM Inspector: области"
msgid "OSM Inspector: Routing"
msgstr "OSM Inspector: маршруты"
@@ -16412,11 +16471,24 @@ msgstr "OSM Inspector: маршруты"
msgid "OSM Inspector: Addresses"
msgstr "OSM Inspector: адреса"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM Inspector: границы (ЕС)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr "OSM Inspector: береговая линия (ЕС)"
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr "Снимки с imagico.de: горный массив Проклетие"
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr "Снимки с imagico.de: «Южные» Трансантарктические горы"
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr "Снимки с imagico.de: горы Пенсакола"
-msgid "IGN Argentina (WMTS)"
-msgstr "IGN Аргентина (WMTS)"
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+"Снимки с imagico.de: остров Мордвинова (Элефант)/остров Шишкова (Кларенс)"
+
+msgid "IGN Argentina (TMS)"
+msgstr "IGN Аргентина (TMS)"
msgid "IGN Argentina (WMS)"
msgstr "IGN Аргентина (WMS)"
@@ -16451,6 +16523,12 @@ msgstr "LPI NSW административные границы государс
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr "LPI NSW административные границы охраняемых природных зон NPWS"
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr "Снимки с imagico.de: северо-запад острова Херд"
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr "Снимки с imagico.de: побережье острова Херд"
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -16496,11 +16574,17 @@ msgstr "VoGIS: план зонирования"
msgid "VoGIS: Höhen und Gelände"
msgstr "VoGIS: высоты и рельеф местности"
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
-msgstr "AGIV (Фландрия) самые новые аэрофотоснимки (зима)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr "Снимки с imagico.de: горные массивы Рила и Пирин"
-msgid "AGIV aerial imagery 10cm 2013-15"
-msgstr "AGIV аэрофото 10 см 2013-15"
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr "AGIV Фландрия - самые новые аэрофотоснимки"
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
+msgstr "AGIV Фландрия - аэрофотосъемка 2013-2015, 10см"
+
+msgid "AGIV Flanders GRB"
+msgstr "AGIV Фландрия GRB"
msgid "URBISfr numerical imagery (2013)"
msgstr "URBISfr - цифровое изображение (2013)"
@@ -16535,8 +16619,17 @@ msgstr "SPW(allonie) 2009-2010 аэрофотосъёмка"
msgid "TEC bus lines (2014)"
msgstr "TEC автобусные маршруты (2014)"
-msgid "Benin:cotonou_pleiade_2016"
-msgstr "Бенин: Котону, Pleiade 2016"
+msgid "TEC bus stops (2014)"
+msgstr "Автобусные остановки TEC (2014)"
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr "Бенин: Котону 2016 (Pleiade)"
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr "Снимки с imagico.de: Котону"
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr "Снимки с imagico.de: остров Буве"
msgid "IBGE Mapa de Setores Urbanos"
msgstr "IBGE: карта городских районов"
@@ -16544,6 +16637,15 @@ msgstr "IBGE: карта городских районов"
msgid "IBGE Mapa de Setores Rurais"
msgstr "IBGE: карта сельских районов"
+msgid "IBGE Distrito Federal"
+msgstr "IBGE Федеральный округ"
+
+msgid "Rio Mosaic 2013"
+msgstr "Рио, мозаика 2013"
+
+msgid "Rio Mosaic 2015"
+msgstr "Рио, мозаика 2015"
+
msgid "Geobase Hydrography"
msgstr "Geobase (гидрография)"
@@ -16556,12 +16658,34 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "Мозаика Британской Колумбии"
+msgid "Latest southwest British Columbia Landsat"
+msgstr "Последние снимки Landsat юго-запада Британской Колумбии"
+
msgid "Kelowna 2012"
msgstr "Келоуна 2012"
msgid "Kelowna Roads overlay"
msgstr "Келоуна - оверлей дорог"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr "Снимки с imagico.de: восточное побережье острова Девон"
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr "Снимки с imagico.de: север острова Элсмир"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr "Снимки с imagico.de: остров Элсмир, июль 2016"
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr "Снимки с imagico.de: остров Фогу, Кабо-Верде"
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr "Снимки с imagico.de: остров Лондондерри"
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr "Снимки с imagico.de: вулкан Кальбуко"
+
msgid "Czech CUZK:KM"
msgstr "Чехия CUZK:KM"
@@ -16598,6 +16722,12 @@ msgstr "Стевнс (Дания)"
msgid "Vejmidte (Denmark)"
msgstr "Vejmidte (Дания)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr "Снимки с imagico.de: вулкан Алтар"
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Эстония: базовая карта (Maaamet)"
@@ -16631,9 +16761,6 @@ msgstr "Кадастр"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr "CRAIG - Овернь 2013 - 25 см"
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Приморские Альпы 2009 - 40 см"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "Большой Нанси: ортофото 2012"
@@ -16690,9 +16817,6 @@ msgid ""
"- 1 m"
msgstr "Веркор - заповедник горного массива Веркор - ортофото 1999 - 1 м"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (лужицкий язык)"
-
msgid "Hamburg (40 cm)"
msgstr "Гамбург (40 см)"
@@ -16720,9 +16844,6 @@ msgstr "Берлин - аэрофотосъёмка 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Берлин - аэрофотосъёмка 2016"
-msgid "Stuttgart (aerial imagery)"
-msgstr "Штутгарт (аэрофотосъёмка)"
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Эрланген - аэрофотосъёмка (2016 5.0 cm)"
@@ -16756,9 +16877,59 @@ msgstr "NRW-Atlas: топографическая карта 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Городская агломерация Рур: аэрофотосъёмка (10 см)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr "Снимки с imagico.de: прибрежные отмели Северной Германии"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+"Снимки с imagico.de: прибрежные отмели Северной Германии (инфракрасные "
+"снимки)"
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr "Снимки с imagico.de: Касигианнгуит"
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr "Снимки с imagico.de: авиабаза Туле"
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+"Снимки с imagico.de: авиабаза Туле - DMS, облёт на низкой высоте, сентябрь "
+"2015"
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr "Снимки с imagico.de: авиабаза Туле - DMS, облёт в сентябре 2015"
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr "Снимки с imagico.de: авиабаза Туле - DMS, облёт в октябре 2015"
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr "Снимки с imagico.de: мозаика Гренландии"
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr "Снимки с imagico.de: Landsat не в надире (май 2013)"
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr "Снимки с imagico.de: Landsat не в надире (июль 2016)"
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr "Снимки с imagico.de: север Гренландии (ASTER)"
+
msgid "Drone Imagery (Haiti)"
msgstr "Снимки с дрона (Гаити)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+"Временно недоступно (предположительно, до января 2017) из-за смены сервера."
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Снимки с дрона 2014 (Гаити)"
@@ -16795,14 +16966,8 @@ msgstr "Разлив Дуная - ортофото 2013"
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Русло Дуная в Будапеште, Сентендре и Сигетмоносторе"
-msgid "Budapest district XII ortophoto 2013"
-msgstr "Будапешт, округ XII - ортофото 2013"
-
-msgid "Interspect Budapest ortophoto 2014"
-msgstr "Interspect - Будапешт, ортофото 2014"
-
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
-msgstr "Пять округов Будапешта: III, IV, XIII, XIV, XV"
+msgid "Budapest district XI ortophoto 2015"
+msgstr "Будапешт, район XI - ортофото 2015"
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Венгрия (маршруты пешего туризма)"
@@ -16810,6 +16975,21 @@ msgstr "OpenStreetMap Венгрия (маршруты пешего туризм
msgid "Hillshade Hungary"
msgstr "Венгрия: отмывка рельефа"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgstr "Снимки с imagico.de: восток Исландии"
+
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr "Снимки с imagico.de: Качский Ранн"
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr "Снимки с imagico.de: юго-восток Сулавеси"
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr "Снимки с imagico.de: водохранилище Бакун"
+
+msgid "imagico.de OSM images for mapping: Batam"
+msgstr "Снимки с imagico.de: Батам"
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ирландия, British War Office 1:25000 GSGS 3906"
@@ -16870,9 +17050,21 @@ msgstr "PCN 2012 - Италия"
msgid "South Tyrol Orthofoto 2011"
msgstr "Южный Тироль - ортофото 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr "Южный Тироль ортофото 2011 (высокое разрешение)"
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr "Южный Тироль - ортофото 2014"
+
msgid "South Tyrol Topomap"
msgstr "Южный Тироль - топокарта"
+msgid "Japan GSI ortho Imagery"
+msgstr "Япония: ортоснимки GSI"
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "СССР - Латвия"
@@ -16906,12 +17098,36 @@ msgstr "Дельта Нигера, окт. 2012 Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Шпицберген - ортофото 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr "Снимки с imagico.de: западная часть Каракорума"
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Сектор Газа - со спутников Pléiades - 06.07.2014"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Сектор Газа - со спутников Pléiades - 06.07.2014 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr "Снимки с imagico.de: Панамский канал"
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr "Снимки с imagico.de: Ванатинаи"
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr "Снимки с imagico.de: Новая Ирландия"
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+"Снимки с imagico.de: хребет Кордильера-де-Вильканота и ледниковая шапка "
+"Келькайя"
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Пангасинан/Булакан (Филлипины HiRes)"
@@ -17038,9 +17254,6 @@ msgstr "Свентохловице: ортофотокарта 2012"
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Забже: ортофото 2011"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: трассы"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr "Вроцлав: ортофото 2015 (аэрофотосъёмка)"
@@ -17050,6 +17263,20 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr "Снимки с imagico.de: Керченский пролив"
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr "Снимки с imagico.de: остров Ушакова, август 2016"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr "Снимки с imagico.de: Северный и Полярный Урал, август 2016"
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk (автомобильная)"
@@ -17071,12 +17298,30 @@ msgstr "RABA-KGZ: Словения - использование сельхозз
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr "RABA-KGZ: Словения - области застройки"
+msgid "City of Cape Town 2013 Aerial"
+msgstr "Городской округ Кейптаун: аэросъёмка 2013"
+
msgid "City of Cape Town 2015 Aerial"
msgstr "Кейптаун, аэрофотосъёмка 2015"
msgid "South Africa CD:NGI Aerial"
msgstr "Южная Африка CD:NGI аэрофотосъёмка"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr "Снимки с imagico.de: остров Лескова (ASTER)"
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr "Снимки с imagico.de: остров Скотта"
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr "Снимки с imagico.de: остров Лескова (Landsat)"
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr "Снимки с imagico.de: Скалы Клерк"
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr "Снимки с imagico.de: Скалы Шаг"
+
msgid "Catastro Spain"
msgstr "Кадастровая карта Испании"
@@ -17098,6 +17343,9 @@ msgstr "IDEIB - Балеарские острова"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Канарские острова"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Кантон Аргау 25см (AGIS 2011)"
@@ -17141,6 +17389,9 @@ msgstr "Кантон Фрибур 50см (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Город Берн 10см/25см (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr "Город Берн 10см (2016)"
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / ортофото Ивердон-Ле-Бен 25см (2007)"
@@ -17162,6 +17413,12 @@ msgstr "Бонвиллар - ортофото 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Фиез - ортофото 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr "Кантон Базель-Штадт 2015"
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr "Тайвань - e-Map Open Data"
@@ -17177,6 +17434,9 @@ msgstr "Тайвань - данные о земельных участках"
msgid "NLSC Open Data WMTS"
msgstr "NLSC Open Data WMTS"
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "MSR Maps Topo"
@@ -17204,9 +17464,54 @@ msgstr "Северная Каролина: последние ортоснимк
msgid "U.S. Forest Service roads"
msgstr "U.S. Forest Service - дороги"
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr "Снимки с imagico.de: Аляскинский хребет"
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr "NJ 2015 аэрофотосъёмка (инфракрасная)"
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr "NJ 2015 аэрофотосъёмка (естественные цвета)"
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr "Метрополитенский ареал Сан-Хуан: ортосъёмка 2013 USACE"
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr "Округ Сан-Хуан (Вашингтон) - аэрофотосъёмка 2013"
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr "Векторная карта улиц округа Сан-Хуан (Вашингтон)"
+
+msgid "Texas Orthophoto"
+msgstr "Ортофото Техаса"
+
+msgid "Philadelphia 2015 Imagery"
+msgstr "Филадельфия - снимки 2015"
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr "Мэриленд: снимки 6 дюймов, 2014"
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr "Мэриленд: снимки 3 дюйма"
+
+msgid "MD Transportation Basemap"
+msgstr "Мэриленд: базовая карта транспорта"
+
+msgid "Delaware 2012 Orthophotography"
+msgstr "Делавэр - ортофото 2012"
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr "Снимки с imagico.de: горы Рувензори"
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr "Снимки с imagico.de: горы Рувензори, 2016"
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Украина - ортофото 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr "Доступно только в Украине или через украинский прокси-сервер."
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr "Украина - Киев 2014 (DZK)"
@@ -17228,9 +17533,6 @@ msgstr "Суррей, аэросъёмка"
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-дюймовая карта Шотландии 1842-82"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr "NLS - OS 6-дюймовая County Series 1888-1913"
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25000 1-й выпуск 1937-61"
@@ -17240,9 +17542,6 @@ msgstr "NLS - OS 1-дюймовая 7-й выпуск 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr "NLS - OS 25-дюймовая (Шотландия) 1892-1905"
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25000 историческая (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "OS 1:25000 историческая (OSM-Limited)"
@@ -17577,7 +17876,7 @@ msgstr "Подкачивает новые данные при панорамир
msgid "Create a grid of ways."
msgstr "Создаёт сетку из линий."
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr "Настройка остановок общественного транспорта."
msgid ""
@@ -17686,6 +17985,9 @@ msgstr "Простой инструмент для нумерации домов
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "Создание XML границы снимков из мультиполигона"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr "Экспортирует квадраты из кэша слоя подложки в файловую систему."
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -20207,6 +20509,9 @@ msgstr "Ручей"
msgid "River"
msgstr "Река"
+msgid "Lock"
+msgstr "Шлюз"
+
msgid "Canal"
msgstr "Канал"
@@ -21262,6 +21567,12 @@ msgstr "Мотель"
msgid "Guest House/Bed & Breakfast"
msgstr "Гостевой дом/Bed & Breakfast"
+msgid "Apartment"
+msgstr "Меблированные квартиры"
+
+msgid "Number of apartments"
+msgstr "Число квартир"
+
msgid "Chalet"
msgstr "Съёмный домик (шале)"
@@ -21328,6 +21639,12 @@ msgstr "Столики на улице"
msgid "Takeaway"
msgstr "Блюда на вынос"
+msgid "Delivery"
+msgstr "Доставка"
+
+msgid "Mo-Su 12:00-22:00"
+msgstr "Mo-Su 12:00-22:00"
+
msgid "Fast Food"
msgstr "Ресторан быстрого питания"
@@ -22271,31 +22588,19 @@ msgstr "укрытие_от_пожара"
msgid "Hunting Stand"
msgstr "Охотничья вышка"
-msgid "Height"
-msgstr "Высота"
-
-msgctxt "height"
-msgid "low"
-msgstr "низкая"
-
-msgctxt "height"
-msgid "half"
-msgstr "половинная"
-
-msgctxt "height"
-msgid "full"
-msgstr "полная"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr "Укрытие"
-msgid "Lock"
-msgstr "Запирается"
+msgid "Lockable"
+msgstr "Запирается на замок"
msgid "Water Point"
msgstr "Пункт набора воды"
+msgid "Animal watering place"
+msgstr "Водопой"
+
msgid "Compressed Air"
msgstr "Компрессор для шин"
@@ -22887,6 +23192,10 @@ msgid "hut"
msgstr "хижина"
msgctxt "building"
+msgid "bungalow"
+msgstr "бунгало"
+
+msgctxt "building"
msgid "dormitory"
msgstr "общежитие"
@@ -24182,6 +24491,9 @@ msgstr "Мясная лавка"
msgid "Seafood"
msgstr "Морепродукты"
+msgid "Dairy"
+msgstr "Молочные продукты"
+
msgid "Deli (Fine Food)"
msgstr "Деликатесы"
@@ -24999,9 +25311,6 @@ msgstr "Линия деревьев"
msgid "A line of trees."
msgstr "Ряд деревьев."
-msgid "Wood"
-msgstr "Лес"
-
msgid "Woodland where timber production does not dominate use."
msgstr "Лес, основным назначением которого не является заготовка древесины."
@@ -26070,6 +26379,9 @@ msgstr "Разное число полос движения в ключах {0}
msgid "possibly missing {0} tag"
msgstr "возможно, пропущен тег {0}"
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr "улица с нечётным числом {0}, но без {1} и {2} или {3}"
+
msgid "{0} is deprecated"
msgstr "{0} устарел"
@@ -26179,6 +26491,12 @@ msgstr "вызывающий сомнения ключ (заканчиваетс
msgid "The key {0} has an uncommon value."
msgstr "Ключ {0} имеет необычное значение."
+msgid "misspelled value"
+msgstr "значение, написанное с ошибкой"
+
+msgid "wrong value: {0}"
+msgstr "неверное значение: {0}"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} на точке. Должен использоваться на линии."
@@ -26259,6 +26577,13 @@ msgstr "Береговая линия внутри {1}"
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} должен быть точкой пересечения {1} и {2}"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+"{0} – тег для линейных водных объектов. Для обозначения площадных водоёмов "
+"используйте {1} + {2}."
+
msgid "abbreviated street name"
msgstr "сокращённое обозначение улицы"
@@ -26283,6 +26608,10 @@ msgstr "{0} использован с {1}"
msgid "street name contains ss"
msgstr "название улицы содержит ss"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+"{0} не рекомендуется, используйте {1}. Смотрите также подобные теги типа {2}"
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -27098,6 +27427,22 @@ msgstr "Передать текущий пакет правок"
msgid "Submit the current changeset to Mapillary"
msgstr "Передать текущий пакет правок в Mapillary"
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+"Не удалось отправить пакет правок по версии протокола {0} с ошибкой: ''{1} "
+"{2}''!"
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+"Произошла ошибка при попытке отправить пакет правок на сервер. Если она "
+"возникает периодически, можете отправить отчёт об ошибке через меню Справка. "
+"Если это сообщение появилось впервые, просто попробуйте ещё раз: возможно "
+"это была проблема с подключением к Интернету."
+
msgid "Upload pictures"
msgstr "Отправить снимки"
@@ -27140,8 +27485,8 @@ msgstr "Открыть диалог пакета правок Mapillary"
msgid "Mapillary changeset"
msgstr "Пакет правок Mapillary"
-msgid "Submit"
-msgstr "Передать"
+msgid "Submitting changeset to server…"
+msgstr "Отправка пакета правок на сервер…"
msgid "Export all images"
msgstr "Экспортировать все снимки"
@@ -28056,6 +28401,9 @@ msgstr ""
msgid "Area Selector"
msgstr "Автовыделение областей"
+msgid "Trying to detect an area at:"
+msgstr "Попытка распознать область в точке:"
+
msgid "Created area"
msgstr "Создана область"
@@ -28103,11 +28451,11 @@ msgid "Algorithm"
msgstr "Алгоритм"
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
-"Максимальное расстояние точки от линии (в пикселах), при котором точка всё "
-"ещё считается частью этой линии (По умолчанию: {0})."
+"Максимальное расстояние в метрах между точкой и линией, при котором точка "
+"считается принадлежащей этой линии (по умолчанию: {0})."
msgid "Distance Tolerance"
msgstr "Допуск по расстоянию"
@@ -29839,6 +30187,66 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Открыть XML файл снимков"
+msgid "Export tiles"
+msgstr "Экспортировать квадраты"
+
+msgid "Export cached tiles to file system."
+msgstr "Экспорт кэшированных квадратов подложки в файловую систему."
+
+msgid "Exporting cached tiles"
+msgstr "Экспорт кэшированных квадратов"
+
+msgid "Failed to write image file {0}: {1}"
+msgstr "Не удалось записать файл изображения {0}: {1}"
+
+msgid "Failed to write image file {0}."
+msgstr "Не удалось записать файл изображения {0}."
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] "Экспортирован {0} квадрат из слоя {1}."
+msgstr[1] "Экспортировано {0} квадрата из слоя {1}."
+msgstr[2] "Экспортировано {0} квадратов из слоя {1}."
+
+msgid "Export file system path already exists but is not a directory."
+msgstr "Путь экспорта в файловую систему уже существует, но это не каталог."
+
+msgid "Failed to create export directory: {0}"
+msgstr "Не удалось создать каталог для экспорта: {0}"
+
+msgid "Failed to create export directory."
+msgstr "Не удалось создать каталог для экспорта."
+
+msgid "Append cache name"
+msgstr "Добавить имя кэша"
+
+msgid "Export Tiles"
+msgstr "Экспортировать квадраты"
+
+msgid "Cache name:"
+msgstr "Имя кэша:"
+
+msgid "Object count:"
+msgstr "Количество объектов:"
+
+msgid "file system path"
+msgstr "путь файловой системы"
+
+msgid "File system path the tiles are exported to."
+msgstr "Путь файловой системы, по которому будут экспортироваться квадраты."
+
+msgid "Export directory:"
+msgstr "Каталог экспорта:"
+
+msgid "Append cache name to export directory."
+msgstr "Добавить имя кэша к каталогу экспорта."
+
+msgid "Tiles will be exported to directory {0}"
+msgstr "Квадраты будут экспортированы в каталог {0}"
+
+msgid "No export directory set."
+msgstr "Не задан каталог для экспорта."
+
msgid "Calibration Layer"
msgstr "Калибровочный слой"
@@ -32144,9 +32552,6 @@ msgstr "ОТ: Маршрут должен начинаться и заканчи
msgid "PT: First or last way needs to be split"
msgstr "ОТ: Первую или последнюю линию требуется разделить"
-msgid "PT: Problem in the route segment"
-msgstr "ОТ: Проблема в сегменте маршрута"
-
msgid "PT: Stop not served"
msgstr "ОТ: Отсутствуют обслуживаемые остановки"
@@ -32315,9 +32720,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr "[промежуток]"
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "Шаблоны маршрутов …"
@@ -32375,6 +32777,9 @@ msgstr "Левая сторона"
msgid "Maximum distance from route"
msgstr "Максимальная дистанция от маршрута"
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "Общественный транспорт: Изменение вида остановки"
@@ -32575,10 +32980,6 @@ msgstr "Восстановить полигон"
msgid "Multipolygon must consist only of ways"
msgstr "Мультиполигоны должны состоять только из линий"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-"Восстановление полигона может быть выполнено только по внешним линиям"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Восстановить полигон из отношения {0}"
diff --git a/i18n/po/sk.po b/i18n/po/sk.po
index 5072f41..f84ac44 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: 2016-11-06 22:51+0100\n"
-"PO-Revision-Date: 2016-11-06 21:55+0000\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
+"PO-Revision-Date: 2017-01-06 21:22+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: 2016-11-07 05:07+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:12+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: sk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -66,9 +66,15 @@ msgstr "Vytváram hlavné menu"
msgid "Help"
msgstr "Nápoveda"
+msgid "Initializing internal boundaries data"
+msgstr "Inicializujú sa interné údaje hraníc"
+
msgid "Initializing OSM API"
msgstr "Inicializujem OSM API"
+msgid "Initializing internal traffic data"
+msgstr "Inicializujú sa interné údaje cestnej premávky"
+
msgid "Initializing validator"
msgstr "Inicializujem validátor"
@@ -218,6 +224,12 @@ msgstr ""
"Nastaviť vybrané elementy(prvky) na mape, podľa vybratých prvkov v zozname "
"hore."
+msgid "Select WMS layers"
+msgstr "Vyberte WMS vrstvy"
+
+msgid "Add layers"
+msgstr "Pridať vrstvy"
+
msgid "Add imagery layer {0}"
msgstr "Pridať vrstvu mapového podkladu {0}"
@@ -239,12 +251,6 @@ msgstr "Chyba"
msgid "Select image format for WMS layer"
msgstr "Zvoľte formát obrázkov pre vrstvu WMS"
-msgid "Select WMS layers"
-msgstr "Vyberte WMS vrstvy"
-
-msgid "Add layers"
-msgstr "Pridať vrstvy"
-
msgid "Add Node..."
msgstr "Pridať bod..."
@@ -758,6 +764,9 @@ msgstr "Skok na miesto (pozíciu)"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Otvoriť dialógové okno, aby bol umožnený skok na konkrétne miesto"
+msgid "Jump to Position"
+msgstr "Skok na miesto (pozíciu)"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Vložiť Šírku/Dĺžku pre skok na miesto."
@@ -779,9 +788,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Skok tam"
-msgid "Jump to Position"
-msgstr "Skok na miesto (pozíciu)"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Nemôžem zistiť Šírku, Dĺžku, alebo Zväčšenie(zoom). Prosím skontrolujte to."
@@ -834,6 +840,9 @@ msgstr "Zlúčiť vrstvu"
msgid "Merge the current layer into another layer"
msgstr "Zlúčiť aktuálnu vrstvu do inej vrstvy"
+msgid "{0} completed in {1}"
+msgstr "{0} dokončené za {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Zlúčenie vrstiev s odlišnými nahrávacími stratégiami"
@@ -1008,24 +1017,30 @@ msgstr[2] "Otváranie {0} súborov..."
msgid "Opening file ''{0}'' ..."
msgstr "Otváranie súboru ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr "Akú úlohu vykonať?"
+
+msgid "Ok"
+msgstr "Ok"
+
msgid "Open Location..."
msgstr "Otvoriť umiestnenie..."
msgid "Open an URL."
msgstr "Otvoriť z URL."
-msgid "Separate Layer"
-msgstr "Samostatná vrstva"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Vyberte ak dáta majú byť stiahnuté na novú vrstvu"
-
msgid "Enter URL to download:"
msgstr "Vložte URL pre sťahovanie:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Vložte adresu URL z ktorej budú dáta sťahované"
+msgid "Separate Layer"
+msgstr "Samostatná vrstva"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Vyberte ak dáta majú byť stiahnuté na novú vrstvu"
+
msgid "Download Location"
msgstr "Priečinok sťahovania"
@@ -1041,12 +1056,6 @@ msgstr "Zavrieť dialóg a zrušiť sťahovanie"
msgid "Download Data"
msgstr "Sťahovanie dát"
-msgid "Which tasks to perform?"
-msgstr "Akú úlohu vykonať?"
-
-msgid "Ok"
-msgstr "Ok"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1910,9 +1919,6 @@ msgstr "Požiadavka a sťahovanie zmenových súborov ..."
msgid "Errors during download"
msgstr "Chyby počas sťahovania"
-msgid "Download Geo URL"
-msgstr "Stiahnuť Geo URL"
-
msgid "Download GPS"
msgstr "Stiahnuť GPS"
@@ -4317,9 +4323,6 @@ msgstr "Cesta reprezentujúca oblasť nie je uzavretá"
msgid "No outer way for multipolygon"
msgstr "Chýba vonkajšia cesta multipolygónu (s rolou \"outer\")"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "Rola pre \"{0}\" by mala byť \"{1}\""
-
msgid "No area style for multipolygon"
msgstr "Neexistuje štýl oblasti multipolygónu"
@@ -4360,12 +4363,27 @@ msgstr "Štýl oblasti na vonkajšej ceste"
msgid "Multipolygon is not closed"
msgstr "Multipolygón nie je uzavretý"
-msgid "Multipolygon inner way is outside"
-msgstr "Vnútorná cesta multipolygónu je vonku"
+msgid "Multipolygon rings share node(s)"
+msgstr "Oblasti multipolygónu zdieľajú body"
msgid "Intersection between multipolygon ways"
msgstr "Priesečník medzi cestami multipolygónu"
+msgid "Multipolygon rings are equal"
+msgstr "Oblasti multipolygónu sú rovnaké"
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "Rola pre \"{0}\" by mala byť \"{1}\""
+
+msgid "Multipolygon inner way is outside"
+msgstr "Vnútorná cesta multipolygónu je vonku"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr "Oblasti multipolygónu obsahujú dvakrát rovnaké úseky"
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr "Vonkajšia cesta multipolygónu zdieľa úseky s vonkajšou oblasťou"
+
msgid "No useful role for multipolygon member"
msgstr "Žiadna platná funkcia pre člena multipolygónu"
@@ -4652,7 +4670,7 @@ msgid "Validate that property values are valid checking against presets."
msgstr "Porovnáva platnosť hodnôt vlastností oproti hodnotám predvolieb."
msgid "Check for FIXMES."
-msgstr "Kontrola FIXMES."
+msgstr "Kontrola značiek FIXME."
msgid "Looks for nodes or ways with FIXME in any property value."
msgstr "Vyhľadá body, alebo cesty s FIXME v hodnotách vlastností."
@@ -5080,12 +5098,18 @@ msgid "options provided as Java system properties"
msgstr ""
"voľby poskytované ako systémové vlastnosti Java (Java system properties)"
+msgid "Change the JOSM directory name"
+msgstr "Zmeniť názov priečinka pre JOSM"
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/CESTA/K/JOSM/NASTAVENIAM "
msgid "Set the preferences directory"
msgstr "Nastaviť priečinok pre nastavenia"
+msgid "Default: {0}"
+msgstr "Predvolené: {0}"
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/CESTA/K/JOSM/UZIVATELSKYMDATAM"
@@ -5102,11 +5126,11 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/CESTA/K/JOSM/PRIECINKU "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Presunúť všetky 3 priečinky do domovského priečinku. Priečinok pre dočasné "
-"cache dáta bude \"domovský priečinok/cache\"."
+"Nastaviť priečinok pre nastavenia+údaje+vyrovnávaciu pamäť (vyrovnávacia "
+"pamäť bude v josm.home/cache)"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5450,9 +5474,6 @@ msgstr "Kliknite na spustenie úlohy na pozadí"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} dokončené za {1}"
-
msgid "Enlarge"
msgstr "Zväčšiť"
@@ -5598,88 +5619,6 @@ msgstr "Konflikt na pozadí: odstrániť člena"
msgid "Conflict foreground: remove member"
msgstr "Konflikt na popredí: odstrániť člena"
-msgid "My with Their"
-msgstr "Môj s Ich"
-
-msgid "My with Merged"
-msgstr "Môj so zlúčeným"
-
-msgid "Their with Merged"
-msgstr "Ich so zlúčeným"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "Rola {0} sa nenachádza v porovnávanej dvojici {1}"
-
-msgid "Properties"
-msgstr "Vlastnosti"
-
-msgid "Tags"
-msgstr "Značky"
-
-msgid "Nodes"
-msgstr "Body"
-
-msgid "Members"
-msgstr "Členovia"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Žiadny konflikt značkiek na vyriešenie"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Značky({0} konfliktov)"
-msgstr[1] "Značky({0} konflikt)"
-msgstr[2] "Značky({0} konflikty)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} nevyriešených konfliktov značiek na rozhodnutie"
-msgstr[1] "{0} nevyriešený konflikt značky na rozhodnutie"
-msgstr[2] "{0} nevyriešené konflikty značiek na rozhodnutie"
-
-msgid "Nodes(resolved)"
-msgstr "Body(vyriešené)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Zmrazený zoznam spojovaných bodov. Vyriešené konflikty v zozname bodov v "
-"tejto ceste."
-
-msgid "Nodes(with conflicts)"
-msgstr "Body(v konflikte)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Nevyriešené konflikty v zozname bodov v tejto ceste"
-
-msgid "Members(resolved)"
-msgstr "Členy(vyriešené)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Zmrazený zoznam spojovaných členov. Vyriešené konflikty v zozname členov v "
-"tejto relácii"
-
-msgid "Members(with conflicts)"
-msgstr "Členy(v konflikte)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Nevyriešené konflikty v zozname členov v tejto relácii"
-
-msgid "No pending property conflicts"
-msgstr "Nevyriešený konflikt vo vlastnostiech"
-
-msgid "Properties(with conflicts)"
-msgstr "Vlastnosti (s konfliktmi)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Nebyriešený konflikty vlastností musia byť vyriešené"
-
-msgid "Conflict Resolution"
-msgstr "Rozhodnutie konfliktov"
-
msgid "{0} more..."
msgstr "{0} viac..."
@@ -5867,6 +5806,88 @@ msgstr[0] "Ich verzia ({0} položiek)"
msgstr[1] "Ich verzia ({0} položka)"
msgstr[2] "Ich verzia ({0} položky)"
+msgid "My with Their"
+msgstr "Môj s Ich"
+
+msgid "My with Merged"
+msgstr "Môj so zlúčeným"
+
+msgid "Their with Merged"
+msgstr "Ich so zlúčeným"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "Rola {0} sa nenachádza v porovnávanej dvojici {1}"
+
+msgid "Properties"
+msgstr "Vlastnosti"
+
+msgid "Tags"
+msgstr "Značky"
+
+msgid "Nodes"
+msgstr "Body"
+
+msgid "Members"
+msgstr "Členovia"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Žiadny konflikt značkiek na vyriešenie"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Značky({0} konfliktov)"
+msgstr[1] "Značky({0} konflikt)"
+msgstr[2] "Značky({0} konflikty)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} nevyriešených konfliktov značiek na rozhodnutie"
+msgstr[1] "{0} nevyriešený konflikt značky na rozhodnutie"
+msgstr[2] "{0} nevyriešené konflikty značiek na rozhodnutie"
+
+msgid "Nodes(resolved)"
+msgstr "Body(vyriešené)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Zmrazený zoznam spojovaných bodov. Vyriešené konflikty v zozname bodov v "
+"tejto ceste."
+
+msgid "Nodes(with conflicts)"
+msgstr "Body(v konflikte)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Nevyriešené konflikty v zozname bodov v tejto ceste"
+
+msgid "Members(resolved)"
+msgstr "Členy(vyriešené)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Zmrazený zoznam spojovaných členov. Vyriešené konflikty v zozname členov v "
+"tejto relácii"
+
+msgid "Members(with conflicts)"
+msgstr "Členy(v konflikte)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Nevyriešené konflikty v zozname členov v tejto relácii"
+
+msgid "No pending property conflicts"
+msgstr "Nevyriešený konflikt vo vlastnostiech"
+
+msgid "Properties(with conflicts)"
+msgstr "Vlastnosti (s konfliktmi)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Nebyriešený konflikty vlastností musia byť vyriešené"
+
+msgid "Conflict Resolution"
+msgstr "Rozhodnutie konfliktov"
+
msgid "Node"
msgstr "Bod"
@@ -5929,9 +5950,8 @@ msgstr "Funkcia"
msgid "Primitive"
msgstr "Základný objekt"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
-"spojované body ešte nie sú blokované. Memôžem spustiť vykonávací príkaz"
msgid "<undefined>"
msgstr "<nedefinované>"
@@ -7464,104 +7484,6 @@ msgid "Select only changesets related to a specific bounding box"
msgstr ""
"Vybrať iba zmenové súbory súvisiace s konkrétnym ohraničujúcim rámcom"
-msgid "Query open changesets only"
-msgstr "Vyžiadať iba otvorené zmenové súbory"
-
-msgid "Query closed changesets only"
-msgstr "Vyžiadať iba zatvorené zmenové súbory"
-
-msgid "Query both open and closed changesets"
-msgstr "Vyžiadať otvorené aj zatvorené zmenové súbory"
-
-msgid "Only changesets owned by myself"
-msgstr "Iba moje zmenové súbory"
-
-msgid "User ID:"
-msgstr "ID používateľa:"
-
-msgid "User name:"
-msgstr "Používateľské meno:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
-"Iba zmenové súbory vyhotovené používateľom s nasledujúcim ID používateľa"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-"Iba zmenové súbory vyhotovené používateľom s nasledujúcim menom používateľa"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Iba zmenové súbory vo svojom vlastníctve (blokované. JOSM v súčasnej dobe "
-"prevádzkuje anonymný používateľ)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Nemožno obmedziť požiadavku zmenových súborov na aktuálneho používateľa, "
-"pretože aktuálny používateľ je anonymný"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "Aktuálna hodnota ''{0}'' pre používateľské ID je neplatná"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"Nemožno obmedziť požiadavku zmenových súborov na meno používateľa \"{0}\""
-
-msgid "Please enter a valid user ID"
-msgstr "Prosím vložte platné ID používateľa"
-
-msgid "Invalid user ID"
-msgstr "Neplatné ID používateľa"
-
-msgid "Please enter a non-empty user name"
-msgstr "Prosím vložte (nie prázdne) meno používateľa"
-
-msgid "Invalid user name"
-msgstr "Neplatné používateľské meno"
-
-msgid "Date: "
-msgstr "Dátum: "
-
-msgid "Time:"
-msgstr "Čas:"
-
-msgid "Closed after - "
-msgstr "Zavreté po - "
-
-msgid "Date:"
-msgstr "Dátum:"
-
-msgid "Created before - "
-msgstr "Vytvorené pred - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Iba zmenové súbory zavreté ponasledujúcom dátume/čase"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-"Iba zmenové súbory zavreté po a vytvorené pred konkrétnym dátumom/časom"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"Nemôžem vytvoriť požiadavku na zmenové súbory s časovým obmedzením. Vstup "
-"nie je platný."
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr ""
-"<html>Prosím vložte platnú hodnotu dátumu/času pre obmedzenie<br>požiadavky "
-"na konkrétny časový rozsah.</html>"
-
-msgid "Invalid date/time values"
-msgstr "Neplatná hodnota dátum/čas"
-
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
"invalid."
@@ -7580,28 +7502,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Chybný ohraničujúci rámec"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"Aktuálna hodnota nie je platné ID používateľa. Prosím vložte celé číslo > 0"
-
-msgid "Please enter an integer value > 0"
-msgstr "Prosím vložte ako hodnotu celé číslo > 0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Prosím vložte dátum v obvyklom formáte pre vašu lokalitu.<br>Napríklad: "
-"{0}<br>Napríklad: {1}<br>Napríklad: {2}<br>Napríklad: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Prosím vložte platný čas v obvyklom formáte pre vašu lokalitu.<br>Napríklad: "
-"{0}<br>Napríklad: {1}<br>Napríklad: {2}<br>Napríklad: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Stiahnuť iba moje zmenové súbory"
@@ -7691,6 +7591,76 @@ msgstr "Neplatná URL pre požiadavky na zmenové súbory"
msgid "Close the dialog and abort querying of changesets"
msgstr "Zatvoriť dialóg a zrušiť požiadavku na zmenové súbory"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Prosím vložte dátum v obvyklom formáte pre vašu lokalitu.<br>Napríklad: "
+"{0}<br>Napríklad: {1}<br>Napríklad: {2}<br>Napríklad: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Vyžiadať iba otvorené zmenové súbory"
+
+msgid "Query closed changesets only"
+msgstr "Vyžiadať iba zatvorené zmenové súbory"
+
+msgid "Query both open and closed changesets"
+msgstr "Vyžiadať otvorené aj zatvorené zmenové súbory"
+
+msgid "Date: "
+msgstr "Dátum: "
+
+msgid "Time:"
+msgstr "Čas:"
+
+msgid "Closed after - "
+msgstr "Zavreté po - "
+
+msgid "Date:"
+msgstr "Dátum:"
+
+msgid "Created before - "
+msgstr "Vytvorené pred - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Iba zmenové súbory zavreté ponasledujúcom dátume/čase"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+"Iba zmenové súbory zavreté po a vytvorené pred konkrétnym dátumom/časom"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Nemôžem vytvoriť požiadavku na zmenové súbory s časovým obmedzením. Vstup "
+"nie je platný."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Prosím vložte platnú hodnotu dátumu/času pre obmedzenie<br>požiadavky "
+"na konkrétny časový rozsah.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Neplatná hodnota dátum/čas"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Prosím vložte platný čas v obvyklom formáte pre vašu lokalitu.<br>Napríklad: "
+"{0}<br>Napríklad: {1}<br>Napríklad: {2}<br>Napríklad: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"Aktuálna hodnota nie je platné ID používateľa. Prosím vložte celé číslo > 0"
+
+msgid "Please enter an integer value > 0"
+msgstr "Prosím vložte ako hodnotu celé číslo > 0"
+
msgid "URL: "
msgstr "URL: "
@@ -7711,6 +7681,56 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Táto URl pre požiadavky na zmenové súbory je chybná"
+msgid "Only changesets owned by myself"
+msgstr "Iba moje zmenové súbory"
+
+msgid "User ID:"
+msgstr "ID používateľa:"
+
+msgid "User name:"
+msgstr "Používateľské meno:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr ""
+"Iba zmenové súbory vyhotovené používateľom s nasledujúcim ID používateľa"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+"Iba zmenové súbory vyhotovené používateľom s nasledujúcim menom používateľa"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Iba zmenové súbory vo svojom vlastníctve (blokované. JOSM v súčasnej dobe "
+"prevádzkuje anonymný používateľ)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Nemožno obmedziť požiadavku zmenových súborov na aktuálneho používateľa, "
+"pretože aktuálny používateľ je anonymný"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "Aktuálna hodnota ''{0}'' pre používateľské ID je neplatná"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"Nemožno obmedziť požiadavku zmenových súborov na meno používateľa \"{0}\""
+
+msgid "Please enter a valid user ID"
+msgstr "Prosím vložte platné ID používateľa"
+
+msgid "Invalid user ID"
+msgstr "Neplatné ID používateľa"
+
+msgid "Please enter a non-empty user name"
+msgstr "Prosím vložte (nie prázdne) meno používateľa"
+
+msgid "Invalid user name"
+msgstr "Neplatné používateľské meno"
+
msgid "Activate"
msgstr "Aktivovať"
@@ -8905,6 +8925,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr "Editor"
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10602,6 +10625,9 @@ msgstr "Smer"
msgid "Velocity, {0}"
msgstr "Rýchlosť, {0}"
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audiosúbory (*.wav)"
+
msgid "Import Audio"
msgstr "Importovať zvuk"
@@ -10616,9 +10642,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Import nie je možný"
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audiosúbory (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Zukové značky z {0}"
@@ -10733,17 +10756,6 @@ msgstr "(URL bolo: "
msgid "Select the map painting styles"
msgstr "Vybrať štýl kreslenia mapy"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-"Nepodarilo sa načítať štýl kreslenia mapy z \"{0}\". Výnimka bola: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-"JOSM už nepodporuje mapové štýly v starom XML formáte.\n"
-"Prosím aktualizujte \"{0}\" na MapCSS"
-
msgid "loading style ''{0}''..."
msgstr "nahrávam štýl ''{0}''..."
@@ -10763,6 +10775,10 @@ msgstr[2] ""
"Došlo k {0} chybám pri načítaní tohto štýlu. Vyberte ''Info'' pre "
"podrobnosti, kliknutím pravého tlačítka na myši."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+"Nepodarilo sa načítať štýl kreslenia mapy z \"{0}\". Výnimka bola: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
"Nepodarilo sa prečítať štýl kreslenia mapy z \"{0}\". Chyba bola: {1}"
@@ -11875,17 +11891,32 @@ msgstr "Hustota pozícií (červená = vysoká, zelená = nízka, ak je dostupn
msgid "Track date"
msgstr "dátum stopy"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Jedna farba (môže byť prispôsobená pre pomenované vrstvy)"
msgid "Car"
msgstr "Vozidlo"
-msgid "Bicycle"
-msgstr "Bicykel"
+msgid "Bicycle"
+msgstr "Bicykel"
+
+msgid "Foot"
+msgstr "Pešo"
+
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Prírodný les"
-msgid "Foot"
-msgstr "Pešo"
+msgid "Heat"
+msgstr ""
msgid "Create markers when reading GPX"
msgstr "Vytvoriť značky(markers) pri načítaní GPX"
@@ -11899,6 +11930,9 @@ msgstr "Dynamický rozsah farieb na dátové limity"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Vyhladiť GPX grafiku (antialiasing)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11968,6 +12002,11 @@ msgstr ""
"Aplikovať vyhladzovanie (antialiasing) na čiary GPX pre jemnejšie zobrazenie."
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11990,11 +12029,18 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "Vyfarbiť body a vyznačiť časovú značku segmentov."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
"Dovoliť nastavovať zafarbenie stopy(track) podľa rôznych priemerných "
"rýchlostí."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Farebná trať a body"
@@ -13305,6 +13351,12 @@ msgstr "Hľadá chyby na náboženských objektoch"
msgid "Checks for errors on relations"
msgstr "Hľadá chyby v reláciách"
+msgid "Territories"
+msgstr "Územia"
+
+msgid "Checks for territories-specific features"
+msgstr "Kontrolovať vlastnosti závislé od územia"
+
msgid "Unnecessary tags"
msgstr "Nepotrebné značky"
@@ -14470,6 +14522,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Uložiť meno a heslo (nešifrovane)"
+msgid "Assume"
+msgstr "Prevziať"
+
+msgid "Existing values"
+msgstr "Súčasné hodnoty"
+
msgid "<delete from {0} objects>"
msgstr "<vymazať z {0} objektov>"
@@ -14491,12 +14549,6 @@ msgstr "Pridať zaškrtnuté značky do vybraných objektov"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Enter: Pridať všetky značky do vybraných objektov"
-msgid "Assume"
-msgstr "Prevziať"
-
-msgid "Existing values"
-msgstr "Súčasné hodnoty"
-
msgid "Enable the checkbox to accept the value"
msgstr "Hodnotu prijmete zaškrtnutím políčka"
@@ -15716,6 +15768,9 @@ msgstr "Pridať certifikát JOSM pre lokálny počítač do úložika kľúčov
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr "Konflikt skratiek: \"{0}\" presunuté cez \"{1}\" na \"{2}\"."
+msgid "Unknown territory id: {0}"
+msgstr "Neznáme id územia: {0}"
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "V zásobníku sa našlo {0} značiek, čo je nezvyčajné!"
@@ -16238,14 +16293,17 @@ msgstr "MapBox Satelit"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr "Thunderforest Landscape"
+
msgid "OpenSeaMap"
msgstr "OpenSeaMap (námorná mapa)"
-msgid "OpenStreetMap Carto (Standard layer)"
-msgstr "OpenStreetMap Carto (Štandardná vrstva)"
+msgid "OpenStreetMap Carto (Standard)"
+msgstr "OpenStreetMap Carto (Štandard)"
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik Čiernobiely)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr "OpenStreetMap (Štandardná čiernobiela)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, bez nápisov)"
@@ -16268,8 +16326,11 @@ msgstr "Turistika & Cyklistika"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Kambodža, Laos, Thajsko, Vietnam dvojjazyčné"
+msgid "Stamen Terrain"
+msgstr "Stamen Terrain"
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr "Cambodža, Laos, Thajsko, Vietnam, Mjanmarsko dvojjazyčne"
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
@@ -16319,8 +16380,8 @@ msgstr "OSM Inspector: Miesta"
msgid "OSM Inspector: Highways"
msgstr "OSM Inspector: Cesty"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM Inspector: Multipolygóny"
+msgid "OSM Inspector: Area"
+msgstr "OSM Inspector: Oblasti"
msgid "OSM Inspector: Routing"
msgstr "OSM Inspector: Navigácia"
@@ -16328,11 +16389,24 @@ msgstr "OSM Inspector: Navigácia"
msgid "OSM Inspector: Addresses"
msgstr "OSM Inspector: Addresy"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM Inspector: Hranice (EÚ)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr "OSM Inspector: Pobrežie (EU)"
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr "imagico.de OSM obrázky pre mapovanie: Prokletije Mountains"
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr "imagico.de OSM obrázky pre mapovanie: Južné transantarktické hory"
-msgid "IGN Argentina (WMTS)"
-msgstr "IGN Argentína (WMTS)"
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr "imagico.de OSM obrázky pre mapovanie: Pensacola Mountains"
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+"imagico.de OSM obrázky pre mapovanie: Elephant Island/Clarence Island"
+
+msgid "IGN Argentina (TMS)"
+msgstr "IGN Argentína (TMS)"
msgid "IGN Argentina (WMS)"
msgstr "IGN Argentína (WMS)"
@@ -16367,6 +16441,12 @@ msgstr "LPI NSW Administratívne hranice štátnych lesov"
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr "LPI NSW Administratívne hranice chránených oblastí NPWS"
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr "imagico.de OSM obrázky pre mapovanie: Northwest Heard Island"
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr "imagico.de OSM obrázky pre mapovanie: Heard Island coast"
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -16412,11 +16492,17 @@ msgstr "VoGIS: Plán využitia územia"
msgid "VoGIS: Höhen und Gelände"
msgstr "VoGIS: Výšky a pozemky"
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
-msgstr "AGIV (Vlaanderen / Flámsko) najnovšie letecké snímky (zima)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr "imagico.de OSM obrázky pre mapovanie: Rila and Pirin Mountains"
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr "AGIV Flanders najnovšie letecké snímky"
-msgid "AGIV aerial imagery 10cm 2013-15"
-msgstr "AGIV letecké snímky 10cm 2013-15"
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
+msgstr "AGIV Flanders 2013-2015 letecké snímky 10cm"
+
+msgid "AGIV Flanders GRB"
+msgstr "AGIV Flanders GRB"
msgid "URBISfr numerical imagery (2013)"
msgstr "URBISfr numerical imagery (2013)"
@@ -16451,8 +16537,17 @@ msgstr "SPW(allonie) 2009-2010 letecké snímky"
msgid "TEC bus lines (2014)"
msgstr "LInky autobusov TEC (2014)"
-msgid "Benin:cotonou_pleiade_2016"
-msgstr "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr "TEC autobusové zastávky (2014)"
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr "Benin: Cotonou Pleiade 2016"
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr "imagico.de OSM obrázky pre mapovanie: Cotonou"
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr "imagico.de OSM obrázky pre mapovanie: Bouvet Island"
msgid "IBGE Mapa de Setores Urbanos"
msgstr "IBGE Mapa de Setores Urbanos"
@@ -16460,6 +16555,15 @@ msgstr "IBGE Mapa de Setores Urbanos"
msgid "IBGE Mapa de Setores Rurais"
msgstr "IBGE Mapa de Setores Rurais"
+msgid "IBGE Distrito Federal"
+msgstr "IBGE Distrito Federal"
+
+msgid "Rio Mosaic 2013"
+msgstr "Rio Mosaic 2013"
+
+msgid "Rio Mosaic 2015"
+msgstr "Rio Mosaic 2015"
+
msgid "Geobase Hydrography"
msgstr "Geobase Hydrografia"
@@ -16472,12 +16576,34 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "British Columbia Mosaic"
+msgid "Latest southwest British Columbia Landsat"
+msgstr "Najnovšie snímky juhozápadnej Britskej Kolumbie z Landsat"
+
msgid "Kelowna 2012"
msgstr "Kelowna 2012"
msgid "Kelowna Roads overlay"
msgstr "Kelowna cesty"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr "imagico.de OSM obrázky pre mapovanie: Eastern Devon Island coast"
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr "imagico.de OSM obrázky pre mapovanie: Northern Ellesmere Island"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr "imagico.de OSM obrázky pre mapovanie: Fogo, Cape Verde"
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr "imagico.de OSM obrázky pre mapovanie: Isla Londonderry"
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr "imagico.de OSM obrázky pre mapovanie: Volcán Calbuco"
+
msgid "Czech CUZK:KM"
msgstr "Český CUZK:KM"
@@ -16514,6 +16640,12 @@ msgstr "Stevns (Dánsko)"
msgid "Vejmidte (Denmark)"
msgstr "Vejmidte (Dánsko)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr "imagico.de OSM obrázky pre mapovanie: El Altar"
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Estonia Basemap (Maaamet)"
@@ -16547,9 +16679,6 @@ msgstr "Cadastre"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr "CRAIG - Auvergne 2013 - 25 cm"
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "GrandNancy Ortofotografia 2012"
@@ -16608,9 +16737,6 @@ msgstr ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Ortofoto 1999 - "
"1 m"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Sorbian Language)"
-
msgid "Hamburg (40 cm)"
msgstr "Hamburg (40 cm)"
@@ -16638,9 +16764,6 @@ msgstr "Berlín letecké fotografie 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Berlín letecké fotografie 2016"
-msgid "Stuttgart (aerial imagery)"
-msgstr "Stuttgart (letecké snímky)"
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Erlangen letecké snímky (2016 5.0 cm)"
@@ -16674,9 +16797,58 @@ msgstr "NRW-Atlas: Topografická mapa 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropola Ruhr: Letecké snímky (10 cm)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+"imagico.de OSM obrázky pre mapovanie: Severné Nemecko západné pobrežné "
+"prílivové oblasti"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+"imagico.de OSM obrázky pre mapovanie: Severné Nemecko západné pobrežné "
+"prílivové oblasti (infračervené)"
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr "imagico.de OSM obrázky pre mapovanie: Qasigiannguit"
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr "imagico.de OSM obrázky pre mapovanie: Thule Air Base"
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr "imagico.de OSM obrázky pre mapovanie: Greenland mosaic"
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr "imagico.de OSM obrázky pre mapovanie: May 2013 off-nadir Landsat"
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr "imagico.de OSM obrázky pre mapovanie: Northern Greenland ASTER"
+
msgid "Drone Imagery (Haiti)"
msgstr "Snímky automatických lietadiel (Haiti)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Fotografie z bezpilotných lietadiel 2014 (Haiti)"
@@ -16713,14 +16885,8 @@ msgstr "Dunajská záplava ortofoto 2013"
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Breh Dunaja pri mestách Budapešť, Szentendre a Szigetmonostor"
-msgid "Budapest district XII ortophoto 2013"
-msgstr "Budapest okrsok XII ortofoto 2013"
-
-msgid "Interspect Budapest ortophoto 2014"
-msgstr "Interspect Budapest ortofoto 2014"
-
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
-msgstr "Päť mestských častí Budapešti: III, IV, XIII, XIV, XV"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Maďarsko (turistické chodníky)"
@@ -16728,6 +16894,21 @@ msgstr "OpenStreetMap Maďarsko (turistické chodníky)"
msgid "Hillshade Hungary"
msgstr "Tieňované svahy Maďarsko"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgstr "imagico.de OSM obrázky pre mapovanie: Eastern Iceland"
+
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr "imagico.de OSM obrázky pre mapovanie: Rann of Kutch"
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr "imagico.de OSM obrázky pre mapovanie: Southeastern Sulawesi"
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr "imagico.de OSM obrázky pre mapovanie: Bakun Reservoir"
+
+msgid "imagico.de OSM images for mapping: Batam"
+msgstr "imagico.de OSM obrázky pre mapovanie: Batam"
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ireland British War Office 1:25k GSGS 3906"
@@ -16788,9 +16969,21 @@ msgstr "PCN 2012 - Taliansko"
msgid "South Tyrol Orthofoto 2011"
msgstr "Južné Tirolsko Ortofoto 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr "Južné Tirolsko, topografická mapa"
+msgid "Japan GSI ortho Imagery"
+msgstr "Japonsko GSI ortofoto"
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "ZSSR - Lotyšsko"
@@ -16824,12 +17017,36 @@ msgstr "Delta Nigeru Okt 2012 Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard - Ortofoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr "imagico.de OSM obrázky pre mapovanie: Western Karakoram"
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Pásmo Gazy - Pléiades - 2014/07/06"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Pásmo Gazy - Pléiades - 2014/07/06 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr "imagico.de OSM obrázky pre mapovanie: Panama Canal"
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr "imagico.de OSM obrázky pre mapovanie: Vanatinai"
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr "imagico.de OSM obrázky pre mapovanie: New Ireland"
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+"imagico.de OSM obrázky pre mapovanie: Willkanuta Mountains and Quelccaya Ice "
+"Cap"
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
@@ -16956,9 +17173,6 @@ msgstr "Świętochłowice: Ortofotomapa 2012 (letecký snímok)"
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Zabrze: Ortofotomapa 2011 (letecké snímky)"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Szlaki (chodníky)"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr "Wrocław: Ortofotomapa 2015 (letecké snímky)"
@@ -16968,6 +17182,20 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Auto"
@@ -16989,12 +17217,30 @@ msgstr "RABA-KGZ: Slovinsko poľnohospodárska pôda"
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr "RABA-KGZ: Slovinsko zastavané plochy"
+msgid "City of Cape Town 2013 Aerial"
+msgstr "Kapské mesto 2013 Aerial"
+
msgid "City of Cape Town 2015 Aerial"
msgstr "Kapské mesto 2015 Letecké snímky"
msgid "South Africa CD:NGI Aerial"
msgstr "Južná Afrika CD:NGI Letecké"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr "imagico.de OSM obrázky pre mapovanie: Leskov Island ASTER"
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr "imagico.de OSM obrázky pre mapovanie: Scott Island"
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr "imagico.de OSM obrázky pre mapovanie: Leskov Island Landsat"
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr "imagico.de OSM obrázky pre mapovanie: Clerke Rocks"
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr "imagico.de OSM obrázky pre mapovanie: Shag Rocks"
+
msgid "Catastro Spain"
msgstr "Kataster Španielsko"
@@ -17016,6 +17262,9 @@ msgstr "IDEIB - Baleárske ostrovy"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Kanárske ostrovy"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Kanton Aargau 25cm (AGIS 2011)"
@@ -17058,6 +17307,9 @@ msgstr "Canton de Fribourg 50cm (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Mesto Bern 10cm/25cm (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr "Mesto Bern 10cm (2016)"
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Ortofoto Yverdon-les-Bains 25cm (2007)"
@@ -17079,6 +17331,12 @@ msgstr "Bonvillars Ortofoto 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Fiez Ortofoto 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr "Kanton Basel-Stadt 2015"
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr "Taiwan e-Map Open Data"
@@ -17094,6 +17352,9 @@ msgstr "Taiwan Land-Section Data"
msgid "NLSC Open Data WMTS"
msgstr "NLSC Open Data WMTS"
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "MSR Mapy Topo"
@@ -17121,9 +17382,54 @@ msgstr "NC Latest Orthoimagery"
msgid "U.S. Forest Service roads"
msgstr "Cesty Lesnej služby U.S.A."
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr "imagico.de OSM obrázky pre mapovanie: Alaska Range"
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr "NJ 2015 Letecké snímky (Infračervené)"
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr "NJ 2015 Letecké snímky (Prirodzené farby)"
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr "San Juan Metro Area: 2013 USACE Ortofoto"
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr "WA 2013 letecké snímky pre okres San Juan"
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr "WA Vektorový Streetmap pre San Juan"
+
+msgid "Texas Orthophoto"
+msgstr "Texas Ortofoto"
+
+msgid "Philadelphia 2015 Imagery"
+msgstr "Philadelphia 2015 letecké snímky"
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr "MD 2014 6-palcové letecké snímky"
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr "MD 3-palcové letecké snímky"
+
+msgid "MD Transportation Basemap"
+msgstr "MD Základná mapa dopravy"
+
+msgid "Delaware 2012 Orthophotography"
+msgstr "Delaware 2012 Ortofoto"
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr "imagico.de OSM obrázky pre mapovanie: Rwenzori Mountains"
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ukrajina - Ortofotomapy 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr "Funguje iba z Ukrajiny alebo s proxy serverom na Ukrajine."
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr "Ukrajina - Kyjev 2014 (DZK)"
@@ -17145,9 +17451,6 @@ msgstr "Surrey Letecká prehliadka"
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Škótsko 1842-82"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr "NLS - OS 6-inch County Series 1888-1913"
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1:25k 1st Series 1937-61"
@@ -17157,9 +17460,6 @@ msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr "NLS - OS 25-inch (Śkótsko) 1892-1905"
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25k historická (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "OS 1:25k historická (OSM-Obmedzené)"
@@ -17494,8 +17794,8 @@ msgstr "Sťahuje nové údaje pri posúvaní/približovaní"
msgid "Create a grid of ways."
msgstr "Vytvára sieť ciest."
-msgid "Customization of public transport stops."
-msgstr "Prispôsobenie zastávok hromadnej dopravy."
+msgid "Customization of public public transport stops."
+msgstr "Úpravy zastávok hromadnej dopravy."
msgid ""
"Creating and handling address nodes and buildings within Czech Republic."
@@ -17596,6 +17896,9 @@ msgstr "Jednoduchý nástroj na označenie čísla domov."
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "Generovať hranicu XML mapových podkladov z multipolygónu"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr "Exportovať dlaždice z podkladovej vrstvy ako súbory."
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -20105,6 +20408,9 @@ msgstr "Potok (stream)"
msgid "River"
msgstr "Rieka"
+msgid "Lock"
+msgstr "Plavebná komora"
+
msgid "Canal"
msgstr "Prieplav/zavlažovací kanál"
@@ -21155,6 +21461,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr "Penzión"
+msgid "Apartment"
+msgstr "Apartmány"
+
+msgid "Number of apartments"
+msgstr "Počet apartmánov"
+
msgid "Chalet"
msgstr "Chata"
@@ -21221,6 +21533,12 @@ msgstr "Vonkajšie sedenie"
msgid "Takeaway"
msgstr "So sebou"
+msgid "Delivery"
+msgstr "Donáška"
+
+msgid "Mo-Su 12:00-22:00"
+msgstr "Po-Ne 12:00-22:00"
+
msgid "Fast Food"
msgstr "Rýchle občerstvenie (fast food)"
@@ -22164,31 +22482,19 @@ msgstr "skrýša na pozorovanie zveri"
msgid "Hunting Stand"
msgstr "Poľovnícky posed"
-msgid "Height"
-msgstr "Výška"
-
-msgctxt "height"
-msgid "low"
-msgstr "nízka"
-
-msgctxt "height"
-msgid "half"
-msgstr "polovičná"
-
-msgctxt "height"
-msgid "full"
-msgstr "plná"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr "Skrýša"
-msgid "Lock"
-msgstr "Zámok"
+msgid "Lockable"
+msgstr "Uzamknuteľný"
msgid "Water Point"
msgstr "Zdroj vody"
+msgid "Animal watering place"
+msgstr "Napájadlo pre zvieratá"
+
msgid "Compressed Air"
msgstr "Stlačený vzduch"
@@ -22780,6 +23086,10 @@ msgid "hut"
msgstr "chatka"
msgctxt "building"
+msgid "bungalow"
+msgstr "bungalov"
+
+msgctxt "building"
msgid "dormitory"
msgstr "internát"
@@ -24075,6 +24385,9 @@ msgstr "Mäsiareň"
msgid "Seafood"
msgstr "Morské špeciality"
+msgid "Dairy"
+msgstr "Mliečne výrobky"
+
msgid "Deli (Fine Food)"
msgstr "Špeciality"
@@ -24890,9 +25203,6 @@ msgstr "Stromoradie"
msgid "A line of trees."
msgstr "Rad stromov."
-msgid "Wood"
-msgstr "Prírodný les"
-
msgid "Woodland where timber production does not dominate use."
msgstr "Lesný porast, kde nie je hlavným účelom ťažba dreva."
@@ -25960,6 +26270,9 @@ msgstr "Rozdielny počet jazdných pruhov v kľúčoch {0} a {1}"
msgid "possibly missing {0} tag"
msgstr "pravdepodobne chýbajúca značka {0}"
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr "ulica s nepárnym počtom {0}, ale bez {1} a {2} alebo {3}"
+
msgid "{0} is deprecated"
msgstr "{0} je zastaralý"
@@ -26064,6 +26377,12 @@ msgstr "podozrivý kľúč (končí číslom)"
msgid "The key {0} has an uncommon value."
msgstr "Kľúč {0} má nezvyčajnú hodnotu."
+msgid "misspelled value"
+msgstr "hodnota s preklepom"
+
+msgid "wrong value: {0}"
+msgstr "nesprávna hodnota: {0}"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} na bode. Malo by byť použité na ceste."
@@ -26142,6 +26461,13 @@ msgstr "Pobrežie vovnútri \"{1}\""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} by malo byť na bode kde sa pretínajú {1} a {2}"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+"{0} je značka pre lineárnu vodnú cestu. Pre označkovanie vodnej oblasti "
+"použite namiesto toho {1} + {2}."
+
msgid "abbreviated street name"
msgstr "skrátený názov ulice"
@@ -26166,6 +26492,11 @@ msgstr "{0} použité s {1}"
msgid "street name contains ss"
msgstr "názov ulice obsahuje ss (Nemecko)"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+"{0} je zastaralé, použite namiesto toho {1}. Tiež pozrite podobné značky ako "
+"{2}"
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -26971,6 +27302,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr "Odoslať obrázky"
@@ -27013,7 +27354,7 @@ msgstr "Otvoriť okno pre sady zmien Mapillary"
msgid "Mapillary changeset"
msgstr "Sada zmien Mapillary"
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -27164,10 +27505,10 @@ msgid "Move to picture''s location with next/previous buttons"
msgstr "Tlačidlom nasledujúci/predchádzajúci sa presunúť na pozíciu obrázka"
msgid "Preview images when hovering its icon"
-msgstr ""
+msgstr "Zobraziť náhľady obrázkov pri prejdení nad ich ikonou"
msgid "Login"
-msgstr ""
+msgstr "Prihlásiť sa"
msgid "Logout"
msgstr ""
@@ -27179,7 +27520,7 @@ msgid "You are logged in as ''{0}''."
msgstr ""
msgid "You are currently not logged in."
-msgstr ""
+msgstr "Nie ste prihlásený."
msgid "Go to setting and log in to Mapillary before uploading."
msgstr "Pred odosielaním choďte do nastavení a prihláste sa do Mapillary."
@@ -27230,10 +27571,10 @@ msgid "2 images unjoined"
msgstr "2 obrázky rozpojené"
msgid "everything in the visible area"
-msgstr ""
+msgstr "všetko vo viditeľnej oblasti"
msgid "areas with downloaded OSM-data"
-msgstr ""
+msgstr "oblasti s už stiahnutými údajmi OSM"
msgid "only when manually requested"
msgstr "len keď je požadované"
@@ -27253,7 +27594,7 @@ msgid "Mapillary login"
msgstr "Prihlásenie do Mapillary"
msgid "Login successful, return to JOSM."
-msgstr ""
+msgstr "Prihlásenie úspešné, vráťte sa do JOSM."
msgid "Supported image formats (JPG and PNG)"
msgstr ""
@@ -27827,6 +28168,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -27870,8 +28214,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -28996,7 +29340,7 @@ msgid "Could not get server response, check logs"
msgstr ""
msgid "Failed to login as {0}:"
-msgstr ""
+msgstr "Nepodarilo sa prihlásiť ako {0}:"
msgid "The server did not return user ID"
msgstr ""
@@ -29014,7 +29358,7 @@ msgid "Zoom in to see messages"
msgstr ""
msgid "Enable autologin"
-msgstr ""
+msgstr "Povoliť automatické prihlásenie"
msgid "{0} user"
msgid_plural "{0} users"
@@ -29548,6 +29892,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Otvoriť XML súbor mapového podkladu"
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -31671,10 +32074,10 @@ msgstr ""
"Chcete ich teraz stiahnuť?"
msgid "Download incomplete route relation members"
-msgstr ""
+msgstr "Stiahnuť nekompletné členy relácií"
msgid "Include stop_area tests"
-msgstr ""
+msgstr "Zahrnúť kontroly relácií stop_area"
msgid "PT_Assistant plugin found that this relation (id={0}) has errors:"
msgstr "PT_Assistant plugin zistil, že táto relácia (id={0}) má chyby:"
@@ -31708,11 +32111,12 @@ msgid "PT_Assistant Message"
msgstr ""
msgid "Public Transport Assistant tests"
-msgstr ""
+msgstr "Kontroly Asistenta hromadnej dopravy"
msgid ""
"Check if route relations are compatible with public transport version 2"
msgstr ""
+"Overí, či sú relácie trás kompatibilné so schémou hromadnej dopravy verzie 2"
msgid "Fix error"
msgstr ""
@@ -31733,9 +32137,6 @@ msgstr "PT: Trasa by mala začínať a končiť so \"stop_position\""
msgid "PT: First or last way needs to be split"
msgstr "PT: Prvý alebo posledný úsek by asi mal byť rozdelený"
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -31893,9 +32294,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "Vzory trás"
@@ -31953,6 +32351,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -32150,9 +32551,6 @@ msgstr "Rekonštruovať polygón"
msgid "Multipolygon must consist only of ways"
msgstr "Multipolygón sa musí skladať iba z ciest"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr "Rekonštrukcia polygónov sa dá urobiť len z vonkajších ciest"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Rekonštruovať polygóny z relácie {0}"
diff --git a/i18n/po/sl.po b/i18n/po/sl.po
index 9388f04..a09c4ed 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:07+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:13+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: sl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -65,9 +65,15 @@ msgstr ""
msgid "Help"
msgstr "Pomoč"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Inicializacija OSM API"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Inicializacija preverjanja"
@@ -202,6 +208,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr "Dodaj plast zračnih posnetkov {0}"
@@ -223,12 +235,6 @@ msgstr "Napaka"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr "Dodaj vozlišče..."
@@ -713,6 +719,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -734,9 +743,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -787,6 +793,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -936,24 +945,30 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Potrdi"
+
msgid "Open Location..."
msgstr "Odpri mesto..."
msgid "Open an URL."
msgstr "Odpri URL naslov."
-msgid "Separate Layer"
-msgstr "Ločena plast"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Izberi, če naj se podatki prenesejo v novo plast"
-
msgid "Enter URL to download:"
msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr "Ločena plast"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Izberi, če naj se podatki prenesejo v novo plast"
+
msgid "Download Location"
msgstr "Mesto vira sprejema"
@@ -969,12 +984,6 @@ msgstr "Zapri dialog in prekini prenos"
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr "Potrdi"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1774,9 +1783,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3974,9 +3980,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -4006,12 +4009,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4710,12 +4728,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4732,8 +4756,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5054,9 +5078,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5195,82 +5216,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr "Lastnosti"
-
-msgid "Tags"
-msgstr "Oznake"
-
-msgid "Nodes"
-msgstr "Vozlišča"
-
-msgid "Members"
-msgstr "Člani"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr "Odpravljanje sporov"
-
msgid "{0} more..."
msgstr ""
@@ -5436,6 +5381,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr "Lastnosti"
+
+msgid "Tags"
+msgstr "Oznake"
+
+msgid "Nodes"
+msgstr "Vozlišča"
+
+msgid "Members"
+msgstr "Člani"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr "Odpravljanje sporov"
+
msgid "Node"
msgstr "Vozlišče"
@@ -5495,7 +5516,7 @@ msgstr "Vloga"
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6887,212 +6908,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
+msgstr "Osnovno"
+
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "From URL"
msgstr ""
-msgid "Invalid user name"
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Date: "
+msgid "Advanced"
msgstr ""
-msgid "Time:"
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Closed after - "
+msgid "Query changesets"
msgstr ""
-msgid "Date:"
+msgid "Query and download changesets"
msgstr ""
-msgid "Created before - "
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+msgid "Query open changesets only"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query both open and closed changesets"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Date: "
msgstr ""
-msgid "Invalid bounding box"
+msgid "Time:"
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid "Invalid date/time values"
msgstr ""
msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
-msgstr ""
-
-msgid "<html>Download my open changesets</html>"
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
-msgstr "Osnovno"
+msgid "Examples"
+msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8206,6 +8227,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9704,6 +9728,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "Zvočne datoteke (*.wav)"
+
msgid "Import Audio"
msgstr "Uvozi zvok"
@@ -9716,9 +9743,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr "Zvočne datoteke (*.wav)"
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9815,14 +9839,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9835,6 +9851,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10823,6 +10842,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Enobarvno (barvo poimenovanih plasti je mogoče prilagoditi po meri)"
@@ -10835,6 +10857,18 @@ msgstr "Kolo"
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10847,6 +10881,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10908,6 +10945,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10926,9 +10968,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12123,6 +12172,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13166,6 +13221,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Shrani uporabniško ime in geslo (nekriptirano)"
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13187,12 +13248,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14156,6 +14211,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14644,13 +14702,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14674,7 +14735,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14725,7 +14789,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14734,10 +14798,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14773,6 +14849,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14818,10 +14900,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14854,34 +14942,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14920,6 +15048,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14953,9 +15087,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -15012,9 +15143,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15042,9 +15170,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15078,9 +15203,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15117,19 +15287,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15192,9 +15371,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15228,12 +15419,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15360,9 +15573,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15372,6 +15582,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15393,12 +15617,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15420,6 +15662,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15462,6 +15707,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15483,6 +15731,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15498,6 +15752,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15525,9 +15782,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15549,9 +15851,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15561,9 +15860,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15875,7 +16171,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15963,6 +16259,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18359,6 +18658,9 @@ msgstr "Potok"
msgid "River"
msgstr "Reka"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -19407,6 +19709,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19473,6 +19781,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20416,31 +20730,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -21032,6 +21334,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22325,6 +22631,9 @@ msgstr "Mesar"
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23138,9 +23447,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24185,6 +24491,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24276,6 +24585,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24352,6 +24667,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24376,6 +24696,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25149,6 +25472,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25191,7 +25524,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25994,6 +26327,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26035,8 +26371,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27634,6 +27970,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29797,9 +30192,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29957,9 +30349,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -30017,6 +30406,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30214,9 +30606,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/sq.po b/i18n/po/sq.po
index c743a8d..6aa879b 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 04:31+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 04:34+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr "Ndihmë"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr "Gabim"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr "Shto Pika"
@@ -708,6 +714,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -729,9 +738,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -782,6 +788,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -931,16 +940,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -949,6 +958,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -964,12 +979,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1762,9 +1771,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3950,9 +3956,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3982,12 +3985,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4680,12 +4698,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4702,8 +4726,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5024,9 +5048,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5165,82 +5186,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5406,6 +5351,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5465,7 +5486,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6857,212 +6878,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8168,6 +8189,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9654,6 +9678,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9666,9 +9693,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9765,14 +9789,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9785,6 +9801,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10773,6 +10792,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10785,6 +10807,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10797,6 +10831,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10856,6 +10893,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10874,9 +10916,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12071,6 +12120,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13106,6 +13161,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13127,12 +13188,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14092,6 +14147,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14580,13 +14638,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14610,7 +14671,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14661,7 +14725,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14670,10 +14734,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14709,6 +14785,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14754,10 +14836,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14790,34 +14878,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14856,6 +14984,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14889,9 +15023,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14948,9 +15079,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14978,9 +15106,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15014,9 +15139,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15053,19 +15223,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15128,9 +15307,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15164,12 +15355,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15296,9 +15509,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15308,6 +15518,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15329,12 +15553,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15356,6 +15598,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15398,6 +15643,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15419,6 +15667,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15434,6 +15688,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15461,9 +15718,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15485,9 +15787,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15497,9 +15796,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15811,7 +16107,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15899,6 +16195,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18295,6 +18594,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19343,6 +19645,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19409,6 +19717,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20352,31 +20666,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20968,6 +21270,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22261,6 +22567,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23074,9 +23383,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24121,6 +24427,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24212,6 +24521,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24288,6 +24603,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24312,6 +24632,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25085,6 +25408,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25127,7 +25460,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25930,6 +26263,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25971,8 +26307,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27570,6 +27906,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29731,9 +30126,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29891,9 +30283,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29951,6 +30340,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30148,9 +30540,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/sr.po b/i18n/po/sr.po
index dd25d09..5a52aae 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:05+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:11+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: sr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -65,9 +65,15 @@ msgstr "Припремам главни мени"
msgid "Help"
msgstr "Помоћ"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Иницијализација ОСМ АПИ-ја"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -202,6 +208,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr "Додај слој за слике {0}"
@@ -223,12 +235,6 @@ msgstr "Грешка"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr "Додај тачку..."
@@ -709,6 +715,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -730,9 +739,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -783,6 +789,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -932,16 +941,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
-msgstr ""
+msgid "Ok"
+msgstr "У реду"
-msgid "Separate Layer"
-msgstr "Посебан слој"
+msgid "Open Location..."
+msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -950,6 +959,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr "Посебан слој"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -965,12 +980,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr "У реду"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1763,9 +1772,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3951,9 +3957,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3983,12 +3986,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4681,12 +4699,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4703,8 +4727,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5025,9 +5049,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5166,82 +5187,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5407,6 +5352,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5466,7 +5487,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6858,212 +6879,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8170,6 +8191,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9656,6 +9680,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9668,9 +9695,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9767,14 +9791,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9787,6 +9803,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10775,6 +10794,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10787,6 +10809,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10799,6 +10833,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10858,6 +10895,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10876,9 +10918,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12073,6 +12122,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13108,6 +13163,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13129,12 +13190,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14094,6 +14149,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14582,13 +14640,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14612,7 +14673,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14663,7 +14727,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14672,10 +14736,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14711,6 +14787,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14756,10 +14838,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14792,34 +14880,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14858,6 +14986,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14891,9 +15025,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14950,9 +15081,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14980,9 +15108,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15016,9 +15141,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15055,19 +15225,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15130,9 +15309,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15166,12 +15357,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15298,9 +15511,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15310,6 +15520,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15331,12 +15555,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15358,6 +15600,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15400,6 +15645,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15421,6 +15669,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15436,6 +15690,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15463,9 +15720,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15487,9 +15789,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15499,9 +15798,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15813,7 +16109,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15901,6 +16197,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18297,6 +18596,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19345,6 +19647,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19411,6 +19719,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20354,31 +20668,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20970,6 +21272,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22263,6 +22569,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23076,9 +23385,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24123,6 +24429,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24214,6 +24523,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24290,6 +24605,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24314,6 +24634,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25087,6 +25410,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25129,7 +25462,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25932,6 +26265,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25973,8 +26309,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27572,6 +27908,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29733,9 +30128,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29893,9 +30285,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29953,6 +30342,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30150,9 +30542,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/sv.po b/i18n/po/sv.po
index 5e970b6..b37cb35 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
"PO-Revision-Date: 2016-10-08 14:18+0000\n"
"Last-Translator: Niklas Henriksson <fringillus92 at gmail.com>\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: 2016-11-07 05:09+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:14+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: sv\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr "Bygger huvudmenyn"
msgid "Help"
msgstr "Hjälp"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Initierar OSM-API"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Initierar validerare"
@@ -208,6 +214,12 @@ msgid ""
msgstr ""
"Sätt urval av element på kartan till de valda posterna i listan ovan."
+msgid "Select WMS layers"
+msgstr "Välj WMS-lager"
+
+msgid "Add layers"
+msgstr "Lägg till lager"
+
msgid "Add imagery layer {0}"
msgstr "Lägg till bildlager {0}"
@@ -229,12 +241,6 @@ msgstr "Fel"
msgid "Select image format for WMS layer"
msgstr "Välj bildformat för WMS-lager"
-msgid "Select WMS layers"
-msgstr "Välj WMS-lager"
-
-msgid "Add layers"
-msgstr "Lägg till lager"
-
msgid "Add Node..."
msgstr "Lägg till nod..."
@@ -746,6 +752,9 @@ msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
"Öppnar en dialogruta som gör att man kan gå direkt till en viss plats"
+msgid "Jump to Position"
+msgstr "Gå till position"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Ange Lat/Long för att hoppa till position"
@@ -767,9 +776,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Gå direkt dit"
-msgid "Jump to Position"
-msgstr "Gå till position"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Kunde inte tolka latitude, longitude eller zoomnivå. Kontrollera värdena."
@@ -822,6 +828,9 @@ msgstr "Sammanfoga lagren"
msgid "Merge the current layer into another layer"
msgstr "Sammanfoga det nuvarande lagret med ett annat"
+msgid "{0} completed in {1}"
+msgstr "{0} genomfört på {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Slå ihop lager med olika uppladdningsprinciper"
@@ -990,24 +999,30 @@ msgstr[1] "Öppnar {0} filer..."
msgid "Opening file ''{0}'' ..."
msgstr "Öppnar fil ''{0}'' ..."
+msgid "Which tasks to perform?"
+msgstr "Vilka åtgärder ska genomföras?"
+
+msgid "Ok"
+msgstr "Ok"
+
msgid "Open Location..."
msgstr "Öppna plats..."
msgid "Open an URL."
msgstr "Öppna en URL."
-msgid "Separate Layer"
-msgstr "Skilda lager"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Välj om datan ska hämtas som ett nytt lager"
-
msgid "Enter URL to download:"
msgstr "Ange URL att hämta:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Skriv in URL:en till datan du vill hämta"
+msgid "Separate Layer"
+msgstr "Skilda lager"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Välj om datan ska hämtas som ett nytt lager"
+
msgid "Download Location"
msgstr "Hämta plats"
@@ -1023,12 +1038,6 @@ msgstr "Stäng dialogen och avbryt hämtning"
msgid "Download Data"
msgstr "Hämta data"
-msgid "Which tasks to perform?"
-msgstr "Vilka åtgärder ska genomföras?"
-
-msgid "Ok"
-msgstr "Ok"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1888,9 +1897,6 @@ msgstr "Sök och ladda ner ändringsuppsättningar"
msgid "Errors during download"
msgstr "Fel under hämtning"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr "Ladda ner från GPS"
@@ -4228,9 +4234,6 @@ msgstr "Sträcka av typen yta är inte sluten"
msgid "No outer way for multipolygon"
msgstr "Multipolygon utan angiven yttre sträcka"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "Roll för \"{0}\" borde vara \"{1}\""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -4264,10 +4267,25 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr "Multipolygonen är inte stängd"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
+
+msgid "Intersection between multipolygon ways"
+msgstr ""
+
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "Roll för \"{0}\" borde vara \"{1}\""
+
msgid "Multipolygon inner way is outside"
msgstr "Inre sträcka av multipolygon är ytterst"
-msgid "Intersection between multipolygon ways"
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
msgstr ""
msgid "No useful role for multipolygon member"
@@ -4984,12 +5002,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr "Val tillhandahållna som Java-systeminställningar"
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/PATH/TO/JOSM/PREF "
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/PATH/TO/JOSM/USERDATA"
@@ -5006,11 +5030,9 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/PATH/TO/JOSM/HOMEDIR "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Omlokalisera alla 3 mappar till homedir. Cachemappen kommer att vara i "
-"homedir/cache"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5341,9 +5363,6 @@ msgstr "Klicka för att köra jobb i bakgrunden"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} genomfört på {1}"
-
msgid "Enlarge"
msgstr "Förstora"
@@ -5482,84 +5501,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr "Min version med deras"
-
-msgid "My with Merged"
-msgstr "Min version med sammanfogad"
-
-msgid "Their with Merged"
-msgstr "Deras med sammanfogad"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr "Egenskaper"
-
-msgid "Tags"
-msgstr "Taggar"
-
-msgid "Nodes"
-msgstr "Noder"
-
-msgid "Members"
-msgstr "Medlemmar"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Inga väntande taggkonflikter finns att lösa"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Taggar({0} konflikt)"
-msgstr[1] "Taggar({0} konflikter)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr "Noder(fixade)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Sammanslagen nodlista fastställd. Inga olösta konflikter i denna sträckas "
-"nodlista"
-
-msgid "Nodes(with conflicts)"
-msgstr "Noder(med konflikter)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Olösta konflikter i denna sträckas nodlista"
-
-msgid "Members(resolved)"
-msgstr "Medlemmar(fixade)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr "Medlemmar(med konflikter)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr "Egenskaper(med konflikter)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr "Konfliktlösning"
-
msgid "{0} more..."
msgstr "{0} fler..."
@@ -5725,6 +5666,84 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr "Min version med deras"
+
+msgid "My with Merged"
+msgstr "Min version med sammanfogad"
+
+msgid "Their with Merged"
+msgstr "Deras med sammanfogad"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr "Egenskaper"
+
+msgid "Tags"
+msgstr "Taggar"
+
+msgid "Nodes"
+msgstr "Noder"
+
+msgid "Members"
+msgstr "Medlemmar"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Inga väntande taggkonflikter finns att lösa"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Taggar({0} konflikt)"
+msgstr[1] "Taggar({0} konflikter)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr "Noder(fixade)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Sammanslagen nodlista fastställd. Inga olösta konflikter i denna sträckas "
+"nodlista"
+
+msgid "Nodes(with conflicts)"
+msgstr "Noder(med konflikter)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Olösta konflikter i denna sträckas nodlista"
+
+msgid "Members(resolved)"
+msgstr "Medlemmar(fixade)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr "Medlemmar(med konflikter)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr "Egenskaper(med konflikter)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr "Konfliktlösning"
+
msgid "Node"
msgstr "Nod"
@@ -5784,7 +5803,7 @@ msgstr "Roll"
msgid "Primitive"
msgstr "Primitiv"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -7184,115 +7203,28 @@ msgstr "Uppdatera innehåll"
msgid "Update the changeset content from the OSM server"
msgstr "Uppdatera ändringsuppsättningens innehåll mot OSM-servern"
-msgid "Changeset ID: "
-msgstr ""
-
-msgid "Enter a changeset id"
-msgstr ""
-
-msgid ""
-"Download the changeset with the specified id, including the changeset content"
-msgstr ""
-
-msgid "Select changesets owned by specific users"
-msgstr ""
-
-msgid "Select changesets depending on whether they are open or closed"
-msgstr ""
-
-msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr ""
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr ""
-
-msgid "Query open changesets only"
-msgstr ""
-
-msgid "Query closed changesets only"
-msgstr ""
-
-msgid "Query both open and closed changesets"
-msgstr ""
-
-msgid "Only changesets owned by myself"
-msgstr ""
-
-msgid "User ID:"
-msgstr "Användar-id:"
-
-msgid "User name:"
-msgstr "Användarnamn:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-"Endast ändringsuppsättningar ägda av användaren med följande användarnamn"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr ""
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-
-msgid "Please enter a valid user ID"
-msgstr "Ange ett giltigt användar-ID"
-
-msgid "Invalid user ID"
-msgstr "Ogiltigt användar-ID"
-
-msgid "Please enter a non-empty user name"
-msgstr "Ange ett icke-tomt användarnamn"
-
-msgid "Invalid user name"
-msgstr "Ogiltigt användarnamn"
-
-msgid "Date: "
-msgstr "Datum: "
-
-msgid "Time:"
-msgstr "Tid:"
-
-msgid "Closed after - "
-msgstr "Stängt efter - "
-
-msgid "Date:"
-msgstr "Datum:"
-
-msgid "Created before - "
-msgstr "Skapad före - "
-
-msgid "Only changesets closed after the following date/time"
+msgid "Changeset ID: "
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Enter a changeset id"
msgstr ""
msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+"Download the changeset with the specified id, including the changeset content"
+msgstr ""
+
+msgid "Select changesets owned by specific users"
+msgstr ""
+
+msgid "Select changesets depending on whether they are open or closed"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Select changesets based on the date/time they have been created or closed"
msgstr ""
-msgid "Invalid date/time values"
-msgstr "Ogiltigt datum/tid"
+msgid "Select only changesets related to a specific bounding box"
+msgstr ""
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
@@ -7307,27 +7239,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr "Angett värde är inte ett giltigt användar-ID. Ange ett heltal > 0"
-
-msgid "Please enter an integer value > 0"
-msgstr "Ange ett heltal > 0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Ange ett datum i det vanliga formatet för din plats.<br>Exempel: "
-"{0}<br>Exempel: {1}<br>Exempel: {2}<br>Exempel: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Ange en tid i det vanliga formatet för din plats.<br>Exempel: "
-"{0}<br>Exempel: {1}<br>Exempel: {2}<br>Exempel: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Hämta endast mina ändringsuppsättningar"
@@ -7403,6 +7314,70 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Ange ett datum i det vanliga formatet för din plats.<br>Exempel: "
+"{0}<br>Exempel: {1}<br>Exempel: {2}<br>Exempel: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr ""
+
+msgid "Query closed changesets only"
+msgstr ""
+
+msgid "Query both open and closed changesets"
+msgstr ""
+
+msgid "Date: "
+msgstr "Datum: "
+
+msgid "Time:"
+msgstr "Tid:"
+
+msgid "Closed after - "
+msgstr "Stängt efter - "
+
+msgid "Date:"
+msgstr "Datum:"
+
+msgid "Created before - "
+msgstr "Skapad före - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr ""
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+
+msgid "Invalid date/time values"
+msgstr "Ogiltigt datum/tid"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Ange en tid i det vanliga formatet för din plats.<br>Exempel: "
+"{0}<br>Exempel: {1}<br>Exempel: {2}<br>Exempel: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr "Angett värde är inte ett giltigt användar-ID. Ange ett heltal > 0"
+
+msgid "Please enter an integer value > 0"
+msgstr "Ange ett heltal > 0"
+
msgid "URL: "
msgstr "URL: "
@@ -7422,6 +7397,50 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Only changesets owned by myself"
+msgstr ""
+
+msgid "User ID:"
+msgstr "Användar-id:"
+
+msgid "User name:"
+msgstr "Användarnamn:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr ""
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+"Endast ändringsuppsättningar ägda av användaren med följande användarnamn"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr ""
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+
+msgid "Please enter a valid user ID"
+msgstr "Ange ett giltigt användar-ID"
+
+msgid "Invalid user ID"
+msgstr "Ogiltigt användar-ID"
+
+msgid "Please enter a non-empty user name"
+msgstr "Ange ett icke-tomt användarnamn"
+
+msgid "Invalid user name"
+msgstr "Ogiltigt användarnamn"
+
msgid "Activate"
msgstr "Aktivera"
@@ -8549,6 +8568,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10099,6 +10121,9 @@ msgstr "Riktning"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave-ljudfiler (*.wav)"
+
msgid "Import Audio"
msgstr "Importera ljud"
@@ -10111,9 +10136,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Import ej möjlig"
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave-ljudfiler (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Ljudmarkörer från {0}"
@@ -10218,14 +10240,6 @@ msgstr "(URL:en var: "
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -10238,6 +10252,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -11249,6 +11266,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "En enda färg (kan anpassas för namngivna lager)"
@@ -11261,6 +11281,18 @@ msgstr "Cykel"
msgid "Foot"
msgstr "Fotgängare"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Naturskog"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -11273,6 +11305,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11344,6 +11379,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11364,10 +11404,17 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
"Tillåter att spårets färg justeras efter olika genomsnittshastigheter."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Spår- och punktfärgläggning"
@@ -12584,6 +12631,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr "Onödiga taggar"
@@ -13635,6 +13688,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Spara användare och lösenord (okrypterat)"
+msgid "Assume"
+msgstr "Antag"
+
+msgid "Existing values"
+msgstr "Existerande värden"
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13656,12 +13715,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Skift+Enter: Lägg till alla taggar till valda objekt"
-msgid "Assume"
-msgstr "Antag"
-
-msgid "Existing values"
-msgstr "Existerande värden"
-
msgid "Enable the checkbox to accept the value"
msgstr "Kryssa i rutan för att acceptera värdet"
@@ -14708,6 +14761,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -15202,13 +15258,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -15232,7 +15291,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -15283,7 +15345,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -15292,10 +15354,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -15331,6 +15405,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -15376,10 +15456,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -15412,34 +15498,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -15478,6 +15604,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -15511,9 +15643,6 @@ msgstr "Cadastre"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -15570,9 +15699,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15600,9 +15726,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15636,9 +15759,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15675,19 +15843,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15750,9 +15927,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15786,12 +15975,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15918,9 +16129,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15930,6 +16138,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15951,12 +16173,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15978,6 +16218,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -16020,6 +16263,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -16041,6 +16287,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -16056,6 +16308,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -16083,9 +16338,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -16107,9 +16407,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -16119,9 +16416,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -16435,7 +16729,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr "Skapa rutnät av sträckor."
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -16523,6 +16817,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18941,6 +19238,9 @@ msgstr "Bäck"
msgid "River"
msgstr "Flod"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -19989,6 +20289,12 @@ msgstr "Motell"
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Fäbod"
@@ -20055,6 +20361,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Snabbmat"
@@ -21000,31 +21312,19 @@ msgstr "gömsle"
msgid "Hunting Stand"
msgstr "Jakttorn"
-msgid "Height"
-msgstr "Höjd"
-
-msgctxt "height"
-msgid "low"
-msgstr "låg"
-
-msgctxt "height"
-msgid "half"
-msgstr "halv"
-
-msgctxt "height"
-msgid "full"
-msgstr "full"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
-msgstr "Lås"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -21616,6 +21916,10 @@ msgid "hut"
msgstr "stuga"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr "elevhem/studenthem"
@@ -22909,6 +23213,9 @@ msgstr "Slakteri"
msgid "Seafood"
msgstr "Skaldjur"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23722,9 +24029,6 @@ msgstr "Allé"
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr "Naturskog"
-
msgid "Woodland where timber production does not dominate use."
msgstr "Skog där timmerproduktion inte är huvudsakligt användningsområde."
@@ -24780,6 +25084,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24871,6 +25178,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24947,6 +25260,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "förkortat gatunamn"
@@ -24971,6 +25289,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25746,6 +26067,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25788,7 +26119,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -26591,6 +26922,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26632,8 +26966,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -28248,6 +28582,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -30432,9 +30825,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -30592,9 +30982,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr "Ruttmönster..."
@@ -30652,6 +31039,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30849,9 +31239,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/ta.po b/i18n/po/ta.po
index 492017f..758b84a 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
"PO-Revision-Date: 2015-10-28 15:55+0000\n"
"Last-Translator: நவலடி <navaladi at gmail.com>\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: 2016-11-07 05:09+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:15+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"X-Poedit-Country: INDIA\n"
"Language: ta\n"
"X-Poedit-Language: Tamil\n"
@@ -66,9 +66,15 @@ msgstr "பிரதான பட்டி உருவாக்கபடுக
msgid "Help"
msgstr "உதவி"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "OSM API துவக்குகிறது"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "மதிப்பாய்வாளர் துவக்குகிறது"
@@ -206,6 +212,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -227,12 +239,6 @@ msgstr "பிழை"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr "புள்ளியை சேர்க்கவும்"
@@ -725,6 +731,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr "இடத்திர்க்கு குதி"
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -746,9 +755,6 @@ msgstr ""
msgid "Jump there"
msgstr "அங்கே குதி"
-msgid "Jump to Position"
-msgstr "இடத்திர்க்கு குதி"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -799,6 +805,9 @@ msgstr "அடுக்கை ஒன்றிணையவும்"
msgid "Merge the current layer into another layer"
msgstr "இன்னொரு அடுக்கில் நிகழும் அடுக்கை ஒன்றிணையவும்"
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -952,24 +961,30 @@ msgstr[1] "{0} கோப்புகள் திறக்கப்படுக
msgid "Opening file ''{0}'' ..."
msgstr "\"{0}\" ஆம் கோப்பை திறந்துகின்றது"
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr ""
+
msgid "Open Location..."
msgstr "இடத்தினை திற..."
msgid "Open an URL."
msgstr "முகவரியை திற"
-msgid "Separate Layer"
-msgstr "தனியான அடுக்கு"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr ""
-
msgid "Enter URL to download:"
msgstr "இறக்க வேண்டிய முகவரியை குறிப்பிடு"
msgid "Enter an URL from where data should be downloaded"
msgstr "தகவல் இறக்க வேண்டிய முகவரியை குறிப்பிடு"
+msgid "Separate Layer"
+msgstr "தனியான அடுக்கு"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr "இறக்க வேண்டிய இடம்"
@@ -985,12 +1000,6 @@ msgstr "கேள்வி பெட்டியை மூடிவிட்ட
msgid "Download Data"
msgstr "விவரத்தை பதிவிறக்கு"
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1798,9 +1807,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3986,9 +3992,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -4018,12 +4021,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4716,12 +4734,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4738,8 +4762,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5060,9 +5084,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5201,82 +5222,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5442,6 +5387,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5501,7 +5522,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6852,161 +6873,58 @@ msgstr ""
msgid "{0} [incomplete]"
msgstr ""
-msgid "open"
-msgstr ""
-
-msgid "closed"
-msgstr ""
-
-msgid "Download content"
-msgstr ""
-
-msgid "Download the changeset content from the OSM server"
-msgstr ""
-
-msgid "Update content"
-msgstr ""
-
-msgid "Update the changeset content from the OSM server"
-msgstr ""
-
-msgid "Changeset ID: "
-msgstr ""
-
-msgid "Enter a changeset id"
-msgstr ""
-
-msgid ""
-"Download the changeset with the specified id, including the changeset content"
-msgstr ""
-
-msgid "Select changesets owned by specific users"
-msgstr ""
-
-msgid "Select changesets depending on whether they are open or closed"
-msgstr ""
-
-msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr ""
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr ""
-
-msgid "Query open changesets only"
-msgstr ""
-
-msgid "Query closed changesets only"
-msgstr ""
-
-msgid "Query both open and closed changesets"
-msgstr ""
-
-msgid "Only changesets owned by myself"
-msgstr ""
-
-msgid "User ID:"
-msgstr ""
-
-msgid "User name:"
-msgstr ""
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr ""
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-
-msgid "Please enter a valid user ID"
-msgstr ""
-
-msgid "Invalid user ID"
-msgstr ""
-
-msgid "Please enter a non-empty user name"
-msgstr ""
-
-msgid "Invalid user name"
-msgstr ""
-
-msgid "Date: "
-msgstr "தேதி: "
-
-msgid "Time:"
-msgstr ""
-
-msgid "Closed after - "
+msgid "open"
msgstr ""
-msgid "Date:"
-msgstr "தேதி:"
+msgid "closed"
+msgstr ""
-msgid "Created before - "
+msgid "Download content"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Download the changeset content from the OSM server"
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Update content"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+msgid "Changeset ID: "
msgstr ""
-msgid "Invalid date/time values"
+msgid "Enter a changeset id"
msgstr ""
msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+"Download the changeset with the specified id, including the changeset content"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Select changesets owned by specific users"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Select changesets depending on whether they are open or closed"
msgstr ""
msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+"Select changesets based on the date/time they have been created or closed"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Select only changesets related to a specific bounding box"
msgstr ""
msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
+msgstr ""
+
+msgid "Invalid bounding box"
msgstr ""
msgid "Download my changesets only"
@@ -7085,6 +7003,66 @@ msgstr ""
msgid "Close the dialog and abort querying of changesets"
msgstr ""
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid "Query open changesets only"
+msgstr ""
+
+msgid "Query closed changesets only"
+msgstr ""
+
+msgid "Query both open and closed changesets"
+msgstr ""
+
+msgid "Date: "
+msgstr "தேதி: "
+
+msgid "Time:"
+msgstr ""
+
+msgid "Closed after - "
+msgstr ""
+
+msgid "Date:"
+msgstr "தேதி:"
+
+msgid "Created before - "
+msgstr ""
+
+msgid "Only changesets closed after the following date/time"
+msgstr ""
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+
+msgid "Invalid date/time values"
+msgstr ""
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+
+msgid "Please enter an integer value > 0"
+msgstr ""
+
msgid "URL: "
msgstr ""
@@ -7102,6 +7080,49 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
+msgid "Only changesets owned by myself"
+msgstr ""
+
+msgid "User ID:"
+msgstr ""
+
+msgid "User name:"
+msgstr ""
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr ""
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr ""
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr ""
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+
+msgid "Please enter a valid user ID"
+msgstr ""
+
+msgid "Invalid user ID"
+msgstr ""
+
+msgid "Please enter a non-empty user name"
+msgstr ""
+
+msgid "Invalid user name"
+msgstr ""
+
msgid "Activate"
msgstr ""
@@ -8205,6 +8226,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9693,6 +9717,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9705,9 +9732,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9804,14 +9828,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9824,6 +9840,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10812,6 +10831,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10824,6 +10846,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10836,6 +10870,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10895,6 +10932,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10913,9 +10955,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12110,6 +12159,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13145,6 +13200,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13166,12 +13227,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14131,6 +14186,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14619,13 +14677,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14649,7 +14710,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14700,7 +14764,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14709,10 +14773,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14748,6 +14824,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14793,10 +14875,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14829,34 +14917,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14895,6 +15023,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14928,9 +15062,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14987,9 +15118,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15017,9 +15145,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15053,9 +15178,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15092,19 +15262,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15167,9 +15346,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15203,12 +15394,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15335,9 +15548,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15347,6 +15557,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15368,12 +15592,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15395,6 +15637,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15437,6 +15682,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15458,6 +15706,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15473,6 +15727,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15500,9 +15757,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15524,9 +15826,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15536,9 +15835,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15850,7 +16146,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15938,6 +16234,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18334,6 +18633,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19382,6 +19684,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19448,6 +19756,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20391,31 +20705,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -21007,6 +21309,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22300,6 +22606,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23113,9 +23422,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24160,6 +24466,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24251,6 +24560,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24327,6 +24642,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24351,6 +24671,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25124,6 +25447,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25166,7 +25499,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25969,6 +26302,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26010,8 +26346,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27609,6 +27945,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29776,9 +30171,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29936,9 +30328,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29996,6 +30385,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30193,9 +30585,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/te.po b/i18n/po/te.po
index aa6d43b..d0e13fe 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:10+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:15+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: te\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr "సహాయం"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr "దోషము"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -708,6 +714,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -729,9 +738,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -782,6 +788,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -931,16 +940,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -949,6 +958,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -964,12 +979,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1762,9 +1771,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3950,9 +3956,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3982,12 +3985,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4680,12 +4698,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4702,8 +4726,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5024,9 +5048,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5165,82 +5186,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5406,6 +5351,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5465,7 +5486,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6857,212 +6878,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8168,6 +8189,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9654,6 +9678,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9666,9 +9693,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9765,14 +9789,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9785,6 +9801,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10773,6 +10792,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10785,6 +10807,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10797,6 +10831,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10856,6 +10893,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10874,9 +10916,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12071,6 +12120,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13106,6 +13161,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13127,12 +13188,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14092,6 +14147,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14580,13 +14638,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14610,7 +14671,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14661,7 +14725,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14670,10 +14734,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14709,6 +14785,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14754,10 +14836,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14790,34 +14878,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14856,6 +14984,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14889,9 +15023,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14948,9 +15079,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14978,9 +15106,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15014,9 +15139,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15053,19 +15223,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15128,9 +15307,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15164,12 +15355,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15296,9 +15509,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15308,6 +15518,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15329,12 +15553,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15356,6 +15598,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15398,6 +15643,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15419,6 +15667,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15434,6 +15688,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15461,9 +15718,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15485,9 +15787,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15497,9 +15796,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15811,7 +16107,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15899,6 +16195,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18295,6 +18594,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19343,6 +19645,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19409,6 +19717,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20352,31 +20666,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20968,6 +21270,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22261,6 +22567,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23074,9 +23383,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24121,6 +24427,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24212,6 +24521,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24288,6 +24603,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24312,6 +24632,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25085,6 +25408,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25127,7 +25460,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25930,6 +26263,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25971,8 +26307,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27570,6 +27906,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29731,9 +30126,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29891,9 +30283,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29951,6 +30340,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30148,9 +30540,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/th.po b/i18n/po/th.po
index 50bc9ba..87d7063 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:10+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:16+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: th\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr ""
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr ""
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -708,6 +714,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -729,9 +738,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -782,6 +788,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -931,16 +940,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -949,6 +958,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -964,12 +979,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1762,9 +1771,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3950,9 +3956,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3982,12 +3985,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4680,12 +4698,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4702,8 +4726,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5024,9 +5048,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5165,82 +5186,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5406,6 +5351,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5465,7 +5486,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6857,212 +6878,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8168,6 +8189,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9654,6 +9678,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9666,9 +9693,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9765,14 +9789,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9785,6 +9801,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10773,6 +10792,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10785,6 +10807,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10797,6 +10831,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10856,6 +10893,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10874,9 +10916,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12071,6 +12120,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13106,6 +13161,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13127,12 +13188,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14092,6 +14147,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14580,13 +14638,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14610,7 +14671,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14661,7 +14725,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14670,10 +14734,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14709,6 +14785,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14754,10 +14836,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14790,34 +14878,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14856,6 +14984,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14889,9 +15023,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14948,9 +15079,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14978,9 +15106,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15014,9 +15139,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15053,19 +15223,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15128,9 +15307,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15164,12 +15355,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15296,9 +15509,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15308,6 +15518,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15329,12 +15553,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15356,6 +15598,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15398,6 +15643,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15419,6 +15667,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15434,6 +15688,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15461,9 +15718,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15485,9 +15787,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15497,9 +15796,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15811,7 +16107,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15899,6 +16195,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18295,6 +18594,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19343,6 +19645,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19409,6 +19717,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20352,31 +20666,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20968,6 +21270,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22261,6 +22567,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23074,9 +23383,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24121,6 +24427,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24212,6 +24521,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24288,6 +24603,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24312,6 +24632,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25085,6 +25408,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25127,7 +25460,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25930,6 +26263,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25971,8 +26307,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27570,6 +27906,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29731,9 +30126,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29891,9 +30283,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29951,6 +30340,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30148,9 +30540,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/tr.po b/i18n/po/tr.po
index 7d414ac..bbf32ad 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
"PO-Revision-Date: 2015-11-16 12:04+0000\n"
"Last-Translator: Erkin Alp Güney <Unknown>\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: 2016-11-07 05:11+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:17+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -66,9 +66,15 @@ msgstr "Ana menü oluşturuluyor"
msgid "Help"
msgstr "Yardım"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "OSM API başlatılıyor"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Onaylayıcı yükleniyor"
@@ -205,6 +211,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr "Haritada seçili elemanları listedede seç."
+msgid "Select WMS layers"
+msgstr "WMS katmanı seç"
+
+msgid "Add layers"
+msgstr "Katman ekle"
+
msgid "Add imagery layer {0}"
msgstr "Referans görüntü katmanı ekle {0}"
@@ -226,12 +238,6 @@ msgstr "Hata"
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr "WMS katmanı seç"
-
-msgid "Add layers"
-msgstr "Katman ekle"
-
msgid "Add Node..."
msgstr "Nokta Ekle..."
@@ -729,6 +735,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Koordinatları vererek oraya atlamanızı sağlayan diyalogu açar"
+msgid "Jump to Position"
+msgstr "Konuma Git"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Gitmek istediğiniz konumun enlem/boylamını girin."
@@ -750,9 +759,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Oraya zıpla"
-msgid "Jump to Position"
-msgstr "Konuma Git"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr "Enlem, Boylam ve Zoom çözümlenemedi. Lütfen kontrol ediniz."
@@ -804,6 +810,9 @@ msgstr "Katmanları birleştir"
msgid "Merge the current layer into another layer"
msgstr "Varsayılan tabaka başka bir tabaka ile birleştir"
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -952,24 +961,30 @@ msgstr[0] "{0} dosya açılıyor..."
msgid "Opening file ''{0}'' ..."
msgstr "''{0}'' dosyası açılıyor..."
+msgid "Which tasks to perform?"
+msgstr ""
+
+msgid "Ok"
+msgstr "Tamam"
+
msgid "Open Location..."
msgstr "Konum Aç..."
msgid "Open an URL."
msgstr "URL aç..."
-msgid "Separate Layer"
-msgstr "Farklı Katman"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "{"
-
msgid "Enter URL to download:"
msgstr "İndirilecek URL’yi girin:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Verinin indirileceği URL’yi girin:"
+msgid "Separate Layer"
+msgstr "Farklı Katman"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "{"
+
msgid "Download Location"
msgstr "İndirme Konumu"
@@ -985,12 +1000,6 @@ msgstr "Pencereyi kapat ve indirmeyi iptal et"
msgid "Download Data"
msgstr "Veriyi İndir"
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr "Tamam"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1805,9 +1814,6 @@ msgstr ""
msgid "Errors during download"
msgstr "İndirme sırasında hatalarla karşılaşıldı"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -4005,9 +4011,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -4037,12 +4040,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4745,12 +4763,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4767,8 +4791,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5089,9 +5113,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5230,81 +5251,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr "Özellikler"
-
-msgid "Tags"
-msgstr "Etiketler"
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr "Üyeler"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Etiket sayısı ({0} sorunlu)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr "Özellikleri (sorunlu)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5470,6 +5416,81 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr "Özellikler"
+
+msgid "Tags"
+msgstr "Etiketler"
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr "Üyeler"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Etiket sayısı ({0} sorunlu)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr "Özellikleri (sorunlu)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5529,7 +5550,7 @@ msgstr "Rol"
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6921,212 +6942,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
+msgstr "Sadece kendim değişiklik takımlarım indir"
+
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "User name:"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Basic"
msgstr ""
-msgid "Invalid user ID"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "From URL"
msgstr ""
-msgid "Invalid user name"
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Date: "
+msgid "Advanced"
msgstr ""
-msgid "Time:"
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Closed after - "
+msgid "Query changesets"
msgstr ""
-msgid "Date:"
+msgid "Query and download changesets"
msgstr ""
-msgid "Created before - "
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+msgid "Query open changesets only"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query both open and closed changesets"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Date: "
msgstr ""
-msgid "Invalid bounding box"
+msgid "Time:"
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid "Download my changesets only"
-msgstr "Sadece kendim değişiklik takımlarım indir"
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid "Invalid date/time values"
msgstr ""
msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
-msgstr ""
-
-msgid "<html>Download my open changesets</html>"
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8234,6 +8255,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9731,6 +9755,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audio files (*.wav)"
+
msgid "Import Audio"
msgstr "Sesi içeri al"
@@ -9743,9 +9770,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audio files (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "{0} daki ses imleçleri"
@@ -9845,14 +9869,6 @@ msgstr "(URL : "
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9865,6 +9881,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10861,6 +10880,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10873,6 +10895,18 @@ msgstr "Bisiklet"
msgid "Foot"
msgstr "Ayak"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Orman"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10885,6 +10919,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10947,6 +10984,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10965,9 +11007,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr "Farklı ortalama hızar için farklı renklerin kullanılmasına izin ver"
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12163,6 +12212,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13204,6 +13259,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "KullanıcıAdı ve şifreyi Sakla (Düz Metin Olarak)"
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13225,12 +13286,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14193,6 +14248,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14685,13 +14743,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14715,7 +14776,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14766,7 +14830,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14775,10 +14839,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14814,6 +14890,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14859,10 +14941,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14895,34 +14983,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14961,6 +15089,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14994,9 +15128,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -15053,9 +15184,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15083,9 +15211,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15119,9 +15244,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15158,19 +15328,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15233,9 +15412,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15269,12 +15460,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15401,9 +15614,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15413,6 +15623,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15434,12 +15658,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15461,6 +15703,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15503,6 +15748,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15524,6 +15772,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15539,6 +15793,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15566,9 +15823,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15590,9 +15892,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15602,9 +15901,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15916,7 +16212,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -16004,6 +16300,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18400,6 +18699,9 @@ msgstr "dere"
msgid "River"
msgstr "nehir"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -19448,6 +19750,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "kulübe"
@@ -19514,6 +19822,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Fast Food"
@@ -20457,31 +20771,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr "Av Standı"
-msgid "Height"
-msgstr "Yükseklik"
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
-msgstr "Kilitle"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -21073,6 +21375,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22366,6 +22672,9 @@ msgstr "kasap"
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23179,9 +23488,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr "Orman"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24226,6 +24532,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24317,6 +24626,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24393,6 +24708,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24417,6 +24737,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25190,6 +25513,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25232,7 +25565,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -26035,6 +26368,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26076,8 +26412,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27677,6 +28013,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29850,9 +30245,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -30010,9 +30402,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -30070,6 +30459,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30267,9 +30659,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/ug.po b/i18n/po/ug.po
index 8f251de..d3ae47a 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:12+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:17+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr ""
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr ""
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -708,6 +714,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -729,9 +738,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -782,6 +788,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -931,16 +940,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -949,6 +958,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -964,12 +979,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1762,9 +1771,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3950,9 +3956,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3982,12 +3985,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4680,12 +4698,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4702,8 +4726,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5024,9 +5048,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5165,82 +5186,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5406,6 +5351,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5465,7 +5486,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6857,212 +6878,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8168,6 +8189,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9654,6 +9678,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9666,9 +9693,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9765,14 +9789,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9785,6 +9801,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10773,6 +10792,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10785,6 +10807,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10797,6 +10831,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10856,6 +10893,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10874,9 +10916,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12071,6 +12120,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13106,6 +13161,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13127,12 +13188,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14092,6 +14147,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14580,13 +14638,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14610,7 +14671,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14661,7 +14725,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14670,10 +14734,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14709,6 +14785,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14754,10 +14836,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14790,34 +14878,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14856,6 +14984,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14889,9 +15023,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14948,9 +15079,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14978,9 +15106,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15014,9 +15139,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15053,19 +15223,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15128,9 +15307,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15164,12 +15355,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15296,9 +15509,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15308,6 +15518,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15329,12 +15553,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15356,6 +15598,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15398,6 +15643,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15419,6 +15667,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15434,6 +15688,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15461,9 +15718,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15485,9 +15787,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15497,9 +15796,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15811,7 +16107,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15899,6 +16195,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18295,6 +18594,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19343,6 +19645,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19409,6 +19717,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20352,31 +20666,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20968,6 +21270,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22261,6 +22567,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23074,9 +23383,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24121,6 +24427,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24212,6 +24521,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24288,6 +24603,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24312,6 +24632,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25085,6 +25408,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25127,7 +25460,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25930,6 +26263,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25971,8 +26307,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27570,6 +27906,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29731,9 +30126,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29891,9 +30283,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29951,6 +30340,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30148,9 +30540,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/uk.po b/i18n/po/uk.po
index a9000f9..273682c 100644
--- a/i18n/po/uk.po
+++ b/i18n/po/uk.po
@@ -7,17 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-06 22:51+0100\n"
-"PO-Revision-Date: 2016-11-03 18:10+0000\n"
-"Last-Translator: andygol <Unknown>\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
+"PO-Revision-Date: 2017-01-06 20:19+0000\n"
+"Last-Translator: Don-vip <Unknown>\n"
"Language-Team: Ukrainian <uk 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=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: 2016-11-07 05:12+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:18+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: uk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -66,9 +66,15 @@ msgstr "Створення основного меню"
msgid "Help"
msgstr "Довідка"
+msgid "Initializing internal boundaries data"
+msgstr "Ініціалізація даних про внутрішні межі"
+
msgid "Initializing OSM API"
msgstr "Ініціалізація OSM API"
+msgid "Initializing internal traffic data"
+msgstr "Ініціалізація даних про внутрішній правила дорожнього руху"
+
msgid "Initializing validator"
msgstr "Ініціалізація валідатора"
@@ -219,6 +225,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr "Виділити на мапі об’єкти, вибрані у списку вгорі."
+msgid "Select WMS layers"
+msgstr "Оберіть шари WMS"
+
+msgid "Add layers"
+msgstr "Додати шари"
+
msgid "Add imagery layer {0}"
msgstr "Додати шар з зображенням {0}"
@@ -240,12 +252,6 @@ msgstr "Помилка"
msgid "Select image format for WMS layer"
msgstr "Оберіть формат зображення для шару WMS"
-msgid "Select WMS layers"
-msgstr "Оберіть шари WMS"
-
-msgid "Add layers"
-msgstr "Додати шари"
-
msgid "Add Node..."
msgstr "Додати точку…"
@@ -759,6 +765,9 @@ msgstr "Перейти до позиції"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Відкриває діалог, що дозволяє перейти до певної позиції"
+msgid "Jump to Position"
+msgstr "Перейти до позиції"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Введіть координати, щоб перейти до позиції"
@@ -780,9 +789,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Перейти туди"
-msgid "Jump to Position"
-msgstr "Перейти до позиції"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
"Неможливо розібрати широту, довготу чи масштаб. Будь ласка, перевірте."
@@ -837,6 +843,9 @@ msgstr "Об’єднати шари"
msgid "Merge the current layer into another layer"
msgstr "Об’єднати поточний шар з іншим шаром"
+msgid "{0} completed in {1}"
+msgstr "{0} завершено з {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Злиття шарів, що мають різні правила надсилання на сервер"
@@ -1017,24 +1026,30 @@ msgstr[2] "Відкриття {0} файлів…"
msgid "Opening file ''{0}'' ..."
msgstr "Відкриття файлу \"{0}\" …"
+msgid "Which tasks to perform?"
+msgstr "Які завдання виконувати?"
+
+msgid "Ok"
+msgstr "Так"
+
msgid "Open Location..."
msgstr "Відкрити адресу…"
msgid "Open an URL."
msgstr "Відкрити URL посилання."
-msgid "Separate Layer"
-msgstr "Окремий шар"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Позначте, якщо дані повинні бути завантажені у новий шар"
-
msgid "Enter URL to download:"
msgstr "Введіть URL посилання для завантаження з сервера:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Введіть URL посилання на дані, що повинні бути завантажені"
+msgid "Separate Layer"
+msgstr "Окремий шар"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Позначте, якщо дані повинні бути завантажені у новий шар"
+
msgid "Download Location"
msgstr "Шлях для завантаження"
@@ -1050,12 +1065,6 @@ msgstr "Закрити діалог та скасувати завантажен
msgid "Download Data"
msgstr "Завантажити дані"
-msgid "Which tasks to perform?"
-msgstr "Які завдання виконувати?"
-
-msgid "Ok"
-msgstr "Так"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1932,9 +1941,6 @@ msgstr "Отримати та завантажити набір змін…"
msgid "Errors during download"
msgstr "Помилки під час отримання даних з сервера"
-msgid "Download Geo URL"
-msgstr "Завантажити Geo URL"
-
msgid "Download GPS"
msgstr "Завантажити GPS"
@@ -4350,9 +4356,6 @@ msgstr "Лінія, що позначає полігон, не замкнена"
msgid "No outer way for multipolygon"
msgstr "У мультиполігона немає зовнішньої лінії"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "Для ''{0}'' роль повинна бути ''{1}''"
-
msgid "No area style for multipolygon"
msgstr "Відсутній стиль ділянки для мультиполігону"
@@ -4387,12 +4390,28 @@ msgstr "Стиль полігону на зовнішній лінії"
msgid "Multipolygon is not closed"
msgstr "Мультиполігон не замкнений"
-msgid "Multipolygon inner way is outside"
-msgstr "Внутрішня лінія мультиполігону знаходиться ззовні"
+msgid "Multipolygon rings share node(s)"
+msgstr "Контури мультиполігона мають спільну(і) точку(и)"
msgid "Intersection between multipolygon ways"
msgstr "Перетин між лініями мультиполігону"
+msgid "Multipolygon rings are equal"
+msgstr "Контури мультиполігона є однаковими"
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "Для ''{0}'' роль повинна бути ''{1}''"
+
+msgid "Multipolygon inner way is outside"
+msgstr "Внутрішня лінія мультиполігону знаходиться ззовні"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr "Контур мультиполігона містить один відрізок двічі"
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+"Зовнішній контур мультиполігона має спільний відрізок з іншими контурами"
+
msgid "No useful role for multipolygon member"
msgstr "Непридатна роль члена мультиполігону"
@@ -5115,12 +5134,18 @@ msgstr "Відключення доступу до вказаних ресурс
msgid "options provided as Java system properties"
msgstr "системні налаштування Java"
+msgid "Change the JOSM directory name"
+msgstr "Змінити назву теки для JOSM"
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/ШЛЯХ/ДО/НАЛАШТУВАНЬ/JOSM "
msgid "Set the preferences directory"
msgstr "Налаштування теки налаштувань"
+msgid "Default: {0}"
+msgstr "Типово: {0}"
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/ШЛЯХ/ДО/ДАНИХ_КОРИСТУВАЧА/JOSM"
@@ -5137,10 +5162,11 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/ШЛЯХ/ДО/ТЕКИ/JOSM "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Перенос всіх 3-х тек до homedir. Тека кешу тепер буде у homedir/cache"
+"Встановити теку для налаштувань, даних та кешу (текою для кеша буде "
+"josm.home/cache)"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5495,9 +5521,6 @@ msgstr "Клацніть, щоб перевести роботу у фонови
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} завершено з {1}"
-
msgid "Enlarge"
msgstr "Збільшити"
@@ -5642,88 +5665,6 @@ msgstr "Тло конфлікту: вилучити учасника"
msgid "Conflict foreground: remove member"
msgstr "Колір конфлікту: вилучити учасника"
-msgid "My with Their"
-msgstr "Мою з чужою"
-
-msgid "My with Merged"
-msgstr "Мою із об’єднаною"
-
-msgid "Their with Merged"
-msgstr "Чужу з об’єднаною"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "Роль {0} не приймає участь у парі порівняння {1}."
-
-msgid "Properties"
-msgstr "Властивості"
-
-msgid "Tags"
-msgstr "Теґи"
-
-msgid "Nodes"
-msgstr "Точки"
-
-msgid "Members"
-msgstr "Члени"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Конфлікти теґів, що очікують розв’язання — відсутні"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Теґи ({0} конфлікт)"
-msgstr[1] "Теґи ({0} конфлікти)"
-msgstr[2] "Теґи ({0} конфліктів)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "Треба розв’язати {0} конфлікт теґів"
-msgstr[1] "Треба розв’язати {0} конфлікти теґів"
-msgstr[2] "Треба розв’язати {0} конфліктів теґів"
-
-msgid "Nodes(resolved)"
-msgstr "Точки (без конфліктів)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Список з’єднаних точок заморожений. Конфліктів, що очікують на розв’язання "
-"для цієї лінії — немає"
-
-msgid "Nodes(with conflicts)"
-msgstr "Точки (з конфліктами)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Не розв’язані конфлікти в списку точок цієї лінії"
-
-msgid "Members(resolved)"
-msgstr "Члени (без конфліктів)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Об’єднаний список членів заморожений. Конфлікти, що очікують на розв’язання "
-"у списку членів цього зв’язку — відсутні"
-
-msgid "Members(with conflicts)"
-msgstr "Члени (з конфліктами)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Не розв’язані конфлікти в списку членів цього зв’язку"
-
-msgid "No pending property conflicts"
-msgstr "Не розв’язані конфлікти властивостей відсутні"
-
-msgid "Properties(with conflicts)"
-msgstr "Властивості (з конфліктами)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "Конфлікти властивостей, що очікують розв’язання"
-
-msgid "Conflict Resolution"
-msgstr "Розв’язання конфліктів"
-
msgid "{0} more..."
msgstr "Ще {0} …"
@@ -5912,6 +5853,88 @@ msgstr[0] "Чужа версія ({0} запис)"
msgstr[1] "Чужа версія ({0} записи)"
msgstr[2] "Чужа версія ({0} записів)"
+msgid "My with Their"
+msgstr "Мою з чужою"
+
+msgid "My with Merged"
+msgstr "Мою із об’єднаною"
+
+msgid "Their with Merged"
+msgstr "Чужу з об’єднаною"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "Роль {0} не приймає участь у парі порівняння {1}."
+
+msgid "Properties"
+msgstr "Властивості"
+
+msgid "Tags"
+msgstr "Теґи"
+
+msgid "Nodes"
+msgstr "Точки"
+
+msgid "Members"
+msgstr "Члени"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Конфлікти теґів, що очікують розв’язання — відсутні"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Теґи ({0} конфлікт)"
+msgstr[1] "Теґи ({0} конфлікти)"
+msgstr[2] "Теґи ({0} конфліктів)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "Треба розв’язати {0} конфлікт теґів"
+msgstr[1] "Треба розв’язати {0} конфлікти теґів"
+msgstr[2] "Треба розв’язати {0} конфліктів теґів"
+
+msgid "Nodes(resolved)"
+msgstr "Точки (без конфліктів)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Список з’єднаних точок заморожений. Конфліктів, що очікують на розв’язання "
+"для цієї лінії — немає"
+
+msgid "Nodes(with conflicts)"
+msgstr "Точки (з конфліктами)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Не розв’язані конфлікти в списку точок цієї лінії"
+
+msgid "Members(resolved)"
+msgstr "Члени (без конфліктів)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Об’єднаний список членів заморожений. Конфлікти, що очікують на розв’язання "
+"у списку членів цього зв’язку — відсутні"
+
+msgid "Members(with conflicts)"
+msgstr "Члени (з конфліктами)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Не розв’язані конфлікти в списку членів цього зв’язку"
+
+msgid "No pending property conflicts"
+msgstr "Не розв’язані конфлікти властивостей відсутні"
+
+msgid "Properties(with conflicts)"
+msgstr "Властивості (з конфліктами)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "Конфлікти властивостей, що очікують розв’язання"
+
+msgid "Conflict Resolution"
+msgstr "Розв’язання конфліктів"
+
msgid "Node"
msgstr "Точка"
@@ -5975,10 +5998,8 @@ msgstr "Роль"
msgid "Primitive"
msgstr "Елемент"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
-msgstr ""
-"Об’єднані точки ще не заморожені. Неможливо побудувати команду розв’язання "
-"конфліктів"
+msgid "Merged members not frozen yet. Cannot build resolution command"
+msgstr "Обʼєднані члени не є замороженими. Неможливо виконати розвʼязання"
msgid "<undefined>"
msgstr "<невизначено>"
@@ -7504,102 +7525,6 @@ msgid "Select only changesets related to a specific bounding box"
msgstr ""
"Вибрати тільки набори змін, пов’язані з конкретним габаритним прямокутником"
-msgid "Query open changesets only"
-msgstr "Отримати тільки відкриті набори змін"
-
-msgid "Query closed changesets only"
-msgstr "Отримати тільки закриті набори змін"
-
-msgid "Query both open and closed changesets"
-msgstr "Отримати відкриті та закриті набори змін"
-
-msgid "Only changesets owned by myself"
-msgstr "Тільки мої набори змін"
-
-msgid "User ID:"
-msgstr "Ід. учасника:"
-
-msgid "User name:"
-msgstr "Ім’я користувача:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "Тільки набори змін учасника з ідентифікатором"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "Тільки набори змін учасника з іменем"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Тільки мої набори змін (відключено. JOSM зараз працює під анонімним "
-"користувачем)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Неможливо обмежити отримання наборів змін змінами поточного користувача, "
-"оскільки він є анонімним"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "Поточне значення ''{0}'' для ідентифікатора учасника недійсне"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"Неможливо обмежити отримання наборів змін змінами для учасника з іменем — "
-"''{0}''"
-
-msgid "Please enter a valid user ID"
-msgstr "Будь ласка, введіть дійсний ідентифікатор учасника"
-
-msgid "Invalid user ID"
-msgstr "Недійсний ідентифікатор учасника"
-
-msgid "Please enter a non-empty user name"
-msgstr "Будь ласка, введіть непорожнє ім’я учасника"
-
-msgid "Invalid user name"
-msgstr "Неправильне ім’я учасника"
-
-msgid "Date: "
-msgstr "Дата: "
-
-msgid "Time:"
-msgstr "Час:"
-
-msgid "Closed after - "
-msgstr "Закрито після - "
-
-msgid "Date:"
-msgstr "Дата:"
-
-msgid "Created before - "
-msgstr "Створено до - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Тільки набори змін закриті після вказаної дати/часу"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr "Тільки набори змін закриті після і створені до вказаної дати/часу"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"Неможливо створити запит на отримання набору змін на основі обмежень за "
-"часом. Введене невірне значення."
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr ""
-"<html>Будь ласка, вкажіть правильні значення для дати/часу, щоб "
-"обмежити<br>запит зазначеними часовими межами.</html>"
-
-msgid "Invalid date/time values"
-msgstr "Помилкові значення дати/часу"
-
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
"invalid."
@@ -7618,29 +7543,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "Помилковий габаритний прямокутник"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"Поточне значення не є правильним ідентифікатором учасника. Будь ласка, "
-"введіть ціле значення > 0"
-
-msgid "Please enter an integer value > 0"
-msgstr "Будь ласка, введіть ціле число > 0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Будь ласка, введіть дату в звичайному форматі для вашої мови.<br>Приклад: "
-"{0}<br>Приклад: {1}<br>Приклад: {2}<br>Приклад: {3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Будь ласка, введіть час у правильному форматі для вашої мови.<br>Приклад: "
-"{0}<br>Приклад: {1}<br>Приклад: {2}<br>Приклад: {3}<br>"
-
msgid "Download my changesets only"
msgstr "Завантажити тільки мої набори змін"
@@ -7729,6 +7631,76 @@ msgstr "Недійсний URL запиту для отримання набор
msgid "Close the dialog and abort querying of changesets"
msgstr "Закрити діалог і припинити запит на отримання наборів змін"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Будь ласка, введіть дату в звичайному форматі для вашої мови.<br>Приклад: "
+"{0}<br>Приклад: {1}<br>Приклад: {2}<br>Приклад: {3}<br>"
+
+msgid "Query open changesets only"
+msgstr "Отримати тільки відкриті набори змін"
+
+msgid "Query closed changesets only"
+msgstr "Отримати тільки закриті набори змін"
+
+msgid "Query both open and closed changesets"
+msgstr "Отримати відкриті та закриті набори змін"
+
+msgid "Date: "
+msgstr "Дата: "
+
+msgid "Time:"
+msgstr "Час:"
+
+msgid "Closed after - "
+msgstr "Закрито після - "
+
+msgid "Date:"
+msgstr "Дата:"
+
+msgid "Created before - "
+msgstr "Створено до - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Тільки набори змін закриті після вказаної дати/часу"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr "Тільки набори змін закриті після і створені до вказаної дати/часу"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Неможливо створити запит на отримання набору змін на основі обмежень за "
+"часом. Введене невірне значення."
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Будь ласка, вкажіть правильні значення для дати/часу, щоб "
+"обмежити<br>запит зазначеними часовими межами.</html>"
+
+msgid "Invalid date/time values"
+msgstr "Помилкові значення дати/часу"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Будь ласка, введіть час у правильному форматі для вашої мови.<br>Приклад: "
+"{0}<br>Приклад: {1}<br>Приклад: {2}<br>Приклад: {3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"Поточне значення не є правильним ідентифікатором учасника. Будь ласка, "
+"введіть ціле значення > 0"
+
+msgid "Please enter an integer value > 0"
+msgstr "Будь ласка, введіть ціле число > 0"
+
msgid "URL: "
msgstr "URL: "
@@ -7749,6 +7721,55 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Недійсний URL запиту отримання набору змін"
+msgid "Only changesets owned by myself"
+msgstr "Тільки мої набори змін"
+
+msgid "User ID:"
+msgstr "Ід. учасника:"
+
+msgid "User name:"
+msgstr "Ім’я користувача:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Тільки набори змін учасника з ідентифікатором"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "Тільки набори змін учасника з іменем"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Тільки мої набори змін (відключено. JOSM зараз працює під анонімним "
+"користувачем)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Неможливо обмежити отримання наборів змін змінами поточного користувача, "
+"оскільки він є анонімним"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "Поточне значення ''{0}'' для ідентифікатора учасника недійсне"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"Неможливо обмежити отримання наборів змін змінами для учасника з іменем — "
+"''{0}''"
+
+msgid "Please enter a valid user ID"
+msgstr "Будь ласка, введіть дійсний ідентифікатор учасника"
+
+msgid "Invalid user ID"
+msgstr "Недійсний ідентифікатор учасника"
+
+msgid "Please enter a non-empty user name"
+msgstr "Будь ласка, введіть непорожнє ім’я учасника"
+
+msgid "Invalid user name"
+msgstr "Неправильне ім’я учасника"
+
msgid "Activate"
msgstr "Активувати"
@@ -8948,6 +8969,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr "Редактор"
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10659,6 +10683,9 @@ msgstr "Напрямок"
msgid "Velocity, {0}"
msgstr "Швидкість, {0}"
+msgid "Wave Audio files (*.wav)"
+msgstr "Аудіофайли Wave (*.wav)"
+
msgid "Import Audio"
msgstr "Імпортувати аудіо"
@@ -10673,9 +10700,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Імпорт неможливий"
-msgid "Wave Audio files (*.wav)"
-msgstr "Аудіофайли Wave (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "Аудіо-позначки з {0}"
@@ -10789,18 +10813,6 @@ msgstr "(посилання: "
msgid "Select the map painting styles"
msgstr "Виберіть стилі відтворення мапи"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-"Не вдалось завантажити стилі кольорів мапи з ''{0}''. Виключення: {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-"JOSM більше не підтримує стилі розфарбовування мапи, стоврені в старому "
-"форматі XML.\n"
-"Оновіть ''{0}'' на MapCSS"
-
msgid "loading style ''{0}''..."
msgstr "завантаження стилю ''{0}''…"
@@ -10820,6 +10832,10 @@ msgstr[2] ""
"Під час завантаження стилю виникло {0} помилок. Подробиці у пункті "
"\"Інформація\" контекстного меню."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+"Не вдалось завантажити стилі кольорів мапи з ''{0}''. Виключення: {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Не вдалось розібрати стилі кольорів мапи з ''{0}''. Помилка: {1}"
@@ -11928,6 +11944,9 @@ msgstr ""
msgid "Track date"
msgstr "Дата треку"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Одним кольором (може налаштовуватись для іменованих шарів)"
@@ -11940,6 +11959,18 @@ msgstr "Велосипед"
msgid "Foot"
msgstr "Пішки"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Дерева"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Створювати мітки під час читання GPX"
@@ -11952,6 +11983,9 @@ msgstr "Динамічний діапазон кольорів заснован
msgid "Smooth GPX graphics (antialiasing)"
msgstr "Згладжування GPX графіків"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -12023,6 +12057,11 @@ msgstr ""
"вигляду."
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -12045,10 +12084,17 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "Розфарбовувати точки та відрізки треку за їхнім часом."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
"Дозволяє настроювати забарвлення треку для різних середніх швидкостей."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Забарвлення треку та точок"
@@ -12143,8 +12189,7 @@ msgstr "Кількість кроків до насутпного масшат
msgid ""
"Higher value means more steps needed, therefore zoom steps will be smaller"
-msgstr ""
-"Більш високе значення – більше кроків, тож масштабування буде більш повільним"
+msgstr "Вище значення – більше кроків, тож масштабування буде повільнішим"
msgid "Look and Feel"
msgstr "Зовнішній вигляд"
@@ -13353,6 +13398,12 @@ msgstr "Перевірка на помилки культових (релігі
msgid "Checks for errors on relations"
msgstr "Перевірка помилок в зв’язках"
+msgid "Territories"
+msgstr "Території"
+
+msgid "Checks for territories-specific features"
+msgstr "Перевірки властивостей притаманних територіям"
+
msgid "Unnecessary tags"
msgstr "Непотрібні теґи"
@@ -14506,6 +14557,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Зберегти логін і пароль (незашифрованими)"
+msgid "Assume"
+msgstr "Припущення"
+
+msgid "Existing values"
+msgstr "Поточні значення"
+
msgid "<delete from {0} objects>"
msgstr "<вилучити з {0} об’єкт(ів)>"
@@ -14527,12 +14584,6 @@ msgstr "Додати позначені теґи до виділених об’
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Enter: додати всі теґи до виділених об’єктів"
-msgid "Assume"
-msgstr "Припущення"
-
-msgid "Existing values"
-msgstr "Поточні значення"
-
msgid "Enable the checkbox to accept the value"
msgstr "Поставте прапорець для отримання значень"
@@ -15524,8 +15575,8 @@ msgid ""
"applet and because you did not load your applet from ''{1}''."
msgstr ""
"<html>Збій встановлення з’єднання із віддаленим сервером<br>''{0}''<br>з "
-"причин безпеки. Це більш всього можливо тому, що ви працюєте<br>у аплеті та "
-"ви не завантажили свій аплет з ''{1}''."
+"причин безпеки. Найімовірніше через те, що ви працюєте<br>у аплеті та ви не "
+"завантажили свій аплет з ''{1}''."
msgid ""
"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
@@ -15555,8 +15606,9 @@ msgid ""
"<html>The OSM server<br>''{0}''<br>reported an internal server "
"error.<br>This is most likely a temporary problem. Please try again later."
msgstr ""
-"<html>Сервер OSM<br>''{0}''<br>сповістив про внутрішню помилку.<br>Це більш "
-"за все тимчасові проблеми. Спробуйте знов трохи пізніше."
+"<html>Сервер OSM<br>''{0}''<br>сповістив про внутрішню "
+"помилку.<br>Найімовірніше, це тимчасові проблеми. Спробуйте знову трохи "
+"пізніше."
msgid "The OSM server ''{0}'' reported a bad request.<br>"
msgstr "Сервер OSM ''{0}'' повідомив про невдалий запит.<br>"
@@ -15756,6 +15808,9 @@ msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
"Конфлікт комбінацій клавіш: ''{0}'' перепризначений з ''{1}'' на ''{2}''."
+msgid "Unknown territory id: {0}"
+msgstr "Нвідомий id території: {0}"
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "У буфері знайдено {0} теґ, це підозріло!"
@@ -15880,7 +15935,7 @@ msgstr ""
"помилку до нашої системи відстежування помилок.\n"
"Деяку інформацію про помилку вже було зібрано для вас. Додайте потрібні дані "
"про те, як відтворити ситуацію, що призвела до виникнення помилки, додайте "
-"як можна більше деталей."
+"якомога більше деталей."
msgid "Report Bug"
msgstr "Повідомити про помилку"
@@ -16283,14 +16338,17 @@ msgstr "Супутникові знімки Mapbox"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr "Thunderforest Landscape"
+
msgid "OpenSeaMap"
msgstr "OpenSeaMap"
-msgid "OpenStreetMap Carto (Standard layer)"
-msgstr "OpenStreetMap Carto (Стандартний шар)"
+msgid "OpenStreetMap Carto (Standard)"
+msgstr "OpenStreetMap Carto (Стандартний)"
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Мапнік Ч&Б)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr "OpenStreetMap (Стандартний чорно-білий)"
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Мапнік, без підписів)"
@@ -16313,8 +16371,11 @@ msgstr "Піший та велотуризм"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Камбоджа, Лаос, Таїланд, В’єтнам 2-мовна"
+msgid "Stamen Terrain"
+msgstr "Stamen Terrain"
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr "Камбоджа, Лаос, Таїланд, Вʼєтнам, Мʼянма (двомовна)"
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (шар)"
@@ -16364,8 +16425,8 @@ msgstr "OSM Inspector: Місця"
msgid "OSM Inspector: Highways"
msgstr "OSM Inspector: Автошляхи"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM Inspector: Мультиполігони"
+msgid "OSM Inspector: Area"
+msgstr "OSM Inspector: Полігони"
msgid "OSM Inspector: Routing"
msgstr "OSM Inspector: Маршрути"
@@ -16373,11 +16434,23 @@ msgstr "OSM Inspector: Маршрути"
msgid "OSM Inspector: Addresses"
msgstr "OSM Inspector: Адреси"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM Inspector: Кордони (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr "OSM Inspector: береговая лінія (ЄС)"
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr "imagico.de - знімки OSM для мапінгу: гірський масив Проклетіе"
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr "imagico.de - знімки OSM для мапінгу: Південні Трансантарктичні гори"
-msgid "IGN Argentina (WMTS)"
-msgstr "IGN Аргентина (WMTS)"
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr "imagico.de - знімки OSM для мапінгу: гори Пенсакола"
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr "imagico.de - знімки OSM для мапінгу: Острів слонів/Острів Кларенс"
+
+msgid "IGN Argentina (TMS)"
+msgstr "IGN Аргентина (TMS)"
msgid "IGN Argentina (WMS)"
msgstr "IGN Аргентина (WMS)"
@@ -16412,6 +16485,12 @@ msgstr "LPI NSW Адміністративні границі державних
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr "LPI NSW Адміністративні границі національних парків та заповідників"
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr "imagico.de - знімки OSM для мапінгу: Північний Захід острова Херд"
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr "imagico.de - знімки OSM для мапінгу: узбережжя острова Херд"
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -16457,11 +16536,17 @@ msgstr "VoGIS: Плани"
msgid "VoGIS: Höhen und Gelände"
msgstr "VoGIS: висоти і рельєф місцевості"
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
-msgstr "AGIV (Фландрія) найостанніші аерофотознімки (зима)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr "imagico.de - знімки OSM для мапінгу: гори Ріла і Пірін"
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr "AGIV Фландрія – найостанніші аерофотознімки"
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
+msgstr "AGIV Фландрія – аерофотознімки 2013-2015, 10 см"
-msgid "AGIV aerial imagery 10cm 2013-15"
-msgstr "AGIV аерофото 10 см 2013-15"
+msgid "AGIV Flanders GRB"
+msgstr "AGIV Фландрія GRB"
msgid "URBISfr numerical imagery (2013)"
msgstr "URBISfr - цифрове зображення (2013)"
@@ -16496,8 +16581,17 @@ msgstr "SPW(allonie) 2009-2010 аерофото"
msgid "TEC bus lines (2014)"
msgstr "TEC автобусні маршрути (2014)"
-msgid "Benin:cotonou_pleiade_2016"
-msgstr "Бенін: Котону, Pleiade 2016"
+msgid "TEC bus stops (2014)"
+msgstr "Автобусні зупинки TEC (2014)"
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr "Бенін: Котону знімки з Плеяди 2016"
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr "imagico.de - знімки OSM для мапінгу: Котону"
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr "imagico.de - знімки OSM для мапінгу: острів Буве"
msgid "IBGE Mapa de Setores Urbanos"
msgstr "IBGE Мапа міських районів"
@@ -16505,6 +16599,15 @@ msgstr "IBGE Мапа міських районів"
msgid "IBGE Mapa de Setores Rurais"
msgstr "IBGE Мапа сільських районів"
+msgid "IBGE Distrito Federal"
+msgstr "IBGE Федеральний округ"
+
+msgid "Rio Mosaic 2013"
+msgstr "Ріо - мозаїка 2013"
+
+msgid "Rio Mosaic 2015"
+msgstr "Ріо - мозаїка 2013"
+
msgid "Geobase Hydrography"
msgstr "Geobase Гідрографія"
@@ -16517,12 +16620,34 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "Британська Колумбія Мозаїка"
+msgid "Latest southwest British Columbia Landsat"
+msgstr "Landsat – останні знімки північний захід Британської Колумбії"
+
msgid "Kelowna 2012"
msgstr "Келоуна 2012"
msgid "Kelowna Roads overlay"
msgstr "Келоуна дороги, шар"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr "imagico.de - знімки OSM для мапінгу: Східне узбережжя острова Девон"
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr "imagico.de - знімки OSM для мапінгу: острів Північний Елсмір"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr "imagico.de - знімки OSM для мапінгу: Північний Елсмір липень 2016"
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr "imagico.de - знімки OSM для мапінгу: Фогу, Кабо-Верде"
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr "imagico.de - знімки OSM для мапінгу: острів Лондондеррі"
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr "imagico.de - знімки OSM для мапінгу: вулкан Кальбуко"
+
msgid "Czech CUZK:KM"
msgstr "Чехія CUZK:KM"
@@ -16559,6 +16684,12 @@ msgstr "Стевнс (Данія)"
msgid "Vejmidte (Denmark)"
msgstr "Веджима́йт (Данія)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr "imagico.de - знімки OSM для мапінгу: вулкан Алтар"
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Естонія Базова мапа (Maaamet)"
@@ -16592,9 +16723,6 @@ msgstr "Кадастр"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr "CRAIG - Овернь 2013 - 25 см"
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Приморські Альпи 2009 - 40 см"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "GrandNancy Orthophotographie 2012"
@@ -16651,9 +16779,6 @@ msgid ""
"- 1 m"
msgstr "Веркор - заповідник Хайлендс Веркор - ортофото 1999 - 1 м"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Сербська мова)"
-
msgid "Hamburg (40 cm)"
msgstr "Гамбург (40 см)"
@@ -16681,9 +16806,6 @@ msgstr "Берлін - аерофото 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Берлін - аерофото 2016"
-msgid "Stuttgart (aerial imagery)"
-msgstr "Штутгарт (аерофото)"
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Ерланген - аерофото (2016 5.0 см)"
@@ -16717,9 +16839,62 @@ msgstr "NRW-Atlas: Топографічна мапа 1:10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Агломерація Рур: Аерофотозйомка (10 см)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+"imagico.de - знімки OSM для мапінгу: прибережні мілини Північної Німеччини"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+"imagico.de - знімки OSM для мапінгу: прибережні мілини Північної Німеччини "
+"(інфрачервоні знімки)"
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr "imagico.de - знімки OSM для мапінгу: Касігіаннгуіт"
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr "imagico.de - знімки OSM для мапінгу: авіабаза Туле"
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+"imagico.de - знімки OSM для мапінгу: Авіабаза Туле DMS проліт на малих "
+"висотах вересень 2015"
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+"imagico.de - знімки OSM для мапінгу: Авіабаза Туле DMS проліт у вересені 2015"
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+"imagico.de - знімки OSM для мапінгу: Авіабаза Туле DMS проліт у жовтні 2015"
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr "imagico.de - знімки OSM для мапінгу: Гренландія мозаїка"
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr "imagico.de - знімки OSM для мапінгу: травень 2013 Landsat від надіра"
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr "imagico.de - знімки OSM для мапінгу: липень 2016 Landsat від надіра"
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr "imagico.de - знімки OSM для мапінгу: Північна Гренландія ASTER"
+
msgid "Drone Imagery (Haiti)"
msgstr "Знімки дронів (Гаїті)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+"Тимчасово недоступний до січня 2017 року, у зв''язку із заміною сервера."
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Знімки з дрону 2014 (Гаїті)"
@@ -16756,14 +16931,8 @@ msgstr "Розлив Дунаю - ортофото 2013"
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Русло Дунаю в Будапешті, Сентендре і Сігетмоносторе"
-msgid "Budapest district XII ortophoto 2013"
-msgstr "Будапешт, округ XII - ортофото 2013"
-
-msgid "Interspect Budapest ortophoto 2014"
-msgstr "Interspect Budapest ортофото 2014"
-
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
-msgstr "Пять районів Будапешта: III, IV, XIII, XIV, XV"
+msgid "Budapest district XI ortophoto 2015"
+msgstr "Будапешт, район XI - ортофото 2015"
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Угорщина (піші туристичні маршрути)"
@@ -16771,6 +16940,21 @@ msgstr "OpenStreetMap Угорщина (піші туристичні маршр
msgid "Hillshade Hungary"
msgstr "Угорщина рель’єф"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgstr "imagico.de - знімки OSM для мапінгу: Східна Ісландія"
+
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr "imagico.de - знімки OSM для мапінгу: Качский Ранн"
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr "imagico.de - знімки OSM для мапінгу: Південно-Східний Сулавесі"
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr "imagico.de - знімки OSM для мапінгу: водосховище Бакун"
+
+msgid "imagico.de OSM images for mapping: Batam"
+msgstr "imagico.de - знімки OSM для мапінгу: Батам"
+
msgid "Ireland British War Office 1:25k GSGS 3906"
msgstr "Ірландія Міністерство оборони Великобританії 1:25000 GSGS 3906"
@@ -16832,9 +17016,21 @@ msgstr "PCN 2012 - Італія"
msgid "South Tyrol Orthofoto 2011"
msgstr "Південний Тіроль ортофото 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr "Південний Тіроль ортофото 2011 (highres)"
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr "Південний Тіроль ортофото 2014"
+
msgid "South Tyrol Topomap"
msgstr "Південний Тіроль топомапа"
+msgid "Japan GSI ortho Imagery"
+msgstr "Японія: ортознімки GSI"
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "СРСР - Латвія"
@@ -16868,12 +17064,36 @@ msgstr "Дельта Нігера, жовт. 2012 Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Шпіцберген - ортофото 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr "imagico.de - знімки OSM для мапінгу: Західний Каракорум"
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Сектор Газа - Pléiades - 06.07.2014"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Сектор Газа - Pléiades - 06.07.2014 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr "imagico.de - знімки OSM для мапінгу: Панамський канал"
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr "imagico.de - знімки OSM для мапінгу: Ванатінаі"
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr "imagico.de - знімки OSM для мапінгу: Нова Ірландія"
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+"imagico.de - знімки OSM для мапінгу: гори Вільканота та Крижана шапка "
+"Куелччая"
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Пангасінан/Булакан (Філіппіни HiRes)"
@@ -17000,9 +17220,6 @@ msgstr "Свентохловіце: Ортофотомапа 2012 (супутн
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Забже: ортофото 2011"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Траси"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr "Вроцлав: ортофото 2015 (аерофотознімки)"
@@ -17012,6 +17229,21 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr "imagico.de - знімки OSM для мапінгу: Керченська протока"
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr "imagico.de - знімки OSM для мапінгу: Острів Ушакова серпень 2016"
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+"imagico.de - знімки OSM для мапінгу: Північний і Полярний Урал серпень 2016"
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Автомобільна"
@@ -17033,12 +17265,30 @@ msgstr "RABA-KGZ: Словенія - використання сільгоспз
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr "RABA-KGZ: Словенія - територія забудови"
+msgid "City of Cape Town 2013 Aerial"
+msgstr "Місто Кейптаун 2013 аерофото"
+
msgid "City of Cape Town 2015 Aerial"
msgstr "Кейптаун, аерофото 2015"
msgid "South Africa CD:NGI Aerial"
msgstr "Південна Африка CD:NGI Aerial"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr "imagico.de - знімки OSM для мапінгу: острів Лєскова ASTER"
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr "imagico.de - знімки OSM для мапінгу: острів Скотта"
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr "imagico.de - знімки OSM для мапінгу: острів Лєскова Landsat"
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr "imagico.de - знімки OSM для мапінгу: скелі Клерк"
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr "imagico.de - знімки OSM для мапінгу: скелі Шаг"
+
msgid "Catastro Spain"
msgstr "Кадастрова мапа Іспанії"
@@ -17060,6 +17310,9 @@ msgstr "IDEIB - Балеарські острови"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Канарські острови"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Кантон Аргау 25 см (AGIS 2011)"
@@ -17103,6 +17356,9 @@ msgstr "Кантон Фрібур 50 см (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Місто Берн 10 см/25 см (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr "Місто Берн 10 см (2016)"
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Ортофото Івердон-ле-Бен 25 см (2007)"
@@ -17124,6 +17380,12 @@ msgstr "Бонвіллар - ортофото 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Фієз - ортофото 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr "Кантон Базель-Штадт 2015"
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr "Тайвань e-Map Open Data"
@@ -17139,6 +17401,9 @@ msgstr "Тайвань Земельний поділ"
msgid "NLSC Open Data WMTS"
msgstr "NLSC Open Data WMTS"
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "MSR Топомапи"
@@ -17166,9 +17431,54 @@ msgstr "Північна Кароліна: останні ортознімки"
msgid "U.S. Forest Service roads"
msgstr "Дороги лісової служби США"
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr "imagico.de - знімки OSM для мапінгу: діапазон Аляски"
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr "NJ 2015 аерофото (інфрачервоний діапазон)"
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr "NJ 2015 аерофото (природні кольори)"
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr "Міська агломерація Сан-Хуан: ортофото USACE 2013"
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr "Графство Сан-Хуан (Вашингтон) - аерофото 2013"
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr "Сан-Хуан (Вашингтон) векторна мапа вулиць"
+
+msgid "Texas Orthophoto"
+msgstr "Техас ортофото"
+
+msgid "Philadelphia 2015 Imagery"
+msgstr "Филадельфия – знімки 2015"
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr "Меріленд: знімки 6 дюймів, 2014"
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr "Меріленд: знімки 3 дюйми"
+
+msgid "MD Transportation Basemap"
+msgstr "Меріленд: базова мапа транспорту"
+
+msgid "Delaware 2012 Orthophotography"
+msgstr "Делавер - ортофото 2012"
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr "imagico.de - знімки OSM для мапінгу: гори Рувензори"
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr "imagico.de - знімки OSM для мапінгу: гори Рувензори 2016"
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Україна - ортофотоплани 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr "Працює тільки в Україні або через український проксі-сервер."
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr "Україна - Київ 2014 (ДЗК)"
@@ -17190,9 +17500,6 @@ msgstr "Суррей, аерозйомка"
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-дюймова мапа Шотландії 1842-82"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr "NLS - OS 6-дюймів County Series 1888-1913"
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - ОС 1:25000 1-й серії 1937-61"
@@ -17202,9 +17509,6 @@ msgstr "NLS - ОС 1-дюймова 7-ї серії 1955-61"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr "NLS - OS 25-дюймів (Шотландія) 1892-1905"
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "OS 1:25000 історична (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "OS 1:25000 історична (OSM-Limited)"
@@ -17545,8 +17849,8 @@ msgstr "Завантажує дані під час масштабування/
msgid "Create a grid of ways."
msgstr "Створює сітку з ліній."
-msgid "Customization of public transport stops."
-msgstr "Додавання параметрів зупинок громадського транспорту."
+msgid "Customization of public public transport stops."
+msgstr "Налаштування параметрів зупинок громадського транспорту."
msgid ""
"Creating and handling address nodes and buildings within Czech Republic."
@@ -17654,6 +17958,9 @@ msgstr "Простий інструмент для нумерування буд
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "Створити межі зображення в форматі XML з мультиполігону"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr "Експортує квадрати шарів мапи з кеша у файлову систему"
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18852,8 +19159,8 @@ msgid ""
"Plants that lose most, but not all, of their foliage for a fraction of the "
"year."
msgstr ""
-"Рослини, які скидають більшість, але не все, лисття на певний період "
-"впродовж року."
+"Рослини, які скидають більшість, але не все листя на певний період впродовж "
+"року."
msgid "Habitat with evergreen and deciduous vegetation."
msgstr "Місцевість з вічнозеленими та листяними рослінами."
@@ -20170,6 +20477,9 @@ msgstr "Струмок"
msgid "River"
msgstr "Ріка"
+msgid "Lock"
+msgstr "Шлюз"
+
msgid "Canal"
msgstr "Канал"
@@ -21222,6 +21532,12 @@ msgstr "Мотель"
msgid "Guest House/Bed & Breakfast"
msgstr "Гістьовий будинок/Ліжко та Сніданок"
+msgid "Apartment"
+msgstr "Квартира"
+
+msgid "Number of apartments"
+msgstr "Кількість квартир"
+
msgid "Chalet"
msgstr "Дача/Шале"
@@ -21288,6 +21604,12 @@ msgstr "Місця на вулиці"
msgid "Takeaway"
msgstr "Страви на винос"
+msgid "Delivery"
+msgstr "Доставка"
+
+msgid "Mo-Su 12:00-22:00"
+msgstr "Mo-Su 12:00-22:00"
+
msgid "Fast Food"
msgstr "Швидке харчування"
@@ -22231,31 +22553,19 @@ msgstr "захист від диких тварин"
msgid "Hunting Stand"
msgstr "Мисливська вежа"
-msgid "Height"
-msgstr "Висота"
-
-msgctxt "height"
-msgid "low"
-msgstr "низька"
-
-msgctxt "height"
-msgid "half"
-msgstr "половинна"
-
-msgctxt "height"
-msgid "full"
-msgstr "повна"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr "Приховати"
-msgid "Lock"
-msgstr "Зачиняється"
+msgid "Lockable"
+msgstr "Замикається на замок"
msgid "Water Point"
msgstr "Питна вода"
+msgid "Animal watering place"
+msgstr "Водопій для тварин"
+
msgid "Compressed Air"
msgstr "Компресор"
@@ -22847,6 +23157,10 @@ msgid "hut"
msgstr "халупа"
msgctxt "building"
+msgid "bungalow"
+msgstr "бунгало"
+
+msgctxt "building"
msgid "dormitory"
msgstr "гуртожиток"
@@ -24142,6 +24456,9 @@ msgstr "М’ясна лавка"
msgid "Seafood"
msgstr "Морепродукти"
+msgid "Dairy"
+msgstr "Молочні продукти"
+
msgid "Deli (Fine Food)"
msgstr "Делікатеси (Вишукана їжа)"
@@ -24961,9 +25278,6 @@ msgstr "Ряд дерев"
msgid "A line of trees."
msgstr "Дерева в рядок."
-msgid "Wood"
-msgstr "Дерева"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
"Лісиста місцевість, в якій лісозаготівля не є основним видом діяльності."
@@ -26034,6 +26348,9 @@ msgstr "Різна кількість смуг для ругу в ключах {
msgid "possibly missing {0} tag"
msgstr "можливо, пропущено теґ {0}"
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr "вулиця з непарними номерами {0}, але без {1} і {2} або {3}"
+
msgid "{0} is deprecated"
msgstr "{0} заборонено"
@@ -26055,8 +26372,8 @@ msgid ""
"{0}={1} is unspecific. Instead of ''{1}'' please give more information about "
"what exactly should be fixed."
msgstr ""
-"{0}={1} є неспецифічним. Замість ''{1}'' вкажіть більш докладну інформацію "
-"про те, що дійсно потрібно виправити."
+"{0}={1} є неспецифічним. Замість ''{1}'' вкажіть докладнішу інформацію про "
+"те, що дійсно потрібно виправити."
msgid ""
"Wrong usage of {0} tag. Remove {1}, because it is clear that the name is "
@@ -26089,8 +26406,8 @@ msgstr ""
msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
msgstr ""
-"{0}={1} є неспецифічним. Будь ласка, вкажіть замість ''{1}'' більш "
-"конкретне значення."
+"{0}={1} є неспецифічним. Будь ласка, вкажіть замість ''{1}'' конкретніше "
+"значення."
msgid "{0} should be replaced with {1}"
msgstr "{0} потрібно замінити на {1}"
@@ -26145,6 +26462,12 @@ msgstr "сумнівний ключ (з цифрою в кінці)"
msgid "The key {0} has an uncommon value."
msgstr "Ключ {0} має дивне значення."
+msgid "misspelled value"
+msgstr "значення з помилкою"
+
+msgid "wrong value: {0}"
+msgstr "невірне значення: {0}"
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} на точці. Слід застосовувати до лінії."
@@ -26225,6 +26548,13 @@ msgstr "Берегова лінія в середині {1}"
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} повинен бути точкою перетину {1} і {2}"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+"{0} – теґ для лінійних водних обʼєктів. Для позначення полігональних водних "
+"обʼєктів використовуйте {1} + {2}."
+
msgid "abbreviated street name"
msgstr "скорочене позначення вулиці"
@@ -26249,6 +26579,11 @@ msgstr "{0} використаний разом з {1}"
msgid "street name contains ss"
msgstr "назва вулиці містить ss"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+"{0} є застарілим, використовуйте {1}. Крім того, перевірте подібні теґи, "
+"такі як {2}"
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -27067,6 +27402,20 @@ msgstr "Надіслати поточний набір змін"
msgid "Submit the current changeset to Mapillary"
msgstr "Надіслати поточний набір змін до Mapillary"
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr "Невдалось надісати набір змін, помилка {0} ''{1} {2}''!"
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+"Під час спроби надсилання набору змін на сервер виникла помилка. Якщо вона "
+"виникає періодично, сповістіть про неї, надіславши звіт про помилки (Див. в "
+"меню Довідка). Якщо це повідомлення зʼявилось вперше – спробуйте ще раз, "
+"можливо у вас виникла проблем з мережевим зʼєднанням."
+
msgid "Upload pictures"
msgstr "Завантажити знімки"
@@ -27109,8 +27458,8 @@ msgstr "Відкрити діалог набору змін Mapillary"
msgid "Mapillary changeset"
msgstr "Набір змін Mapillary"
-msgid "Submit"
-msgstr "Надіслати"
+msgid "Submitting changeset to server…"
+msgstr "Надсилання змін на сервер…"
msgid "Export all images"
msgstr "Експортувати всі знімки"
@@ -27666,7 +28015,7 @@ msgid ""
msgstr ""
"Це як мінімум не точка оберту на кінці відрізку для вирівнювання, що з’єднує "
"більше ніж два відрізки.\n"
-"Вирівнювання із збереженням кутів неможливе.\n"
+"Вирівнювання зі збереженням кутів неможливе.\n"
msgid ""
"The alignment is not possible with maintaining the angles of the joint "
@@ -28027,6 +28376,9 @@ msgstr "Виділіть полігон (напр. будинок) на фоно
msgid "Area Selector"
msgstr "Виділення ділянки"
+msgid "Trying to detect an area at:"
+msgstr "Намагаюсь знайти полігони у:"
+
msgid "Created area"
msgstr "Створена ділянка"
@@ -28072,11 +28424,11 @@ msgid "Algorithm"
msgstr "Алгоритм"
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
-"Максимальна відстань точки від лінії (пікселів), при якому точка все ще "
-"вважається частиною цієї лінії (Типово: {0})"
+"Максимальна відстань в метрах між точкою та лінією, яка означає, що точка "
+"належить цій лінії (Типово: {0})."
msgid "Distance Tolerance"
msgstr "Допустиме відхилення відстані"
@@ -29802,6 +30154,66 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "Відкрити XML-файл зображення"
+msgid "Export tiles"
+msgstr "Експортувати квадрати"
+
+msgid "Export cached tiles to file system."
+msgstr "Експортувати квадрати з кеша до файлової системи"
+
+msgid "Exporting cached tiles"
+msgstr "Експорт квадратів з кеша"
+
+msgid "Failed to write image file {0}: {1}"
+msgstr "Не вдалося записати файл зображення {0}: {1}"
+
+msgid "Failed to write image file {0}."
+msgstr "Не вдалося записати файл зображення {0}."
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] "Експортовано {0} квадрат з шару {1}."
+msgstr[1] "Експортовано {0} квадрати з шару {1}."
+msgstr[2] "Експортовано {0} квадратів з шару {1}."
+
+msgid "Export file system path already exists but is not a directory."
+msgstr "Шлях для експорту до файлової системи вже існує, але це не тека."
+
+msgid "Failed to create export directory: {0}"
+msgstr "Не вдалося створити теку для експорту: {0}"
+
+msgid "Failed to create export directory."
+msgstr "Не вдалося створити теку для експорту."
+
+msgid "Append cache name"
+msgstr "Долучити назву кеша"
+
+msgid "Export Tiles"
+msgstr "Експортувати квадрати"
+
+msgid "Cache name:"
+msgstr "Назва кеша:"
+
+msgid "Object count:"
+msgstr "Кількість обʼєктів:"
+
+msgid "file system path"
+msgstr "шлях файлової системи"
+
+msgid "File system path the tiles are exported to."
+msgstr "Шлях у файловій системі куди будуть експортуватись квадрати."
+
+msgid "Export directory:"
+msgstr "Тека для експорту:"
+
+msgid "Append cache name to export directory."
+msgstr "Долучити назву кеша до теки для експорту"
+
+msgid "Tiles will be exported to directory {0}"
+msgstr "Квадрати будуть експортовані в теку {0}"
+
+msgid "No export directory set."
+msgstr "Не вказано теку для експорту."
+
msgid "Calibration Layer"
msgstr "Калібрувальний шар"
@@ -30478,8 +30890,8 @@ msgid ""
"0.0003."
msgstr ""
"Точність апроксимації Дугласа-П’юкера для спрощення ліній, вимірювана в "
-"градусах.<br>Більш низькі значення дають більше точок, а також більш точні "
-"лінії. Початкове значення — 0,0003."
+"градусах.<br>Нижчі значення дають більше точок і точніші лінії. Початкове "
+"значення — 0,0003."
msgid ""
"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -32107,9 +32519,6 @@ msgstr "ГТ: Маршрут повинен починатись та закін
msgid "PT: First or last way needs to be split"
msgstr "ГТ: Перший або останній відрізок треба розділити"
-msgid "PT: Problem in the route segment"
-msgstr "ГТ: Проблема на відрізку маршруту"
-
msgid "PT: Stop not served"
msgstr "ГТ: Зупинка не обслуговується"
@@ -32275,9 +32684,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr "[пропуск]"
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "Шаблони маршрутів…"
@@ -32335,6 +32741,9 @@ msgstr "ліворуч"
msgid "Maximum distance from route"
msgstr "Максимальна відстань від маршруту"
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "Громадський транспорт: Змінити тип зупинки"
@@ -32534,10 +32943,6 @@ msgstr "Перетворити на полігон"
msgid "Multipolygon must consist only of ways"
msgstr "Мультиполігон повинен складатись лише з ліній"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-"Реконструкція полігонів може бути здійснена тільки для зовнішніх ліній"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Реконструкція полігонів із зв’язку {0}"
@@ -35278,9 +35683,9 @@ msgid ""
"''{1}''<br>Merge the duplicate node onto the currently selected node and "
"continue way downloading?</html>"
msgstr ""
-"<html>Немає більше приєднаних ліній для завантаження з сервера.<br>Однак був "
-"знайдений можливий дублікат виділеної точки.<br><br>Виділена точка: "
-"''{0}''.<br>Можливий дублікат: ''{1}''<br>Провести злиття виділеної точки з "
+"<html>Більше немає приєднаних ліній для завантаження з сервера.<br>Однак "
+"знайшовся можливий дублікат виділеної точки.<br><br>Виділена точка: "
+"''{0}''.<br>Можливий дублікат: ''{1}''<br>Об’єднати виділену точку з "
"дублікатом і продовжити завантаження ліній з сервера?</html>"
msgid "Merge duplicate node?"
@@ -35288,7 +35693,7 @@ msgstr "Об’єднати дублікати точок?"
msgid "<html>No more connected ways to download.</html>"
msgstr ""
-"<html>Немає більше приєднаних ліній для завантаження з сервера.</html>"
+"<html>Більше немає приєднаних ліній для завантаження з сервера.</html>"
msgid "Node ''{0}'' is a junction with more than 2 connected ways."
msgstr "Точка ''{0}'' — це з’єднання більше 2 ліній, що перетинаються."
diff --git a/i18n/po/ur.po b/i18n/po/ur.po
index 55184e0..7314761 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:13+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:18+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: ur\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr ""
msgid "Help"
msgstr "مدد"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -201,6 +207,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -222,12 +234,6 @@ msgstr ""
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -708,6 +714,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -729,9 +738,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -782,6 +788,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -931,16 +940,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -949,6 +958,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -964,12 +979,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1762,9 +1771,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3950,9 +3956,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3982,12 +3985,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4680,12 +4698,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4702,8 +4726,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5024,9 +5048,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5165,82 +5186,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5406,6 +5351,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5465,7 +5486,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6857,212 +6878,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8168,6 +8189,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9654,6 +9678,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9666,9 +9693,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9765,14 +9789,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9785,6 +9801,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10773,6 +10792,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10785,6 +10807,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10797,6 +10831,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10856,6 +10893,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10874,9 +10916,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12071,6 +12120,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13106,6 +13161,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13127,12 +13188,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14092,6 +14147,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14580,13 +14638,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14610,7 +14671,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14661,7 +14725,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14670,10 +14734,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14709,6 +14785,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14754,10 +14836,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14790,34 +14878,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14856,6 +14984,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14889,9 +15023,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14948,9 +15079,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14978,9 +15106,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15014,9 +15139,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15053,19 +15223,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15128,9 +15307,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15164,12 +15355,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15296,9 +15509,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15308,6 +15518,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15329,12 +15553,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15356,6 +15598,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15398,6 +15643,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15419,6 +15667,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15434,6 +15688,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15461,9 +15718,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15485,9 +15787,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15497,9 +15796,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15811,7 +16107,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15899,6 +16195,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18295,6 +18594,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19343,6 +19645,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19409,6 +19717,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20352,31 +20666,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20968,6 +21270,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22261,6 +22567,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23074,9 +23383,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24121,6 +24427,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24212,6 +24521,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24288,6 +24603,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24312,6 +24632,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25085,6 +25408,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25127,7 +25460,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25930,6 +26263,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25971,8 +26307,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27570,6 +27906,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29731,9 +30126,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29891,9 +30283,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29951,6 +30340,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30148,9 +30540,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/vi.po b/i18n/po/vi.po
index e79f34c..18f5224 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:13+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:19+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: vi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr "Xây dựng trình đơn chính"
msgid "Help"
msgstr "Help"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "Đang khởi tạo OSM API"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "Đang khởi tạo trình xác nhận"
@@ -209,6 +215,12 @@ msgstr ""
"Thiết lập các thành phần được chọn trên bản đồ cho các mục được chọn trong "
"danh sách trên."
+msgid "Select WMS layers"
+msgstr "Chọn lớp WMS"
+
+msgid "Add layers"
+msgstr "Thêm lớp"
+
msgid "Add imagery layer {0}"
msgstr "Add layer hình ảnh {0}"
@@ -230,12 +242,6 @@ msgstr "Lỗi"
msgid "Select image format for WMS layer"
msgstr "Chọn định dạng hình ảnh cho lớp WMS"
-msgid "Select WMS layers"
-msgstr "Chọn lớp WMS"
-
-msgid "Add layers"
-msgstr "Thêm lớp"
-
msgid "Add Node..."
msgstr "Add Node ..."
@@ -751,6 +757,9 @@ msgstr "Jump To Position"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Mở một hộp thoại cho phép để chuyển đến một địa điểm cụ thể"
+msgid "Jump to Position"
+msgstr "Nhảy đến vị trí"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "Nhập Lat / Lon để chuyển đến vị trí."
@@ -772,9 +781,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "Jump có"
-msgid "Jump to Position"
-msgstr "Nhảy đến vị trí"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr "Không thể phân tích Latitude, kinh độ hoặc Zoom. Vui lòng kiểm tra."
@@ -827,6 +833,9 @@ msgstr "Merge layer"
msgid "Merge the current layer into another layer"
msgstr "Merge các layer hiện tại thành một lớp"
+msgid "{0} completed in {1}"
+msgstr "{0} hoàn thành vào {1}"
+
msgid "Merging layers with different upload policies"
msgstr "Kết hợp các lớp với các chính sách khác nhau upload"
@@ -990,24 +999,30 @@ msgstr[0] "Opening {0} tập tin ..."
msgid "Opening file ''{0}'' ..."
msgstr "tập tin mở cửa '' {0} '' ..."
+msgid "Which tasks to perform?"
+msgstr "Những nhiệm vụ để thực hiện?"
+
+msgid "Ok"
+msgstr "Ok"
+
msgid "Open Location..."
msgstr "Open Location ..."
msgid "Open an URL."
msgstr "Mở một URL."
-msgid "Separate Layer"
-msgstr "Layer riêng biệt"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "Chọn nếu các dữ liệu cần được tải về vào một layer mới"
-
msgid "Enter URL to download:"
msgstr "Nhập URL để tải về:"
msgid "Enter an URL from where data should be downloaded"
msgstr "Nhập một URL từ nơi dữ liệu phải được tải về"
+msgid "Separate Layer"
+msgstr "Layer riêng biệt"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Chọn nếu các dữ liệu cần được tải về vào một layer mới"
+
msgid "Download Location"
msgstr "Download Location"
@@ -1023,12 +1038,6 @@ msgstr "Đóng hộp thoại và hủy tải"
msgid "Download Data"
msgstr "Tải dữ liệu"
-msgid "Which tasks to perform?"
-msgstr "Những nhiệm vụ để thực hiện?"
-
-msgid "Ok"
-msgstr "Ok"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1887,9 +1896,6 @@ msgstr "Truy vấn và tải changesets ..."
msgid "Errors during download"
msgstr "Lỗi trong khi tải về"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr "Download GPS"
@@ -4195,9 +4201,6 @@ msgstr "phong cách Area cách là không đóng cửa"
msgid "No outer way for multipolygon"
msgstr "Không có cách nào ngoài cho multipolygon"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "Vai trò cho '' {0} '' là '' {1} ''"
-
msgid "No area style for multipolygon"
msgstr "Không có phong cách khu vực cho multipolygon"
@@ -4230,12 +4233,27 @@ msgstr "phong cách Area trên đường bên ngoài"
msgid "Multipolygon is not closed"
msgstr "Multipolygon là không đóng cửa"
-msgid "Multipolygon inner way is outside"
-msgstr "Multipolygon chiều ở bên trong là bên ngoài"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "Giao lộ giữa cách multipolygon"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "Vai trò cho '' {0} '' là '' {1} ''"
+
+msgid "Multipolygon inner way is outside"
+msgstr "Multipolygon chiều ở bên trong là bên ngoài"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "Không có vai trò hữu ích cho thành viên multipolygon"
@@ -4952,12 +4970,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr "tùy chọn được cung cấp như là thuộc tính hệ thống Java"
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/PATH/TO/JOSM/PREF "
msgid "Set the preferences directory"
msgstr "Thiết lập thư mục sở thích"
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/PATH/TO/JOSM/UserData"
@@ -4974,10 +4998,9 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/PATH/TO/JOSM/homedir "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
-"Di dời tất cả 3 thư mục để homedir. Cache thư mục sẽ được ởHomedir/cache"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5316,9 +5339,6 @@ msgstr "Click để chạy công việc trong nền"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} hoàn thành vào {1}"
-
msgid "Enlarge"
msgstr ""
@@ -5459,84 +5479,6 @@ msgstr "Xung đột nền: xóa thành viên"
msgid "Conflict foreground: remove member"
msgstr "Xung đột foreground: xóa thành viên"
-msgid "My with Their"
-msgstr "của tôi với họ"
-
-msgid "My with Merged"
-msgstr "My với Merged"
-
-msgid "Their with Merged"
-msgstr "của họ với Merged"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "Vai trò {0} không được tham gia trong cặp so sánh {1}."
-
-msgid "Properties"
-msgstr "Properties"
-
-msgid "Tags"
-msgstr "Thẻ"
-
-msgid "Nodes"
-msgstr "Nodes"
-
-msgid "Members"
-msgstr "Thành viên"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "Không có xung đột tag chờ để được giải quyết"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Tags ({0} xung đột)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} cấp phát thẻ để xung đột được giải quyết"
-
-msgid "Nodes(resolved)"
-msgstr "Nodes (phân giải)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Danh sách nút Merged đông lạnh. Không có xung đột cấp phát trong danh sách "
-"nút của cách này"
-
-msgid "Nodes(with conflicts)"
-msgstr "Nodes (có xung đột)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "Đang chờ xung đột trong danh sách nút của cách này"
-
-msgid "Members(resolved)"
-msgstr "Các thành viên (phân giải)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Danh sách thành viên Merged đông lạnh. Không có xung đột cấp phát trong danh "
-"sách thành viên củaQuan hệ"
-
-msgid "Members(with conflicts)"
-msgstr "Các thành viên (có xung đột)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "Đang chờ xung đột trong danh sách thành viên của mối quan hệ này"
-
-msgid "No pending property conflicts"
-msgstr "Không có xung đột tài sản chờ"
-
-msgid "Properties(with conflicts)"
-msgstr "Properties (có xung đột)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "xung đột tài sản chờ để được giải quyết"
-
-msgid "Conflict Resolution"
-msgstr "Giải quyết xung đột"
-
msgid "{0} more..."
msgstr "{0} hơn ..."
@@ -5724,6 +5666,84 @@ msgid "Their version ({0} entry)"
msgid_plural "Their version ({0} entries)"
msgstr[0] "phiên bản của họ ({0} entry)"
+msgid "My with Their"
+msgstr "của tôi với họ"
+
+msgid "My with Merged"
+msgstr "My với Merged"
+
+msgid "Their with Merged"
+msgstr "của họ với Merged"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "Vai trò {0} không được tham gia trong cặp so sánh {1}."
+
+msgid "Properties"
+msgstr "Properties"
+
+msgid "Tags"
+msgstr "Thẻ"
+
+msgid "Nodes"
+msgstr "Nodes"
+
+msgid "Members"
+msgstr "Thành viên"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "Không có xung đột tag chờ để được giải quyết"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Tags ({0} xung đột)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} cấp phát thẻ để xung đột được giải quyết"
+
+msgid "Nodes(resolved)"
+msgstr "Nodes (phân giải)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Danh sách nút Merged đông lạnh. Không có xung đột cấp phát trong danh sách "
+"nút của cách này"
+
+msgid "Nodes(with conflicts)"
+msgstr "Nodes (có xung đột)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "Đang chờ xung đột trong danh sách nút của cách này"
+
+msgid "Members(resolved)"
+msgstr "Các thành viên (phân giải)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Danh sách thành viên Merged đông lạnh. Không có xung đột cấp phát trong danh "
+"sách thành viên củaQuan hệ"
+
+msgid "Members(with conflicts)"
+msgstr "Các thành viên (có xung đột)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Đang chờ xung đột trong danh sách thành viên của mối quan hệ này"
+
+msgid "No pending property conflicts"
+msgstr "Không có xung đột tài sản chờ"
+
+msgid "Properties(with conflicts)"
+msgstr "Properties (có xung đột)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "xung đột tài sản chờ để được giải quyết"
+
+msgid "Conflict Resolution"
+msgstr "Giải quyết xung đột"
+
msgid "Node"
msgstr "Node"
@@ -5786,8 +5806,8 @@ msgstr "Vai trò"
msgid "Primitive"
msgstr "nguyên thủy"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
-msgstr "nút Merged không đông lạnh chưa. Không thể xây dựng lệnh giải quyết"
+msgid "Merged members not frozen yet. Cannot build resolution command"
+msgstr ""
msgid "<undefined>"
msgstr "<undefined>"
@@ -7229,117 +7249,20 @@ msgid ""
"Download the changeset with the specified id, including the changeset content"
msgstr "Tải changeset với id cụ thể, bao gồm các nội dung changeset"
-msgid "Select changesets owned by specific users"
-msgstr "Chọn changesets thuộc sở hữu của người sử dụng cụ thể"
-
-msgid "Select changesets depending on whether they are open or closed"
-msgstr "Chọn changesets tùy thuộc vào việc họ đang mở hoặc đóng cửa"
-
-msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr ""
-"Chọn changesets dựa trên ngày tháng / thời gian họ đã được tạo ra hoặc đóng "
-"cửa"
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr "Chỉ chọn changesets liên quan đến một hộp bounding cụ thể"
-
-msgid "Query open changesets only"
-msgstr "Query changesets mở"
-
-msgid "Query closed changesets only"
-msgstr "Query đóng changesets chỉ"
-
-msgid "Query both open and closed changesets"
-msgstr "Query cả hai mở và đóng cửa changesets"
-
-msgid "Only changesets owned by myself"
-msgstr "Chỉ changesets thuộc sở hữu của bản thân mình"
-
-msgid "User ID:"
-msgstr "User ID:"
-
-msgid "User name:"
-msgstr "Tên người dùng:"
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr ""
-"Chỉ changesets thuộc sở hữu của người sử dụng với các ID người dùng sau"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "Chỉ changesets thuộc sở hữu của người dùng với tên người dùng sau"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr ""
-"Chỉ changesets thuộc sở hữu của mình (disabled JOSM. Hiện đang điều hành bởi "
-"mộtNgười dùng ẩn danh)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr ""
-"Không thể hạn chế truy vấn changeset cho người sử dụng hiện nay bởi vì người "
-"dùng hiện tạiVô danh"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "giá trị hiện tại '' {0} '' cho người dùng ID không hợp lệ"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"Không thể hạn chế các truy vấn changeset với tên người dùng '' {0} ''"
-
-msgid "Please enter a valid user ID"
-msgstr "Hãy nhập một ID người dùng hợp lệ"
-
-msgid "Invalid user ID"
-msgstr "ID người dùng không hợp lệ"
-
-msgid "Please enter a non-empty user name"
-msgstr "Hãy nhập tên người dùng không trống"
-
-msgid "Invalid user name"
-msgstr "Tên người dùng không hợp lệ"
-
-msgid "Date: "
-msgstr "Ngày "
-
-msgid "Time:"
-msgstr "Thời gian:"
-
-msgid "Closed after - "
-msgstr "đóng sau - "
-
-msgid "Date:"
-msgstr "Ngày"
-
-msgid "Created before - "
-msgstr "tạo trước - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "Chỉ changesets đóng sau khi sau ngày / thời gian"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-"Chỉ changesets đóng cửa sau và tạo ra trước một ngày cụ thể / thời gian"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr ""
-"Không thể xây dựng truy vấn changeset với những hạn chế dựa trên thời gian. "
-"Input không phải làHợp lệ"
-
+msgid "Select changesets owned by specific users"
+msgstr "Chọn changesets thuộc sở hữu của người sử dụng cụ thể"
+
+msgid "Select changesets depending on whether they are open or closed"
+msgstr "Chọn changesets tùy thuộc vào việc họ đang mở hoặc đóng cửa"
+
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Select changesets based on the date/time they have been created or closed"
msgstr ""
-"<Html> Vui lòng nhập các giá trị ngày / thời gian hợp lệ để hạn chế <br> "
-"truy vấn đến mộtPhạm vi thời gian cụ thể. </ Html>"
+"Chọn changesets dựa trên ngày tháng / thời gian họ đã được tạo ra hoặc đóng "
+"cửa"
-msgid "Invalid date/time values"
-msgstr "Ngày không hợp lệ / lần giá trị"
+msgid "Select only changesets related to a specific bounding box"
+msgstr "Chỉ chọn changesets liên quan đến một hộp bounding cụ thể"
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
@@ -7358,31 +7281,6 @@ msgstr ""
msgid "Invalid bounding box"
msgstr "hộp bounding không hợp lệ"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"Giá trị hiện tại không phải là một ID người dùng hợp lệ. Vui lòng nhập một "
-"giá trị số nguyên> 0"
-
-msgid "Please enter an integer value > 0"
-msgstr "Hãy nhập một giá trị số nguyên> 0"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Xin vui lòng nhập một ngày trong các định dạng thông thường cho miền địa "
-"phương của bạn <br> Ví dụ:.{0} <br> Ví dụ: {1} <br> Ví dụ: {2} <br> Ví dụ: "
-"{3} <br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr ""
-"Xin vui lòng nhập một thời gian hợp lệ trong các định dạng thông thường cho "
-"miền địa phương của bạn <br> Ví dụ:.{0} <br> Ví dụ: {1} <br> Ví dụ: {2} <br> "
-"Ví dụ: {3} <br>"
-
msgid "Download my changesets only"
msgstr "Tải changesets tôi chỉ"
@@ -7471,6 +7369,79 @@ msgstr "URL truy vấn changeset bất hợp pháp"
msgid "Close the dialog and abort querying of changesets"
msgstr "Đóng hộp thoại và hủy bỏ việc truy vấn của changesets"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Xin vui lòng nhập một ngày trong các định dạng thông thường cho miền địa "
+"phương của bạn <br> Ví dụ:.{0} <br> Ví dụ: {1} <br> Ví dụ: {2} <br> Ví dụ: "
+"{3} <br>"
+
+msgid "Query open changesets only"
+msgstr "Query changesets mở"
+
+msgid "Query closed changesets only"
+msgstr "Query đóng changesets chỉ"
+
+msgid "Query both open and closed changesets"
+msgstr "Query cả hai mở và đóng cửa changesets"
+
+msgid "Date: "
+msgstr "Ngày "
+
+msgid "Time:"
+msgstr "Thời gian:"
+
+msgid "Closed after - "
+msgstr "đóng sau - "
+
+msgid "Date:"
+msgstr "Ngày"
+
+msgid "Created before - "
+msgstr "tạo trước - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "Chỉ changesets đóng sau khi sau ngày / thời gian"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr ""
+"Chỉ changesets đóng cửa sau và tạo ra trước một ngày cụ thể / thời gian"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Không thể xây dựng truy vấn changeset với những hạn chế dựa trên thời gian. "
+"Input không phải làHợp lệ"
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<Html> Vui lòng nhập các giá trị ngày / thời gian hợp lệ để hạn chế <br> "
+"truy vấn đến mộtPhạm vi thời gian cụ thể. </ Html>"
+
+msgid "Invalid date/time values"
+msgstr "Ngày không hợp lệ / lần giá trị"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Xin vui lòng nhập một thời gian hợp lệ trong các định dạng thông thường cho "
+"miền địa phương của bạn <br> Ví dụ:.{0} <br> Ví dụ: {1} <br> Ví dụ: {2} <br> "
+"Ví dụ: {3} <br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"Giá trị hiện tại không phải là một ID người dùng hợp lệ. Vui lòng nhập một "
+"giá trị số nguyên> 0"
+
+msgid "Please enter an integer value > 0"
+msgstr "Hãy nhập một giá trị số nguyên> 0"
+
msgid "URL: "
msgstr "URL: "
@@ -7490,6 +7461,55 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "URL truy vấn changeset này là không hợp lệ"
+msgid "Only changesets owned by myself"
+msgstr "Chỉ changesets thuộc sở hữu của bản thân mình"
+
+msgid "User ID:"
+msgstr "User ID:"
+
+msgid "User name:"
+msgstr "Tên người dùng:"
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr ""
+"Chỉ changesets thuộc sở hữu của người sử dụng với các ID người dùng sau"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "Chỉ changesets thuộc sở hữu của người dùng với tên người dùng sau"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr ""
+"Chỉ changesets thuộc sở hữu của mình (disabled JOSM. Hiện đang điều hành bởi "
+"mộtNgười dùng ẩn danh)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Không thể hạn chế truy vấn changeset cho người sử dụng hiện nay bởi vì người "
+"dùng hiện tạiVô danh"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "giá trị hiện tại '' {0} '' cho người dùng ID không hợp lệ"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"Không thể hạn chế các truy vấn changeset với tên người dùng '' {0} ''"
+
+msgid "Please enter a valid user ID"
+msgstr "Hãy nhập một ID người dùng hợp lệ"
+
+msgid "Invalid user ID"
+msgstr "ID người dùng không hợp lệ"
+
+msgid "Please enter a non-empty user name"
+msgstr "Hãy nhập tên người dùng không trống"
+
+msgid "Invalid user name"
+msgstr "Tên người dùng không hợp lệ"
+
msgid "Activate"
msgstr "Kích hoạt"
@@ -8675,6 +8695,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -10279,6 +10302,9 @@ msgstr "Direction"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "file sóng âm thanh (* .wav)"
+
msgid "Import Audio"
msgstr "Import Audio"
@@ -10294,9 +10320,6 @@ msgstr ""
msgid "Import not possible"
msgstr "Import không thể"
-msgid "Wave Audio files (*.wav)"
-msgstr "file sóng âm thanh (* .wav)"
-
msgid "Audio markers from {0}"
msgstr "dấu hiệu âm thanh từ {0}"
@@ -10406,14 +10429,6 @@ msgstr "(URL là: "
msgid "Select the map painting styles"
msgstr "Chọn các kiểu vẽ bản đồ"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "Không thể tải Mappaint phong cách từ '' {0} '' ngoại lệ là:. {1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr "bốc phong cách '' {0} '' ..."
@@ -10427,6 +10442,9 @@ msgstr[0] ""
"Có lỗi khi tải phong cách này. Chọn '' Thông tin '' từ bên phảiNhấp vào "
"trình đơn để biết chi tiết."
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "Không thể tải Mappaint phong cách từ '' {0} '' ngoại lệ là:. {1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "Không phân tích Mappaint phong cách từ '' {0} '' Lỗi là:. {1}"
@@ -11526,6 +11544,9 @@ msgstr "loãng Chức vụ (red = cao, màu xanh lá cây = thấp, nếu có)"
msgid "Track date"
msgstr "ngày Track"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "Single Color (có thể được tùy chỉnh cho các lớp có tên)"
@@ -11538,6 +11559,18 @@ msgstr "xe đạp"
msgid "Foot"
msgstr "chân"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "Gỗ"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "Tạo dấu khi đọc GPX"
@@ -11550,6 +11583,9 @@ msgstr "Dải màu dựa trên giới hạn dữ liệu"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "đồ họa GPX Smooth (antialiasing)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -11618,6 +11654,11 @@ msgstr ""
"hơn."
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -11640,9 +11681,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr "Colors điểm và phân đoạn theo dõi bởi dấu thời gian của nó."
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr "Cho phép điều chỉnh các track màu cho tốc độ trung bình khác nhau."
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "Theo dõi và điểm màu"
@@ -12928,6 +12976,12 @@ msgstr "Kiểm tra các lỗi trên đối tượng tôn giáo"
msgid "Checks for errors on relations"
msgstr "Kiểm tra các lỗi trên các mối quan hệ"
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr "thẻ không cần thiết"
@@ -14062,6 +14116,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "Lưu người dùng và mật khẩu (không mã hóa)"
+msgid "Assume"
+msgstr "Giả sử"
+
+msgid "Existing values"
+msgstr "Giá trị có sẵn"
+
msgid "<delete from {0} objects>"
msgstr "<xóa từ {0} đối tượng>"
@@ -14083,12 +14143,6 @@ msgstr "Thêm thẻ kiểm tra để đối tượng được chọn"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift + Enter: Thêm tất cả các thẻ cho các đối tượng được lựa chọn"
-msgid "Assume"
-msgstr "Giả sử"
-
-msgid "Existing values"
-msgstr "Giá trị có sẵn"
-
msgid "Enable the checkbox to accept the value"
msgstr "Kích hoạt hộp kiểm để chấp nhận giá trị"
@@ -15206,6 +15260,9 @@ msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
"Silent shortcut xung đột:. '' {0} '' di chuyển bằng '' {1} '' để '' {2} ''"
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "Có {0} tag được tìm thấy trong bộ đệm, nó là đáng ngờ!"
@@ -15714,14 +15771,17 @@ msgstr "Mapbox vệ tinh"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik, không có nhãn)"
@@ -15744,8 +15804,11 @@ msgstr "Hike & Bike"
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Campuchia, Lào, Thái Lan, Việt Nam song ngữ"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
@@ -15795,8 +15858,8 @@ msgstr "OSM Inspector: Địa điểm"
msgid "OSM Inspector: Highways"
msgstr "OSM Inspector: Đường cao tốc"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
+msgstr ""
msgid "OSM Inspector: Routing"
msgstr "OSM Inspector: Routing"
@@ -15804,10 +15867,22 @@ msgstr "OSM Inspector: Routing"
msgid "OSM Inspector: Addresses"
msgstr "OSM Inspector: Địa chỉ"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM Inspector: Ranh giới (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -15843,6 +15918,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -15888,10 +15969,16 @@ msgstr "VoGIS: Flächenwidmungsplan"
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
+msgstr ""
+
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -15927,14 +16014,32 @@ msgstr ""
msgid "TEC bus lines (2014)"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
msgstr ""
msgid "IBGE Mapa de Setores Urbanos"
msgstr "IBGE Mapa de Setores Urbanos"
-msgid "IBGE Mapa de Setores Rurais"
-msgstr "IBGE Mapa de Setores Rurais"
+msgid "IBGE Mapa de Setores Rurais"
+msgstr "IBGE Mapa de Setores Rurais"
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
msgid "Geobase Hydrography"
msgstr "Geobase Thủy"
@@ -15948,12 +16053,34 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "British Columbia Mosaic"
+msgid "Latest southwest British Columbia Landsat"
+msgstr ""
+
msgid "Kelowna 2012"
msgstr "Kelowna 2012"
msgid "Kelowna Roads overlay"
msgstr "Kelowna Đường overlay"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr ""
+
msgid "Czech CUZK:KM"
msgstr "Czech CUZK: KM"
@@ -15990,6 +16117,12 @@ msgstr "Stevns (Đan Mạch)"
msgid "Vejmidte (Denmark)"
msgstr "Vejmidte (Đan Mạch)"
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr "Estonia basemap (Maaamet)"
@@ -16023,9 +16156,6 @@ msgstr "Địa chính"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr "CRAIG - Auvergne 2013-25 cm"
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr "CRIGE PACA Alpes-Maritimes 2009-40 cm"
-
msgid "GrandNancy Orthophotographie 2012"
msgstr "GrandNancy Orthophotographie 2012"
@@ -16084,9 +16214,6 @@ msgstr ""
"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999-"
" 1 m"
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Sorbian Language)"
-
msgid "Hamburg (40 cm)"
msgstr "Hamburg (40 cm)"
@@ -16114,9 +16241,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16150,9 +16274,54 @@ msgstr "NRW-Atlas: Topographische Karte 1: 10000"
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr "Metropole Ruhr: Luftbilder (10 cm)"
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr "Drone Hình ảnh (Haiti)"
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr "Drone Hình ảnh 2014 (Haiti)"
@@ -16189,19 +16358,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -16264,9 +16442,21 @@ msgstr "PCN 2012 - Italy"
msgid "South Tyrol Orthofoto 2011"
msgstr "South Tyrol Orthofoto 2011"
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr "South Tyrol Topomap"
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr "Liên Xô - Latvia"
@@ -16300,12 +16490,34 @@ msgstr "Niger Delta tháng 10 năm 2012 Landsat"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr "Dải Gaza - Pléiades - 2014/07/06"
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr "Dải Gaza - Pléiades - 2014/07/06 (NIR)"
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr "Pangasinan / Bulacan (Phillipines thuê)"
@@ -16432,9 +16644,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr "Zabrze: Ortofotomapa 2011 (ảnh trên không)"
-msgid "trail.pl: Szlaki (paths)"
-msgstr "trail.pl: Szlaki (đường dẫn)"
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -16444,6 +16653,20 @@ msgstr "ScanEx IRS"
msgid "ScanEx SPOT"
msgstr "ScanEx SPOT"
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Car"
@@ -16465,12 +16688,30 @@ msgstr "Raba-KGZ: Slovenia đất nông nghiệp sử dụng"
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr "Raba-KGZ: Slovenia xây dựng lên các khu vực"
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr "Nam Phi CD: NGI Aerial"
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr "Catastro Tây Ban Nha"
@@ -16492,6 +16733,9 @@ msgstr "IDEIB - Quần đảo Balearic"
msgid "GRAFCAN Express - Canary Islands"
msgstr "GRAFCAN Express - Quần đảo Canary"
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Kanton Aargau 25cm (AGIS 2011)"
@@ -16534,6 +16778,9 @@ msgstr "Canton de Fribourg 50cm (2005)"
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr "Stadt Bern 10cm / 25cm (2012)"
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
@@ -16555,6 +16802,12 @@ msgstr "Bonvillars Orthophoto 2013"
msgid "Fiez Orthophoto 2013"
msgstr "Fiez Orthophoto 2013"
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -16570,6 +16823,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr "MSR Maps Topo"
@@ -16597,9 +16853,54 @@ msgstr "NC Orthoimagery mới nhất"
msgid "U.S. Forest Service roads"
msgstr "Lâm nghiệp Hoa Kỳ con đường"
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr "Ukraine - Orthophotomaps 2012"
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -16621,9 +16922,6 @@ msgstr "Air Khảo sát Surrey"
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr "NLS - OS 6-inch Scotland 1842-1882"
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr "NLS - OS 1: 25k 1 series 1937-1961"
@@ -16633,9 +16931,6 @@ msgstr "NLS - OS 1-inch 7 series 1955-1961"
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr "hệ điều hành 1: 25k lịch sử (OSM-Best)"
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr "hệ điều hành 1: 25k lịch sử (OSM-Limited)"
@@ -16964,7 +17259,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr "Tạo một mạng lưới các cách khác nhau."
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -17067,6 +17362,9 @@ msgstr "công cụ đơn giản để gắn thẻ số nhà."
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "Tạo Hình ảnh giới hạn XML từ một multipolygon"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -19563,6 +19861,9 @@ msgstr "Stream"
msgid "River"
msgstr "sông"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "Canal"
@@ -20615,6 +20916,12 @@ msgstr "Motel"
msgid "Guest House/Bed & Breakfast"
msgstr "Guest House / Bed & Breakfast"
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "Chalet"
@@ -20681,6 +20988,12 @@ msgstr "chỗ ngồi ngoài trời"
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "Thức ăn nhanh"
@@ -21626,31 +21939,19 @@ msgstr "wildlife_hide"
msgid "Hunting Stand"
msgstr "Săn Stand"
-msgid "Height"
-msgstr "Chiều cao"
-
-msgctxt "height"
-msgid "low"
-msgstr "thấp"
-
-msgctxt "height"
-msgid "half"
-msgstr "một nửa"
-
-msgctxt "height"
-msgid "full"
-msgstr "đầy đủ"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
-msgstr "Lock"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -22242,6 +22543,10 @@ msgid "hut"
msgstr "túp lều"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr "ký túc xá"
@@ -23537,6 +23842,9 @@ msgstr "Butcher"
msgid "Seafood"
msgstr "Seafood"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "Deli (Fine Food)"
@@ -24355,9 +24663,6 @@ msgstr "Tree Row"
msgid "A line of trees."
msgstr "Một hàng cây."
-msgid "Wood"
-msgstr "Gỗ"
-
msgid "Woodland where timber production does not dominate use."
msgstr "Woodland nơi sản xuất gỗ không thống trị sử dụng."
@@ -25420,6 +25725,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0} bị phản đối"
@@ -25523,6 +25831,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} trên một nút. Nên được sử dụng trên một con đường."
@@ -25599,6 +25913,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr "{0} nên được trên nút nơi {1} và {2} giao nhau"
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "tên đường tắt"
@@ -25623,6 +25942,9 @@ msgstr "{0} được sử dụng với {1}"
msgid "street name contains ss"
msgstr "tên đường phố chứa ss"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -26432,6 +26754,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -26474,7 +26806,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -27376,6 +27708,9 @@ msgstr "Chọn một khu vực (ví dụ như xây dựng) từ một hình ản
msgid "Area Selector"
msgstr "Selector"
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr "khu vực tạo"
@@ -27420,8 +27755,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -29115,6 +29450,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "XML mở tập tin Hình ảnh"
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr "Hiệu chỉnh Layer"
@@ -31388,9 +31782,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -31550,9 +31941,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr "[khoảng cách]"
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "mẫu Route ..."
@@ -31610,6 +31998,9 @@ msgstr "bên tay trái"
msgid "Maximum distance from route"
msgstr "Khoảng cách tối đa từ đường"
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr "Giao thông vận tải công cộng: Thay đổi kiểu cửa"
@@ -31811,9 +32202,6 @@ msgstr "Cải tạo đa giác"
msgid "Multipolygon must consist only of ways"
msgstr "Multipolygon phải chỉ gồm những cách"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr "Tái thiết của đa giác có thể được thực hiện chỉ từ cách bên ngoài"
-
msgid "Reconstruct polygons from relation {0}"
msgstr "Cải tạo đa giác từ mối quan hệ {0}"
diff --git a/i18n/po/wae.po b/i18n/po/wae.po
index 9bd6cdc..7223aca 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:19+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:25+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -63,9 +63,15 @@ msgstr ""
msgid "Help"
msgstr ""
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr ""
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr ""
@@ -200,6 +206,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
+msgid "Select WMS layers"
+msgstr ""
+
+msgid "Add layers"
+msgstr ""
+
msgid "Add imagery layer {0}"
msgstr ""
@@ -221,12 +233,6 @@ msgstr ""
msgid "Select image format for WMS layer"
msgstr ""
-msgid "Select WMS layers"
-msgstr ""
-
-msgid "Add layers"
-msgstr ""
-
msgid "Add Node..."
msgstr ""
@@ -707,6 +713,9 @@ msgstr ""
msgid "Opens a dialog that allows to jump to a specific location"
msgstr ""
+msgid "Jump to Position"
+msgstr ""
+
msgid "Enter Lat/Lon to jump to position."
msgstr ""
@@ -728,9 +737,6 @@ msgstr ""
msgid "Jump there"
msgstr ""
-msgid "Jump to Position"
-msgstr ""
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
@@ -781,6 +787,9 @@ msgstr ""
msgid "Merge the current layer into another layer"
msgstr ""
+msgid "{0} completed in {1}"
+msgstr ""
+
msgid "Merging layers with different upload policies"
msgstr ""
@@ -930,16 +939,16 @@ msgstr[1] ""
msgid "Opening file ''{0}'' ..."
msgstr ""
-msgid "Open Location..."
+msgid "Which tasks to perform?"
msgstr ""
-msgid "Open an URL."
+msgid "Ok"
msgstr ""
-msgid "Separate Layer"
+msgid "Open Location..."
msgstr ""
-msgid "Select if the data should be downloaded into a new layer"
+msgid "Open an URL."
msgstr ""
msgid "Enter URL to download:"
@@ -948,6 +957,12 @@ msgstr ""
msgid "Enter an URL from where data should be downloaded"
msgstr ""
+msgid "Separate Layer"
+msgstr ""
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr ""
+
msgid "Download Location"
msgstr ""
@@ -963,12 +978,6 @@ msgstr ""
msgid "Download Data"
msgstr ""
-msgid "Which tasks to perform?"
-msgstr ""
-
-msgid "Ok"
-msgstr ""
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1761,9 +1770,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr ""
@@ -3949,9 +3955,6 @@ msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3981,12 +3984,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr ""
-msgid "Multipolygon inner way is outside"
+msgid "Multipolygon rings share node(s)"
msgstr ""
msgid "Intersection between multipolygon ways"
msgstr ""
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr ""
@@ -4679,12 +4697,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr ""
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4701,8 +4725,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5023,9 +5047,6 @@ msgstr ""
msgid " ({0})"
msgstr ""
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5164,82 +5185,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr ""
-
-msgid "My with Merged"
-msgstr ""
-
-msgid "Their with Merged"
-msgstr ""
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr ""
-
-msgid "Properties"
-msgstr ""
-
-msgid "Tags"
-msgstr ""
-
-msgid "Nodes"
-msgstr ""
-
-msgid "Members"
-msgstr ""
-
-msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nodes(resolved)"
-msgstr ""
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Nodes(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-msgid "Members(resolved)"
-msgstr ""
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-
-msgid "Members(with conflicts)"
-msgstr ""
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-msgid "No pending property conflicts"
-msgstr ""
-
-msgid "Properties(with conflicts)"
-msgstr ""
-
-msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-msgid "Conflict Resolution"
-msgstr ""
-
msgid "{0} more..."
msgstr ""
@@ -5405,6 +5350,82 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
+msgid "My with Their"
+msgstr ""
+
+msgid "My with Merged"
+msgstr ""
+
+msgid "Their with Merged"
+msgstr ""
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Tags"
+msgstr ""
+
+msgid "Nodes"
+msgstr ""
+
+msgid "Members"
+msgstr ""
+
+msgid "No pending tag conflicts to be resolved"
+msgstr ""
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nodes(resolved)"
+msgstr ""
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Nodes(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the node list of this way"
+msgstr ""
+
+msgid "Members(resolved)"
+msgstr ""
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+
+msgid "Members(with conflicts)"
+msgstr ""
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr ""
+
+msgid "No pending property conflicts"
+msgstr ""
+
+msgid "Properties(with conflicts)"
+msgstr ""
+
+msgid "Pending property conflicts to be resolved"
+msgstr ""
+
+msgid "Conflict Resolution"
+msgstr ""
+
msgid "Node"
msgstr ""
@@ -5464,7 +5485,7 @@ msgstr ""
msgid "Primitive"
msgstr ""
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
msgid "<undefined>"
@@ -6856,212 +6877,212 @@ msgstr ""
msgid "Select only changesets related to a specific bounding box"
msgstr ""
-msgid "Query open changesets only"
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
msgstr ""
-msgid "Query closed changesets only"
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
msgstr ""
-msgid "Query both open and closed changesets"
+msgid "Invalid bounding box"
msgstr ""
-msgid "Only changesets owned by myself"
+msgid "Download my changesets only"
msgstr ""
-msgid "User ID:"
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
msgstr ""
-msgid "User name:"
+msgid ""
+"<html>Please select one the following <strong>standard "
+"queries</strong>.Select <strong>Download my changesets only</strong> if you "
+"only want to download changesets created by yourself.<br>Note that JOSM will "
+"download max. 100 changesets.</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user ID"
+msgid "<html>Download the latest changesets</html>"
msgstr ""
-msgid "Only changesets owned by the user with the following user name"
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
msgstr ""
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
+msgid "<html>Download my open changesets</html>"
msgstr ""
msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
msgstr ""
-msgid "Current value ''{0}'' for user ID is not valid"
+msgid "<html>Download changesets in the current map view</html>"
msgstr ""
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgid ""
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-msgid "Please enter a valid user ID"
+msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
-msgid "Invalid user ID"
+msgid "Basic"
msgstr ""
-msgid "Please enter a non-empty user name"
+msgid "Download changesets using predefined queries"
msgstr ""
-msgid "Invalid user name"
+msgid "From URL"
msgstr ""
-msgid "Date: "
+msgid "Query changesets from a server URL"
msgstr ""
-msgid "Time:"
+msgid "Advanced"
msgstr ""
-msgid "Closed after - "
+msgid "Use a custom changeset query"
msgstr ""
-msgid "Date:"
+msgid "Query changesets"
msgstr ""
-msgid "Created before - "
+msgid "Query and download changesets"
msgstr ""
-msgid "Only changesets closed after the following date/time"
+msgid "Please enter a valid changeset query URL first."
msgstr ""
-msgid "Only changesets closed after and created before a specific date/time"
+msgid "Illegal changeset query URL"
msgstr ""
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Close the dialog and abort querying of changesets"
msgstr ""
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-msgid "Invalid date/time values"
+msgid "Query open changesets only"
msgstr ""
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
+msgid "Query closed changesets only"
msgstr ""
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "Query both open and closed changesets"
msgstr ""
-msgid "Invalid bounding box"
+msgid "Date: "
msgstr ""
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
+msgid "Time:"
msgstr ""
-msgid "Please enter an integer value > 0"
+msgid "Closed after - "
msgstr ""
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Date:"
msgstr ""
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Created before - "
msgstr ""
-msgid "Download my changesets only"
+msgid "Only changesets closed after the following date/time"
msgstr ""
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
+msgid "Only changesets closed after and created before a specific date/time"
msgstr ""
msgid ""
-"<html>Please select one the following <strong>standard "
-"queries</strong>.Select <strong>Download my changesets only</strong> if you "
-"only want to download changesets created by yourself.<br>Note that JOSM will "
-"download max. 100 changesets.</html>"
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
msgstr ""
-msgid "<html>Download the latest changesets</html>"
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
msgstr ""
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
+msgid "Invalid date/time values"
msgstr ""
-msgid "<html>Download my open changesets</html>"
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
+"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-msgid "<html>Download changesets in the current map view</html>"
+msgid "Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
-"query."
+msgid "URL: "
msgstr ""
-msgid "Cannot create changeset query for open changesets of anonymous user"
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-msgid "Basic"
+msgid "Examples"
msgstr ""
-msgid "Download changesets using predefined queries"
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
msgstr ""
-msgid "From URL"
+msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Query changesets from a server URL"
+msgid "Only changesets owned by myself"
msgstr ""
-msgid "Advanced"
+msgid "User ID:"
msgstr ""
-msgid "Use a custom changeset query"
+msgid "User name:"
msgstr ""
-msgid "Query changesets"
+msgid "Only changesets owned by the user with the following user ID"
msgstr ""
-msgid "Query and download changesets"
+msgid "Only changesets owned by the user with the following user name"
msgstr ""
-msgid "Please enter a valid changeset query URL first."
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
msgstr ""
-msgid "Illegal changeset query URL"
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
msgstr ""
-msgid "Close the dialog and abort querying of changesets"
+msgid "Current value ''{0}'' for user ID is not valid"
msgstr ""
-msgid "URL: "
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgid "Please enter a valid user ID"
msgstr ""
-msgid "Examples"
+msgid "Invalid user ID"
msgstr ""
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
+msgid "Please enter a non-empty user name"
msgstr ""
-msgid "This changeset query URL is invalid"
+msgid "Invalid user name"
msgstr ""
msgid "Activate"
@@ -8167,6 +8188,9 @@ msgstr ""
msgid "B"
msgstr ""
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
@@ -9653,6 +9677,9 @@ msgstr ""
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
msgid "Import Audio"
msgstr ""
@@ -9665,9 +9692,6 @@ msgstr ""
msgid "Import not possible"
msgstr ""
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
msgid "Audio markers from {0}"
msgstr ""
@@ -9764,14 +9788,6 @@ msgstr ""
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr ""
@@ -9784,6 +9800,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10772,6 +10791,9 @@ msgstr ""
msgid "Track date"
msgstr ""
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr ""
@@ -10784,6 +10806,18 @@ msgstr ""
msgid "Foot"
msgstr ""
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr ""
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr ""
@@ -10796,6 +10830,9 @@ msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
msgstr ""
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10855,6 +10892,11 @@ msgid ""
msgstr ""
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
@@ -10873,9 +10915,16 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr ""
@@ -12070,6 +12119,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13105,6 +13160,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr ""
+msgid "Assume"
+msgstr ""
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13126,12 +13187,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr ""
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14091,6 +14146,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14579,13 +14637,16 @@ msgstr ""
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14609,7 +14670,10 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14660,7 +14724,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14669,10 +14733,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
+
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14708,6 +14784,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14753,10 +14835,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14789,34 +14877,74 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14855,6 +14983,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14888,9 +15022,6 @@ msgstr ""
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14947,9 +15078,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -14977,9 +15105,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15013,9 +15138,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15052,19 +15222,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15127,9 +15306,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15163,12 +15354,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15295,9 +15508,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15307,6 +15517,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15328,12 +15552,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15355,6 +15597,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15397,6 +15642,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15418,6 +15666,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr ""
@@ -15433,6 +15687,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15460,9 +15717,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15484,9 +15786,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15496,9 +15795,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15810,7 +16106,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr ""
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15898,6 +16194,9 @@ msgstr ""
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18294,6 +18593,9 @@ msgstr ""
msgid "River"
msgstr ""
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -19342,6 +19644,12 @@ msgstr ""
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr ""
@@ -19408,6 +19716,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr ""
@@ -20351,31 +20665,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr ""
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
+msgid "Lockable"
msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20967,6 +21269,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22260,6 +22566,9 @@ msgstr ""
msgid "Seafood"
msgstr ""
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -23073,9 +23382,6 @@ msgstr ""
msgid "A line of trees."
msgstr ""
-msgid "Wood"
-msgstr ""
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24120,6 +24426,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr ""
@@ -24211,6 +24520,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24287,6 +24602,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24311,6 +24631,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25084,6 +25407,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
@@ -25126,7 +25459,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25929,6 +26262,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -25970,8 +26306,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27569,6 +27905,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29730,9 +30125,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -29890,9 +30282,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr ""
@@ -29950,6 +30339,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30147,9 +30539,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
diff --git a/i18n/po/zh_CN.po b/i18n/po/zh_CN.po
index e72e666..aae26ec 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: 2016-11-06 22:51+0100\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\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: 2016-11-07 05:17+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:23+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: zh_CN\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -67,9 +67,15 @@ msgstr "构建主菜单中"
msgid "Help"
msgstr "帮助(H)"
+msgid "Initializing internal boundaries data"
+msgstr ""
+
msgid "Initializing OSM API"
msgstr "初始化 OSM API 中"
+msgid "Initializing internal traffic data"
+msgstr ""
+
msgid "Initializing validator"
msgstr "初始化验证器中"
@@ -202,6 +208,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr "在地图上设定选定的元件为上列列表中选定的项目。"
+msgid "Select WMS layers"
+msgstr "选择 WMS 图层"
+
+msgid "Add layers"
+msgstr "添加图层"
+
msgid "Add imagery layer {0}"
msgstr "添加图像层 {0}"
@@ -223,12 +235,6 @@ msgstr "错误"
msgid "Select image format for WMS layer"
msgstr "为 WMS 图层选择图像格式"
-msgid "Select WMS layers"
-msgstr "选择 WMS 图层"
-
-msgid "Add layers"
-msgstr "添加图层"
-
msgid "Add Node..."
msgstr "添加节点..."
@@ -713,6 +719,9 @@ msgstr "跳至位置"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "打开能跳到指定位置的对话框"
+msgid "Jump to Position"
+msgstr "跳至位置"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "输入要跳至地点的经/纬度。"
@@ -734,9 +743,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "跳至该处"
-msgid "Jump to Position"
-msgstr "跳至位置"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr "无法解析纬度、经度或缩放级别。请检查。"
@@ -787,6 +793,9 @@ msgstr "合并图层"
msgid "Merge the current layer into another layer"
msgstr "将当前的图层合并到另一个图层"
+msgid "{0} completed in {1}"
+msgstr "{0} 已完成{1}"
+
msgid "Merging layers with different upload policies"
msgstr "合并不同的上传政策图层"
@@ -937,24 +946,30 @@ msgstr[0] "正在打开 {0} 个文件..."
msgid "Opening file ''{0}'' ..."
msgstr "正在打开文件“{0}”..."
+msgid "Which tasks to perform?"
+msgstr "执行哪项任务？"
+
+msgid "Ok"
+msgstr "确定"
+
msgid "Open Location..."
msgstr "打开位置..."
msgid "Open an URL."
msgstr "打开一个 URL。"
-msgid "Separate Layer"
-msgstr "另一图层"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "如果数据要下载到新的图层里，请选择此项"
-
msgid "Enter URL to download:"
msgstr "输入要下载的 URL："
msgid "Enter an URL from where data should be downloaded"
msgstr "输入用来下载数据的 URL："
+msgid "Separate Layer"
+msgstr "另一图层"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "如果数据要下载到新的图层里，请选择此项"
+
msgid "Download Location"
msgstr "下载位置"
@@ -970,12 +985,6 @@ msgstr "关闭对话框，并取消下载"
msgid "Download Data"
msgstr "下载数据"
-msgid "Which tasks to perform?"
-msgstr "执行哪项任务？"
-
-msgid "Ok"
-msgstr "确定"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
@@ -1766,9 +1775,6 @@ msgstr "查询并下载修改集合..."
msgid "Errors during download"
msgstr "下载时发生错误"
-msgid "Download Geo URL"
-msgstr "下载 Geo URL"
-
msgid "Download GPS"
msgstr "下载 GPS"
@@ -3943,9 +3949,6 @@ msgstr "区域类型的路径未封闭"
msgid "No outer way for multipolygon"
msgstr "多重多边形没有外部路径"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "“{0}”的角色应为“{1}”"
-
msgid "No area style for multipolygon"
msgstr "暂无多边形面状样式"
@@ -3974,12 +3977,27 @@ msgstr "面状要素采用多重多边形路径外边界表示"
msgid "Multipolygon is not closed"
msgstr "多重多边形未封闭"
-msgid "Multipolygon inner way is outside"
-msgstr "多重多边形的内部路径超出外围"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "多重多边形之间有交集"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr "“{0}”的角色应为“{1}”"
+
+msgid "Multipolygon inner way is outside"
+msgstr "多重多边形的内部路径超出外围"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "多重多边形成员没有有用的角色"
@@ -4673,12 +4691,18 @@ msgstr "禁止访问特定资源，以逗号分隔"
msgid "options provided as Java system properties"
msgstr "提供 Java 系统属性的选项"
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr "/JOSM/首选项/路径 "
msgid "Set the preferences directory"
msgstr "设置首选项目录"
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr "/JOSM/用户/数据/路径"
@@ -4695,9 +4719,9 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr "/JOSM/安装/路径 "
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
-msgstr "将三个目录均重置为安装目录。缓存路径为安装目录下的cache文件夹"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
+msgstr ""
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5019,9 +5043,6 @@ msgstr "点击以在后台运行工作"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr "{0} 已完成{1}"
-
msgid "Enlarge"
msgstr "放大"
@@ -5162,80 +5183,6 @@ msgstr "冲突背景：移除成员"
msgid "Conflict foreground: remove member"
msgstr "冲突前景：移除成员"
-msgid "My with Their"
-msgstr "我的与他们的"
-
-msgid "My with Merged"
-msgstr "我的与合并的"
-
-msgid "Their with Merged"
-msgstr "他们的与合并的"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "角色 {0} 没有参与比较配对 {1}"
-
-msgid "Properties"
-msgstr "属性"
-
-msgid "Tags"
-msgstr "标签"
-
-msgid "Nodes"
-msgstr "节点"
-
-msgid "Members"
-msgstr "成员"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "没有待解决的标签冲突"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "标签({0} 个冲突)"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} 个标签冲突等待调解"
-
-msgid "Nodes(resolved)"
-msgstr "节点(已解决)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr "合并的节点列表已冻结。这个路径的节点列表中没有待解决的冲突"
-
-msgid "Nodes(with conflicts)"
-msgstr "节点(有冲突)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "这个路径的节点列表中待解决的冲突"
-
-msgid "Members(resolved)"
-msgstr "成员(已解决)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr "合并的节点列表已冻结。这个关系的成员列表中没有待解决的冲突"
-
-msgid "Members(with conflicts)"
-msgstr "成员(有冲突)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "这个关系的成员列表中待解决的冲突"
-
-msgid "No pending property conflicts"
-msgstr "没有待解决的冲突"
-
-msgid "Properties(with conflicts)"
-msgstr "属性(有冲突)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "待解决的属性冲突"
-
-msgid "Conflict Resolution"
-msgstr "解决冲突"
-
msgid "{0} more..."
msgstr "还有 {0}..."
@@ -5398,6 +5345,80 @@ msgid "Their version ({0} entry)"
msgid_plural "Their version ({0} entries)"
msgstr[0] "他们的版本({0} 个项目)"
+msgid "My with Their"
+msgstr "我的与他们的"
+
+msgid "My with Merged"
+msgstr "我的与合并的"
+
+msgid "Their with Merged"
+msgstr "他们的与合并的"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "角色 {0} 没有参与比较配对 {1}"
+
+msgid "Properties"
+msgstr "属性"
+
+msgid "Tags"
+msgstr "标签"
+
+msgid "Nodes"
+msgstr "节点"
+
+msgid "Members"
+msgstr "成员"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "没有待解决的标签冲突"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "标签({0} 个冲突)"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} 个标签冲突等待调解"
+
+msgid "Nodes(resolved)"
+msgstr "节点(已解决)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr "合并的节点列表已冻结。这个路径的节点列表中没有待解决的冲突"
+
+msgid "Nodes(with conflicts)"
+msgstr "节点(有冲突)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "这个路径的节点列表中待解决的冲突"
+
+msgid "Members(resolved)"
+msgstr "成员(已解决)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr "合并的节点列表已冻结。这个关系的成员列表中没有待解决的冲突"
+
+msgid "Members(with conflicts)"
+msgstr "成员(有冲突)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "这个关系的成员列表中待解决的冲突"
+
+msgid "No pending property conflicts"
+msgstr "没有待解决的冲突"
+
+msgid "Properties(with conflicts)"
+msgstr "属性(有冲突)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "待解决的属性冲突"
+
+msgid "Conflict Resolution"
+msgstr "解决冲突"
+
msgid "Node"
msgstr "节点"
@@ -5457,8 +5478,8 @@ msgstr "角色"
msgid "Primitive"
msgstr "原型"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
-msgstr "合并的节点尚未冻结。不能建立决议命令"
+msgid "Merged members not frozen yet. Cannot build resolution command"
+msgstr ""
msgid "<undefined>"
msgstr "<未定义>"
@@ -6845,111 +6866,25 @@ msgstr "从 OSM 服务器更新修改集合内容"
msgid "Changeset ID: "
msgstr "修改集合 ID： "
-msgid "Enter a changeset id"
-msgstr "请输入修改集合 id"
-
-msgid ""
-"Download the changeset with the specified id, including the changeset content"
-msgstr "以指定的 id 下载修改集合，包含修改集合的内容"
-
-msgid "Select changesets owned by specific users"
-msgstr "选择由指定用户拥有的修改集合"
-
-msgid "Select changesets depending on whether they are open or closed"
-msgstr "根据修改集合是开放或关闭来选择"
-
-msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr "根据修改集合建立或关闭的日期/时间来选择"
-
-msgid "Select only changesets related to a specific bounding box"
-msgstr "只选择与指定的限定边框相关的修改集合"
-
-msgid "Query open changesets only"
-msgstr "只查询开放的修改集合"
-
-msgid "Query closed changesets only"
-msgstr "只查询关闭的修改集合"
-
-msgid "Query both open and closed changesets"
-msgstr "查询开放与关闭的修改集合"
-
-msgid "Only changesets owned by myself"
-msgstr "只是我自己拥有的修改集合"
-
-msgid "User ID:"
-msgstr "用户 ID："
-
-msgid "User name:"
-msgstr "用户名："
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "只是下列用户 ID 拥有的修改集合"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "只是下列用户名拥有的修改集合"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr "只是我自己拥有的修改集合(禁用。JOSM 目前是以匿名用户运行)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr "不能限制修改集合的查询为当前的用户，因为当前的用户是匿名的"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "当前用户 ID 值“{0}”无效"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr "不能限制为查询用户名“{0}”的修改集合"
-
-msgid "Please enter a valid user ID"
-msgstr "请输入有效的用户 ID"
-
-msgid "Invalid user ID"
-msgstr "无效的用户 ID"
-
-msgid "Please enter a non-empty user name"
-msgstr "请输入非空的用户名"
-
-msgid "Invalid user name"
-msgstr "无效的用户名"
-
-msgid "Date: "
-msgstr "日期： "
-
-msgid "Time:"
-msgstr "时间："
-
-msgid "Closed after - "
-msgstr "关闭晚于 - "
-
-msgid "Date:"
-msgstr "日期："
-
-msgid "Created before - "
-msgstr "建立早于 - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "只是在下列日期/时间后关闭的修改集合"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr "只是在指定的日期/时间后关闭，或在这之前建立的修改集合"
-
+msgid "Enter a changeset id"
+msgstr "请输入修改集合 id"
+
msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr "不能建立以时间限制为基础的修改集合查询。输入是无效的。"
+"Download the changeset with the specified id, including the changeset content"
+msgstr "以指定的 id 下载修改集合，包含修改集合的内容"
+
+msgid "Select changesets owned by specific users"
+msgstr "选择由指定用户拥有的修改集合"
+
+msgid "Select changesets depending on whether they are open or closed"
+msgstr "根据修改集合是开放或关闭来选择"
msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr "<html>请输入有效的日期/时间数值，来将查询限制<br>在指定的时间范围。</html>"
+"Select changesets based on the date/time they have been created or closed"
+msgstr "根据修改集合建立或关闭的日期/时间来选择"
-msgid "Invalid date/time values"
-msgstr "无效的日期/时间数值"
+msgid "Select only changesets related to a specific bounding box"
+msgstr "只选择与指定的限定边框相关的修改集合"
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
@@ -6964,23 +6899,6 @@ msgstr "<html>请输入有效的经度/纬度数值，来将修改集合查询<b
msgid "Invalid bounding box"
msgstr "无效的限定边框"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr "目前的数值不是有效的用户 ID。请输入大于 0 的整数值"
-
-msgid "Please enter an integer value > 0"
-msgstr "请输入大于 0 的整数值"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr "请以您所在地区常用的格式输入日期。<br>例子：{0}<br>例子：{1}<br>例子：{2}<br>例子：{3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr "请以您所在地区常用的格式输入有效的时间。<br>例子：{0}<br>例子：{1}<br>例子：{2}<br>例子：{3}<br>"
-
msgid "Download my changesets only"
msgstr "只下载我的修改集合"
@@ -7058,6 +6976,66 @@ msgstr "不合法的修改集合查询 URL"
msgid "Close the dialog and abort querying of changesets"
msgstr "关闭此对话框，并放弃修改集合的查询"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr "请以您所在地区常用的格式输入日期。<br>例子：{0}<br>例子：{1}<br>例子：{2}<br>例子：{3}<br>"
+
+msgid "Query open changesets only"
+msgstr "只查询开放的修改集合"
+
+msgid "Query closed changesets only"
+msgstr "只查询关闭的修改集合"
+
+msgid "Query both open and closed changesets"
+msgstr "查询开放与关闭的修改集合"
+
+msgid "Date: "
+msgstr "日期： "
+
+msgid "Time:"
+msgstr "时间："
+
+msgid "Closed after - "
+msgstr "关闭晚于 - "
+
+msgid "Date:"
+msgstr "日期："
+
+msgid "Created before - "
+msgstr "建立早于 - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "只是在下列日期/时间后关闭的修改集合"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr "只是在指定的日期/时间后关闭，或在这之前建立的修改集合"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr "不能建立以时间限制为基础的修改集合查询。输入是无效的。"
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr "<html>请输入有效的日期/时间数值，来将查询限制<br>在指定的时间范围。</html>"
+
+msgid "Invalid date/time values"
+msgstr "无效的日期/时间数值"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr "请以您所在地区常用的格式输入有效的时间。<br>例子：{0}<br>例子：{1}<br>例子：{2}<br>例子：{3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr "目前的数值不是有效的用户 ID。请输入大于 0 的整数值"
+
+msgid "Please enter an integer value > 0"
+msgstr "请输入大于 0 的整数值"
+
msgid "URL: "
msgstr "URL： "
@@ -7075,6 +7053,49 @@ msgstr "请注意修改集合查询目前永远提交到“{0}”，不管下列
msgid "This changeset query URL is invalid"
msgstr "这个修改集合查询 URL 是无效的"
+msgid "Only changesets owned by myself"
+msgstr "只是我自己拥有的修改集合"
+
+msgid "User ID:"
+msgstr "用户 ID："
+
+msgid "User name:"
+msgstr "用户名："
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "只是下列用户 ID 拥有的修改集合"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "只是下列用户名拥有的修改集合"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr "只是我自己拥有的修改集合(禁用。JOSM 目前是以匿名用户运行)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr "不能限制修改集合的查询为当前的用户，因为当前的用户是匿名的"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "当前用户 ID 值“{0}”无效"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr "不能限制为查询用户名“{0}”的修改集合"
+
+msgid "Please enter a valid user ID"
+msgstr "请输入有效的用户 ID"
+
+msgid "Invalid user ID"
+msgstr "无效的用户 ID"
+
+msgid "Please enter a non-empty user name"
+msgstr "请输入非空的用户名"
+
+msgid "Invalid user name"
+msgstr "无效的用户名"
+
msgid "Activate"
msgstr "使用"
@@ -8182,6 +8203,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr "无法更新 id {0} 的原型，因为目前编辑的图层为空"
@@ -9688,6 +9712,9 @@ msgstr "方向"
msgid "Velocity, {0}"
msgstr "速度，{0}"
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave 音频文件(*.wav)"
+
msgid "Import Audio"
msgstr "导入音频"
@@ -9701,9 +9728,6 @@ msgstr ""
msgid "Import not possible"
msgstr "不可能输入"
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave 音频文件(*.wav)"
-
msgid "Audio markers from {0}"
msgstr "{0} 的音频标记"
@@ -9798,16 +9822,6 @@ msgstr "(URL 为： "
msgid "Select the map painting styles"
msgstr "选择地图的绘画样式"
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "从“{0}”加载地图绘画风格失败。异常为：{1}"
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-"JOSM 不再支持旧 XML 格式的 MapPoint 样式。\n"
-"请更新“{0}”到 MapCSS"
-
msgid "loading style ''{0}''..."
msgstr "加载样式“{0}”中..."
@@ -9819,6 +9833,9 @@ msgid_plural ""
"right click menu for details."
msgstr[0] "加载这种样式时发生了 {0} 个错误。查看详细信息，请从右键菜单中选择“信息”。"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "从“{0}”加载地图绘画风格失败。异常为：{1}"
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr "从“{0}”解析地图绘画风格失败。错误为：{1}"
@@ -10842,6 +10859,9 @@ msgstr "位置的稀疏度(红 = 高，绿 = 低，如果可用的话)"
msgid "Track date"
msgstr "轨迹日期"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "单一颜色(可以为已命名的图层自定义)"
@@ -10854,6 +10874,18 @@ msgstr "单车"
msgid "Foot"
msgstr "步行"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "树林"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "读取 GPX 时创建标记"
@@ -10866,6 +10898,9 @@ msgstr "基于数据限制的动态色彩范围"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "光滑 GPX 图形(抗锯齿)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10925,6 +10960,11 @@ msgid ""
msgstr "使用抗锯齿，以使 GPX 线有平滑外观。"
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr "所有的点和轨迹区段都使用同样的颜色。可以在图层管理程序中自定义。"
@@ -10943,9 +10983,16 @@ msgstr "依位置精度(HDOP)为点和轨迹区段上色。您的捕获设备需
msgid "Colors points and track segments by its timestamp."
msgstr "依时间戳为点和轨迹区段上色。"
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr "允许依不同的平均速度调整轨迹颜色。"
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "轨迹和点的颜色"
@@ -12158,6 +12205,12 @@ msgstr "检查宗教设施错误"
msgid "Checks for errors on relations"
msgstr "检查关系错误"
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr "不必要的标签"
@@ -13194,6 +13247,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "保存用户与密码(未加密)"
+msgid "Assume"
+msgstr "猜测"
+
+msgid "Existing values"
+msgstr "已有值"
+
msgid "<delete from {0} objects>"
msgstr "<从 {0} 个对象中删除>"
@@ -13215,12 +13274,6 @@ msgstr "将选中的标签添加到选中的对象"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr "Shift+Enter：将所有的标签添加到选定的对象"
-msgid "Assume"
-msgstr "猜测"
-
-msgid "Existing values"
-msgstr "已有值"
-
msgid "Enable the checkbox to accept the value"
msgstr "启用该复选框可接值参"
@@ -14200,6 +14253,9 @@ msgstr "正在添加本地主机 JOSM 证书至密钥库 {0}"
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr "静默快捷键冲突：“{0}”被“{1}”移动到“{2}”。"
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] "在剪贴板找到 {0} 标签，可疑！"
@@ -14686,14 +14742,17 @@ msgstr "Mapbox 卫星"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr "OpenSeaMap"
-msgid "OpenStreetMap Carto (Standard layer)"
-msgstr "OpenStreetMap Carto (标准图层)"
+msgid "OpenStreetMap Carto (Standard)"
+msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik 黑白)"
+msgid "OpenStreetMap (Standard Black & White)"
+msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
msgstr "OpenStreetMap (Mapnik，无标签)"
@@ -14716,8 +14775,11 @@ msgstr ""
msgid "skobbler"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "柬埔寨、老挝、泰国、越南多语言"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
+msgstr ""
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (叠加层)"
@@ -14767,8 +14829,8 @@ msgstr "OSM 检查器：位置"
msgid "OSM Inspector: Highways"
msgstr "OSM 检查器：公路"
-msgid "OSM Inspector: Multipolygon"
-msgstr "OSM 检查器：多重多边形"
+msgid "OSM Inspector: Area"
+msgstr ""
msgid "OSM Inspector: Routing"
msgstr "OSM 检查器：路线"
@@ -14776,10 +14838,22 @@ msgstr "OSM 检查器：路线"
msgid "OSM Inspector: Addresses"
msgstr "OSM 检查器：地址"
-msgid "OSM Inspector: Boundaries (EU)"
-msgstr "OSM 检查器：边界（欧盟）"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14815,6 +14889,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr "basemap.at"
@@ -14860,10 +14940,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14893,37 +14979,77 @@ msgstr ""
msgid "SPW(allonie) 2012-2013 aerial imagery"
msgstr ""
-msgid "SPW(allonie) 2009-2010 aerial imagery"
+msgid "SPW(allonie) 2009-2010 aerial imagery"
+msgstr ""
+
+msgid "TEC bus lines (2014)"
+msgstr ""
+
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Urbanos"
+msgstr ""
+
+msgid "IBGE Mapa de Setores Rurais"
+msgstr ""
+
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "Latest southwest British Columbia Landsat"
msgstr ""
-msgid "IBGE Mapa de Setores Urbanos"
+msgid "Kelowna 2012"
msgstr ""
-msgid "IBGE Mapa de Setores Rurais"
+msgid "Kelowna Roads overlay"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
msgstr ""
-msgid "Geobase Roads"
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
msgstr ""
-msgid "Canvec"
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
msgstr ""
-msgid "Kelowna 2012"
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
msgstr ""
-msgid "Kelowna Roads overlay"
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
@@ -14962,6 +15088,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14995,9 +15127,6 @@ msgstr "Cadastre"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -15054,9 +15183,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15084,9 +15210,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15120,9 +15243,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15159,19 +15327,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15234,9 +15411,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15270,12 +15459,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15402,9 +15613,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15414,6 +15622,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk 汽车"
@@ -15435,12 +15657,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15462,6 +15702,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15504,6 +15747,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15525,6 +15771,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr "台湾电子地图开放数据"
@@ -15540,6 +15792,9 @@ msgstr ""
msgid "NLSC Open Data WMTS"
msgstr ""
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15567,9 +15822,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15591,9 +15891,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15603,9 +15900,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15919,8 +16213,8 @@ msgstr "平移/缩放时下载新的数据"
msgid "Create a grid of ways."
msgstr "建立路径的格线。"
-msgid "Customization of public transport stops."
-msgstr "自定义公共交通车站。"
+msgid "Customization of public public transport stops."
+msgstr ""
msgid ""
"Creating and handling address nodes and buildings within Czech Republic."
@@ -16007,6 +16301,9 @@ msgstr "标记门牌号码的简单工具。"
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "从多重多边形中生成图像 XML 边界"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -18403,6 +18700,9 @@ msgstr "溪流"
msgid "River"
msgstr "河流"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "运河"
@@ -19451,6 +19751,12 @@ msgstr "汽车旅馆"
msgid "Guest House/Bed & Breakfast"
msgstr "旅舍/Bed & Breakfast"
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "小木屋"
@@ -19517,6 +19823,12 @@ msgstr "户外座位"
msgid "Takeaway"
msgstr "外带"
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "快餐"
@@ -20460,31 +20772,19 @@ msgstr "遮蔽野生动物"
msgid "Hunting Stand"
msgstr "狩猎站"
-msgid "Height"
-msgstr "高度"
-
-msgctxt "height"
-msgid "low"
-msgstr "低"
-
-msgctxt "height"
-msgid "half"
-msgstr "半"
-
-msgctxt "height"
-msgid "full"
-msgstr "全"
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
-msgstr "锁"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr "饮水点"
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr "压缩空气"
@@ -21076,6 +21376,10 @@ msgid "hut"
msgstr "木屋"
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr "宿舍"
@@ -22369,6 +22673,9 @@ msgstr "肉类"
msgid "Seafood"
msgstr "海鲜"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr "熟食店(美食)"
@@ -23182,9 +23489,6 @@ msgstr "树排"
msgid "A line of trees."
msgstr "一排树。"
-msgid "Wood"
-msgstr "树林"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -24229,6 +24533,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0} 已过时"
@@ -24320,6 +24627,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr "{0} 在节点上。应用于路径上。"
@@ -24396,6 +24709,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr "缩写的街道名称"
@@ -24420,6 +24738,9 @@ msgstr ""
msgid "street name contains ss"
msgstr "街道名称中含有 ss"
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25201,6 +25522,16 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr "上传图片"
@@ -25243,7 +25574,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -26116,6 +26447,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26157,8 +26491,8 @@ msgid "Algorithm"
msgstr "算法"
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -27799,6 +28133,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr "打开图像 XML 文件"
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -29958,9 +30351,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -30118,9 +30508,6 @@ msgstr "[ID] {0}"
msgid "[gap]"
msgstr "[缺口]"
-msgid " [ID] {0}"
-msgstr " [ID] {0}"
-
msgid "Route patterns ..."
msgstr "路线模式..."
@@ -30178,6 +30565,9 @@ msgstr "左侧"
msgid "Maximum distance from route"
msgstr "离路线的最大距离"
+msgid " [ID] {0}"
+msgstr " [ID] {0}"
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30375,9 +30765,6 @@ msgstr "重建多边形"
msgid "Multipolygon must consist only of ways"
msgstr "多重多边形只能包含路径"
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr "从关系 {0} 中重建多边形"
diff --git a/i18n/po/zh_TW.po b/i18n/po/zh_TW.po
index 1471e5a..2a99fea 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: 2016-11-06 22:51+0100\n"
-"PO-Revision-Date: 2016-09-22 18:17+0000\n"
+"POT-Creation-Date: 2017-01-07 03:43+0100\n"
+"PO-Revision-Date: 2017-01-01 07:07+0000\n"
"Last-Translator: Sean Young <assanges at gmail.com>\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: 2016-11-07 05:16+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2017-01-07 05:22+0000\n"
+"X-Generator: Launchpad (build 18302)\n"
"Language: zh_TW\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -64,9 +64,15 @@ msgstr "正在建立主選單"
msgid "Help"
msgstr "輔助說明"
+msgid "Initializing internal boundaries data"
+msgstr "初始化內部邊界資料"
+
msgid "Initializing OSM API"
msgstr "初始化 OSM API"
+msgid "Initializing internal traffic data"
+msgstr "初始化內部資料"
+
msgid "Initializing validator"
msgstr "正在載入 validator"
@@ -199,6 +205,12 @@ msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr "在地圖上設定選取的元件為上列清單中選取的項目。"
+msgid "Select WMS layers"
+msgstr "選擇WMS圖層"
+
+msgid "Add layers"
+msgstr "新增圖層"
+
msgid "Add imagery layer {0}"
msgstr "加入圖片圖層 {0}"
@@ -220,12 +232,6 @@ msgstr "錯誤"
msgid "Select image format for WMS layer"
msgstr "選擇WMS圖層的檔案格式"
-msgid "Select WMS layers"
-msgstr "選擇WMS圖層"
-
-msgid "Add layers"
-msgstr "新增圖層"
-
msgid "Add Node..."
msgstr "新增節點"
@@ -710,6 +716,9 @@ msgstr "跳至位置"
msgid "Opens a dialog that allows to jump to a specific location"
msgstr "開啟能跳到指定位置的對話盒"
+msgid "Jump to Position"
+msgstr "跳至位置"
+
msgid "Enter Lat/Lon to jump to position."
msgstr "輸入要跳至地點的經/緯。"
@@ -731,9 +740,6 @@ msgstr "URL"
msgid "Jump there"
msgstr "跳至那裡"
-msgid "Jump to Position"
-msgstr "跳至位置"
-
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr "無法貼上緯度、經度或縮放。請檢查。"
@@ -784,6 +790,9 @@ msgstr "合併圖層"
msgid "Merge the current layer into another layer"
msgstr "將目前的圖層合併到另一個圖層"
+msgid "{0} completed in {1}"
+msgstr "{0} {1} 完成"
+
msgid "Merging layers with different upload policies"
msgstr "合併不同上傳方針的圖層"
@@ -934,24 +943,30 @@ msgstr[0] "正在開啟 {0} 個檔案..."
msgid "Opening file ''{0}'' ..."
msgstr "正在開啟檔案「{0}」..."
+msgid "Which tasks to perform?"
+msgstr "執行哪項工作？"
+
+msgid "Ok"
+msgstr "確定"
+
msgid "Open Location..."
msgstr "開啟位址..."
msgid "Open an URL."
msgstr "開啟 URL"
-msgid "Separate Layer"
-msgstr "另外的圖層"
-
-msgid "Select if the data should be downloaded into a new layer"
-msgstr "如果資料要下載到新的圖層裡請選擇此項"
-
msgid "Enter URL to download:"
msgstr "輸入要下載的 URL："
msgid "Enter an URL from where data should be downloaded"
msgstr "輸入用來下載資料的 URL"
+msgid "Separate Layer"
+msgstr "另外的圖層"
+
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "如果資料要下載到新的圖層裡請選擇此項"
+
msgid "Download Location"
msgstr "下載位置"
@@ -967,16 +982,10 @@ msgstr "關閉對話盒並取消下載"
msgid "Download Data"
msgstr "下載資料"
-msgid "Which tasks to perform?"
-msgstr "執行哪項工作？"
-
-msgid "Ok"
-msgstr "確定"
-
msgid ""
"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
"patterns shown:<br>{1}"
-msgstr ""
+msgstr "無法開啟網址 ''{0}''<br>以下下載任務顯示網址格式：<br>{1}"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1206,7 +1215,7 @@ msgid ""
msgstr "選擇資料圖層中所有取消刪除的物件。這樣也會選擇不完整的物件。"
msgid "Non-branching way sequences"
-msgstr ""
+msgstr "非分枝路徑序列"
msgid "Select non-branching sequences of ways"
msgstr "選擇路徑的非分支次序"
@@ -1362,12 +1371,12 @@ msgstr "此路徑不能從選取的節點分割。（提示：選取的節點在
msgid ""
"A role based relation membership was copied to all new ways.<br>You should "
"verify this and correct it when necessary."
-msgstr ""
+msgstr "關係成員的腳色全部複雜到新的路徑上。<br>必要時你應該檢核和修正。"
msgid ""
"A relation membership was copied to all new ways.<br>You should verify this "
"and correct it when necessary."
-msgstr ""
+msgstr "關係成員全部複雜到新的路徑上。<br>必要時你應該檢核和修正。"
msgid "Split way {0} into {1} part"
msgid_plural "Split way {0} into {1} parts"
@@ -1383,7 +1392,7 @@ msgid "Toggles the global setting ''{0}''."
msgstr "切換全城設定值「{0}」。"
msgid "Encourage/discourage upload"
-msgstr ""
+msgstr "鼓勵/不鼓勵上傳"
msgid "UnGlue Ways"
msgstr "取消黏合路徑"
@@ -1473,12 +1482,12 @@ msgid ""
"You are about to unglue nodes outside of the area you have "
"downloaded.<br>This can cause problems because other objects (that you do "
"not see) might use them.<br>Do you really want to unglue?"
-msgstr ""
+msgstr "你要剝離下載範圍外的節點。<br>這麼做可能因為其他物件(看不到的部分)可能使用造成問題。<br>你確定要剝離嗎？"
msgid ""
"You are about to unglue incomplete objects.<br>This will cause problems "
"because you don''t see the real object.<br>Do you really want to unglue?"
-msgstr ""
+msgstr "你要剝離不完整的物件。<br>這麼做可能因為看不到的物件造成問題。<br>你確定要剝離嗎？"
msgid "Unglueing affected {0} relation: {1}"
msgid_plural "Unglueing affected {0} relations: {1}"
@@ -1580,6 +1589,8 @@ msgid ""
"require you subsequently have to revert your changes, or force other "
"contributors to.<br /><br />Are you sure you want to continue?"
msgstr ""
+"你將要上傳 ''{0}'' 圖層的資料。<br /><br />我們<b>強列不鼓勵</b>上傳這個圖層的資料。如果你繼續，<br "
+"/>你可能要回退你的變動，或是別人必須回退。<br /><br />你確定要繼續嗎？"
msgid "Ignore this hint and upload anyway"
msgstr "忽略這個提示並強制上傳"
@@ -1762,9 +1773,6 @@ msgstr "查詢並下載變更組合..."
msgid "Errors during download"
msgstr "下載時發生錯誤"
-msgid "Download Geo URL"
-msgstr ""
-
msgid "Download GPS"
msgstr "下載 GPS"
@@ -1839,7 +1847,7 @@ msgid "Command"
msgstr "指令"
msgid "Request details: {0}"
-msgstr ""
+msgstr "請求詳細: {0}"
msgid "Download OSM URL"
msgstr "下載 OSM URL"
@@ -1862,7 +1870,7 @@ msgid "({0}/{1}) Loading parents of relation {2}"
msgstr "({0}/{1}) 正在載入關係 {2} 的上層項目"
msgid "Download session"
-msgstr ""
+msgstr "下載階段"
msgid "Download {0} of {1} ({2} left)"
msgstr "下載 {0} / {1} (剩下 {2})"
@@ -1892,8 +1900,7 @@ msgid_plural ""
"There are {0} objects in your local dataset which might be deleted on the "
"server.<br>If you later try to delete or update them the server is likely to "
"report a conflict."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "在你本地資料集的 {0} 物件也許已經在伺服器刪除了。<br>如果之後你嘗試刪除或上傳到伺服器的話，你可能會遇到衝突。"
msgid ""
"Click <strong>{0}</strong> to check the state of this object on the server."
@@ -1929,10 +1936,10 @@ msgid "Create note"
msgstr "建立註解"
msgid "Enter a detailed comment to create a note"
-msgstr ""
+msgstr "輸入詳細資訊來建立備註"
msgid "You must enter a comment to create a new note"
-msgstr ""
+msgstr "你必須輸入內容才能建立備註"
msgid "Delete Mode"
msgstr "刪除模式"
@@ -1955,7 +1962,7 @@ msgid "draw angle snap highlight"
msgstr ""
msgid "helper line"
-msgstr ""
+msgstr "輔助線"
msgid "Draw"
msgstr "繪製"
@@ -2013,7 +2020,7 @@ msgid "Toggle snapping by {0}"
msgstr "切換依 {0} 貼齊"
msgid "Show helper geometry"
-msgstr ""
+msgstr "顯示輔助線"
msgid "Snap to node projections"
msgstr "貼齊節點投影法"
@@ -2031,7 +2038,7 @@ msgid "0,30,45,60,90,..."
msgstr "0,30,45,60,90,..."
msgid "FIX"
-msgstr ""
+msgstr "FIX"
msgid "Angle snapping"
msgstr "角度貼齊"
@@ -2264,13 +2271,13 @@ msgstr[0] ""
msgstr[1] ""
msgid "Confirmation"
-msgstr ""
+msgstr "確認"
msgid "List of recent relations"
-msgstr ""
+msgstr "最近編輯的關係列表"
msgid "Open recent relation"
-msgstr ""
+msgstr "打開最近編輯的關係"
msgid "Relation Editor: {0}"
msgstr "關係編輯器：{0}"
@@ -3936,9 +3943,6 @@ msgstr "區域類型的路徑並未封閉"
msgid "No outer way for multipolygon"
msgstr "多重多邊形沒有外部路徑"
-msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
-
msgid "No area style for multipolygon"
msgstr ""
@@ -3968,12 +3972,27 @@ msgstr ""
msgid "Multipolygon is not closed"
msgstr "多重多邊形並未封閉"
-msgid "Multipolygon inner way is outside"
-msgstr "多重多邊形的內部路徑超出外圍"
+msgid "Multipolygon rings share node(s)"
+msgstr ""
msgid "Intersection between multipolygon ways"
msgstr "多重多邊形之間有交集"
+msgid "Multipolygon rings are equal"
+msgstr ""
+
+msgid "Role for ''{0}'' should be ''{1}''"
+msgstr ""
+
+msgid "Multipolygon inner way is outside"
+msgstr "多重多邊形的內部路徑超出外圍"
+
+msgid "Multipolygon ring contains segments twice"
+msgstr ""
+
+msgid "Multipolygon outer way shares segment(s) with other ring"
+msgstr ""
+
msgid "No useful role for multipolygon member"
msgstr "多重多邊形成員沒有有用的角色"
@@ -4665,12 +4684,18 @@ msgstr ""
msgid "options provided as Java system properties"
msgstr "選項提供為 Java 系統屬性"
+msgid "Change the JOSM directory name"
+msgstr ""
+
msgid "/PATH/TO/JOSM/PREF "
msgstr ""
msgid "Set the preferences directory"
msgstr ""
+msgid "Default: {0}"
+msgstr ""
+
msgid "/PATH/TO/JOSM/USERDATA"
msgstr ""
@@ -4687,8 +4712,8 @@ msgid "/PATH/TO/JOSM/HOMEDIR "
msgstr ""
msgid ""
-"Relocate all 3 directories to homedir. Cache directory will be in "
-"homedir/cache"
+"Set the preferences+data+cache directory (cache directory will be "
+"josm.home/cache)"
msgstr ""
msgid ""
@@ -5010,9 +5035,6 @@ msgstr "點選以在背景執行工作"
msgid " ({0})"
msgstr " ({0})"
-msgid "{0} completed in {1}"
-msgstr ""
-
msgid "Enlarge"
msgstr ""
@@ -5151,80 +5173,6 @@ msgstr ""
msgid "Conflict foreground: remove member"
msgstr ""
-msgid "My with Their"
-msgstr "我的與他們的"
-
-msgid "My with Merged"
-msgstr "我的與合併的"
-
-msgid "Their with Merged"
-msgstr "他們的與合併的"
-
-msgid "Role {0} is not participating in compare pair {1}."
-msgstr "角色 {0} 沒有參與比較配對 {1}"
-
-msgid "Properties"
-msgstr "屬性"
-
-msgid "Tags"
-msgstr "標籤"
-
-msgid "Nodes"
-msgstr "節點"
-
-msgid "Members"
-msgstr "成員"
-
-msgid "No pending tag conflicts to be resolved"
-msgstr "沒有待解決的標籤衝突"
-
-msgid "Tags({0} conflict)"
-msgid_plural "Tags({0} conflicts)"
-msgstr[0] "標籤（{0} 衝突）"
-
-msgid "{0} pending tag conflict to be resolved"
-msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} 個標籤衝突等待調解"
-
-msgid "Nodes(resolved)"
-msgstr "節點(已解決)"
-
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr "合併的節點清單已凍結。這個路徑的節點清單中沒有待解決的衝突"
-
-msgid "Nodes(with conflicts)"
-msgstr "節點(有衝突)"
-
-msgid "Pending conflicts in the node list of this way"
-msgstr "這個路徑的節點清單中待解決的衝突"
-
-msgid "Members(resolved)"
-msgstr "成員(已解決)"
-
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr "合併的節點清單已凍結。這個關係的成員清單中沒有待解決的衝突"
-
-msgid "Members(with conflicts)"
-msgstr "成員(有衝突)"
-
-msgid "Pending conflicts in the member list of this relation"
-msgstr "這個關係的成員清單中待解決的衝突"
-
-msgid "No pending property conflicts"
-msgstr "沒有待解決的衝突"
-
-msgid "Properties(with conflicts)"
-msgstr "屬性(有衝突)"
-
-msgid "Pending property conflicts to be resolved"
-msgstr "待解決的屬性衝突"
-
-msgid "Conflict Resolution"
-msgstr "衝突的決議"
-
msgid "{0} more..."
msgstr "還有 {0}..."
@@ -5387,6 +5335,80 @@ msgid "Their version ({0} entry)"
msgid_plural "Their version ({0} entries)"
msgstr[0] "他們的版本 ({0} 個項目)"
+msgid "My with Their"
+msgstr "我的與他們的"
+
+msgid "My with Merged"
+msgstr "我的與合併的"
+
+msgid "Their with Merged"
+msgstr "他們的與合併的"
+
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "角色 {0} 沒有參與比較配對 {1}"
+
+msgid "Properties"
+msgstr "屬性"
+
+msgid "Tags"
+msgstr "標籤"
+
+msgid "Nodes"
+msgstr "節點"
+
+msgid "Members"
+msgstr "成員"
+
+msgid "No pending tag conflicts to be resolved"
+msgstr "沒有待解決的標籤衝突"
+
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "標籤（{0} 衝突）"
+
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} 個標籤衝突等待調解"
+
+msgid "Nodes(resolved)"
+msgstr "節點(已解決)"
+
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr "合併的節點清單已凍結。這個路徑的節點清單中沒有待解決的衝突"
+
+msgid "Nodes(with conflicts)"
+msgstr "節點(有衝突)"
+
+msgid "Pending conflicts in the node list of this way"
+msgstr "這個路徑的節點清單中待解決的衝突"
+
+msgid "Members(resolved)"
+msgstr "成員(已解決)"
+
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr "合併的節點清單已凍結。這個關係的成員清單中沒有待解決的衝突"
+
+msgid "Members(with conflicts)"
+msgstr "成員(有衝突)"
+
+msgid "Pending conflicts in the member list of this relation"
+msgstr "這個關係的成員清單中待解決的衝突"
+
+msgid "No pending property conflicts"
+msgstr "沒有待解決的衝突"
+
+msgid "Properties(with conflicts)"
+msgstr "屬性(有衝突)"
+
+msgid "Pending property conflicts to be resolved"
+msgstr "待解決的屬性衝突"
+
+msgid "Conflict Resolution"
+msgstr "衝突的決議"
+
msgid "Node"
msgstr "節點"
@@ -5446,8 +5468,8 @@ msgstr "角色"
msgid "Primitive"
msgstr "原型"
-msgid "Merged nodes not frozen yet. Cannot build resolution command"
-msgstr "合併的節點尚未凍結。不能建置決議指令"
+msgid "Merged members not frozen yet. Cannot build resolution command"
+msgstr ""
msgid "<undefined>"
msgstr "<未定義的>"
@@ -6835,92 +6857,6 @@ msgstr "根據變更組合建立或關閉的日期/時刻來選擇"
msgid "Select only changesets related to a specific bounding box"
msgstr "只選擇與指定的綁定方塊相關的變更組合"
-msgid "Query open changesets only"
-msgstr "只查詢開放的變更組合"
-
-msgid "Query closed changesets only"
-msgstr "只查詢已關閉的變更組合"
-
-msgid "Query both open and closed changesets"
-msgstr "查詢開放與關閉的變更組合"
-
-msgid "Only changesets owned by myself"
-msgstr "只有我自己擁有的變更組合"
-
-msgid "User ID:"
-msgstr "使用者 ID："
-
-msgid "User name:"
-msgstr "使用者名稱："
-
-msgid "Only changesets owned by the user with the following user ID"
-msgstr "只有由下列使用者 ID 擁有的變更組合"
-
-msgid "Only changesets owned by the user with the following user name"
-msgstr "只有由下列使用者名稱擁有的變更組合"
-
-msgid ""
-"Only changesets owned by myself (disabled. JOSM is currently run by an "
-"anonymous user)"
-msgstr "只有我自己擁有的變更組合 (已停用。JOSM 目前以匿名使用者執行)"
-
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
-msgstr "不能限制變更組合的查詢為目前的使用者，因為目前的使用者是匿名的"
-
-msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "使用者 ID 目前的數值「{0}」是無效的"
-
-msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr "不能限制變更組合的查詢為使用者名稱「{0}」"
-
-msgid "Please enter a valid user ID"
-msgstr "請輸入有效的使用者 ID"
-
-msgid "Invalid user ID"
-msgstr "無效的使用者 ID"
-
-msgid "Please enter a non-empty user name"
-msgstr "請輸入非空白的使用者名稱"
-
-msgid "Invalid user name"
-msgstr "無效的使用者名稱"
-
-msgid "Date: "
-msgstr "日期： "
-
-msgid "Time:"
-msgstr "時間："
-
-msgid "Closed after - "
-msgstr "在此後關閉 - "
-
-msgid "Date:"
-msgstr "日期："
-
-msgid "Created before - "
-msgstr "建立早於 - "
-
-msgid "Only changesets closed after the following date/time"
-msgstr "只有在下列日期/時刻後關閉的變更組合"
-
-msgid "Only changesets closed after and created before a specific date/time"
-msgstr "只有在指定的日期/時刻後關閉或在這之前建立的變更組合"
-
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
-msgstr "不能建立以時刻限制為基礎的變更組合查詢。輸入是無效的。"
-
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
-msgstr "<html>請輸入有效的日期/時刻數值來將查詢限制<br>在指定的時間範圍。</html>"
-
-msgid "Invalid date/time values"
-msgstr "無效的日期/時刻數值"
-
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
"invalid."
@@ -6934,23 +6870,6 @@ msgstr "<html>請輸入有效的經度 /緯度數值來將變更組合查詢<br>
msgid "Invalid bounding box"
msgstr "無效的綁定方塊"
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr "目前的數值不是有效的使用者 ID。請輸入大於 0 的整數值"
-
-msgid "Please enter an integer value > 0"
-msgstr "請輸入大於 0 的整數值"
-
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr "請以您所在地區常用的格式輸入日期。<br>範例：{0}<br>範例：{1}<br>範例：{2}<br>範例：{3}<br>"
-
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
-msgstr "請以您所在地區常用的格式輸入有效的時刻。<br>範例：{0}<br>範例：{1}<br>範例：{2}<br>範例：{3}<br>"
-
msgid "Download my changesets only"
msgstr "只下載我的變更組合"
@@ -7028,6 +6947,66 @@ msgstr "不合法的變更組合查詢 URL"
msgid "Close the dialog and abort querying of changesets"
msgstr "關閉此對話盒並放棄變更組合的查詢"
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr "請以您所在地區常用的格式輸入日期。<br>範例：{0}<br>範例：{1}<br>範例：{2}<br>範例：{3}<br>"
+
+msgid "Query open changesets only"
+msgstr "只查詢開放的變更組合"
+
+msgid "Query closed changesets only"
+msgstr "只查詢已關閉的變更組合"
+
+msgid "Query both open and closed changesets"
+msgstr "查詢開放與關閉的變更組合"
+
+msgid "Date: "
+msgstr "日期： "
+
+msgid "Time:"
+msgstr "時間："
+
+msgid "Closed after - "
+msgstr "在此後關閉 - "
+
+msgid "Date:"
+msgstr "日期："
+
+msgid "Created before - "
+msgstr "建立早於 - "
+
+msgid "Only changesets closed after the following date/time"
+msgstr "只有在下列日期/時刻後關閉的變更組合"
+
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr "只有在指定的日期/時刻後關閉或在這之前建立的變更組合"
+
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr "不能建立以時刻限制為基礎的變更組合查詢。輸入是無效的。"
+
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr "<html>請輸入有效的日期/時刻數值來將查詢限制<br>在指定的時間範圍。</html>"
+
+msgid "Invalid date/time values"
+msgstr "無效的日期/時刻數值"
+
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr "請以您所在地區常用的格式輸入有效的時刻。<br>範例：{0}<br>範例：{1}<br>範例：{2}<br>範例：{3}<br>"
+
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr "目前的數值不是有效的使用者 ID。請輸入大於 0 的整數值"
+
+msgid "Please enter an integer value > 0"
+msgstr "請輸入大於 0 的整數值"
+
msgid "URL: "
msgstr "URL: "
@@ -7045,6 +7024,49 @@ msgstr "請注意變更組合查詢目前永遠送出到「{0}」，不管下列
msgid "This changeset query URL is invalid"
msgstr "這個變更組合查詢 URL 是無效的"
+msgid "Only changesets owned by myself"
+msgstr "只有我自己擁有的變更組合"
+
+msgid "User ID:"
+msgstr "使用者 ID："
+
+msgid "User name:"
+msgstr "使用者名稱："
+
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "只有由下列使用者 ID 擁有的變更組合"
+
+msgid "Only changesets owned by the user with the following user name"
+msgstr "只有由下列使用者名稱擁有的變更組合"
+
+msgid ""
+"Only changesets owned by myself (disabled. JOSM is currently run by an "
+"anonymous user)"
+msgstr "只有我自己擁有的變更組合 (已停用。JOSM 目前以匿名使用者執行)"
+
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr "不能限制變更組合的查詢為目前的使用者，因為目前的使用者是匿名的"
+
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "使用者 ID 目前的數值「{0}」是無效的"
+
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr "不能限制變更組合的查詢為使用者名稱「{0}」"
+
+msgid "Please enter a valid user ID"
+msgstr "請輸入有效的使用者 ID"
+
+msgid "Invalid user ID"
+msgstr "無效的使用者 ID"
+
+msgid "Please enter a non-empty user name"
+msgstr "請輸入非空白的使用者名稱"
+
+msgid "Invalid user name"
+msgstr "無效的使用者名稱"
+
msgid "Activate"
msgstr "使用"
@@ -7230,7 +7252,7 @@ msgid "Copy the key and value of all the tags to clipboard"
msgstr ""
msgid "Copy Tags"
-msgstr ""
+msgstr "複製標籤"
msgid "Search Key/Value/Type"
msgstr "搜尋設定鍵/數值/類型"
@@ -8149,6 +8171,9 @@ msgstr "A"
msgid "B"
msgstr "B"
+msgid "Editor"
+msgstr ""
+
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr "無法更新 id {0} 的原型，因為目前編輯的圖層為 null"
@@ -9647,6 +9672,9 @@ msgstr "方向"
msgid "Velocity, {0}"
msgstr ""
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave 音效檔案 (*.wav)"
+
msgid "Import Audio"
msgstr "匯入音效"
@@ -9660,9 +9688,6 @@ msgstr ""
msgid "Import not possible"
msgstr "不可能匯入"
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave 音效檔案 (*.wav)"
-
msgid "Audio markers from {0}"
msgstr "{0} 的音效標記"
@@ -9757,14 +9782,6 @@ msgstr "(URL 是： "
msgid "Select the map painting styles"
msgstr ""
-msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"JOSM does no longer support mappaint styles written in the old XML format.\n"
-"Please update ''{0}'' to MapCSS"
-msgstr ""
-
msgid "loading style ''{0}''..."
msgstr "載入樣式「{0}」..."
@@ -9777,6 +9794,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
@@ -10791,6 +10811,9 @@ msgstr "位置的準確誤差（紅 = 高，綠 = 低，如果可用的話）"
msgid "Track date"
msgstr "軌跡時間"
+msgid "Heat Map (dark = few tracks, bright = many tracks)"
+msgstr ""
+
msgid "Single Color (can be customized for named layers)"
msgstr "單一顏色（可以為已命名的圖層自訂）"
@@ -10803,6 +10826,18 @@ msgstr "單車"
msgid "Foot"
msgstr "步行"
+msgid "Inferno"
+msgstr ""
+
+msgid "Viridis"
+msgstr ""
+
+msgid "Wood"
+msgstr "樹林"
+
+msgid "Heat"
+msgstr ""
+
msgid "Create markers when reading GPX"
msgstr "讀取 GPX 時建立標記"
@@ -10815,6 +10850,9 @@ msgstr "以資料限制為基礎的動態顏色範圍"
msgid "Smooth GPX graphics (antialiasing)"
msgstr "平滑化 GPX 圖形 (反鋸齒)"
+msgid "Draw with Opacity (alpha blending) "
+msgstr ""
+
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
@@ -10874,6 +10912,11 @@ msgid ""
msgstr "對 GPX 線條進行反鋸齒以形成較平滑的外觀。"
msgid ""
+"Apply dynamic alpha-blending and adjust width based on zoom level for all "
+"GPX lines."
+msgstr ""
+
+msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr "所有的點和軌跡區段都使用同樣的顏色。可以在圖層管理程式自訂。"
@@ -10892,9 +10935,16 @@ msgstr "為地點精度 (HDOP) 的點和軌跡區段上色。您的捕捉裝置
msgid "Colors points and track segments by its timestamp."
msgstr ""
+msgid ""
+"Collected points and track segments for a position and displayed as heat map."
+msgstr ""
+
msgid "Allows to tune the track coloring for different average speeds."
msgstr "允許依不同的平均速度調整軌跡顏色。"
+msgid "Selects the color schema for heat map."
+msgstr ""
+
msgid "Track and Point Coloring"
msgstr "軌跡與點的顏色"
@@ -12106,6 +12156,12 @@ msgstr ""
msgid "Checks for errors on relations"
msgstr ""
+msgid "Territories"
+msgstr ""
+
+msgid "Checks for territories-specific features"
+msgstr ""
+
msgid "Unnecessary tags"
msgstr ""
@@ -13143,6 +13199,12 @@ msgstr ""
msgid "Save user and password (unencrypted)"
msgstr "儲存使用者與密碼(未加密)"
+msgid "Assume"
+msgstr "猜測"
+
+msgid "Existing values"
+msgstr ""
+
msgid "<delete from {0} objects>"
msgstr ""
@@ -13164,12 +13226,6 @@ msgstr ""
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
-msgid "Assume"
-msgstr "猜測"
-
-msgid "Existing values"
-msgstr ""
-
msgid "Enable the checkbox to accept the value"
msgstr ""
@@ -14140,6 +14196,9 @@ msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
+msgid "Unknown territory id: {0}"
+msgstr ""
+
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
@@ -14374,7 +14433,7 @@ msgstr "農田"
msgctxt "landuse"
msgid "residential"
-msgstr "居住的"
+msgstr "住宅區"
msgctxt "natural"
msgid "scrub"
@@ -14628,13 +14687,16 @@ msgstr "Mapbox 衛星圖"
msgid "OpenCycleMap"
msgstr ""
+msgid "Thunderforest Landscape"
+msgstr ""
+
msgid "OpenSeaMap"
msgstr ""
-msgid "OpenStreetMap Carto (Standard layer)"
+msgid "OpenStreetMap Carto (Standard)"
msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "OpenStreetMap (Standard Black & White)"
msgstr ""
msgid "OpenStreetMap (Mapnik, no labels)"
@@ -14658,7 +14720,10 @@ msgstr ""
msgid "skobbler"
msgstr "skobbler"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stamen Terrain"
+msgstr ""
+
+msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
msgstr ""
msgid "OpenPT Map (overlay)"
@@ -14709,7 +14774,7 @@ msgstr ""
msgid "OSM Inspector: Highways"
msgstr ""
-msgid "OSM Inspector: Multipolygon"
+msgid "OSM Inspector: Area"
msgstr ""
msgid "OSM Inspector: Routing"
@@ -14718,10 +14783,22 @@ msgstr ""
msgid "OSM Inspector: Addresses"
msgstr ""
-msgid "OSM Inspector: Boundaries (EU)"
+msgid "OSM Inspector: Coastline (EU)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
-msgid "IGN Argentina (WMTS)"
+msgid "IGN Argentina (TMS)"
msgstr ""
msgid "IGN Argentina (WMS)"
@@ -14757,6 +14834,12 @@ msgstr ""
msgid "LPI NSW Administrative Boundaries NPWS Reserve"
msgstr ""
+msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgstr ""
+
msgid "basemap.at"
msgstr ""
@@ -14802,10 +14885,16 @@ msgstr ""
msgid "VoGIS: Höhen und Gelände"
msgstr ""
-msgid "AGIV (Vlaanderen / Flanders) most recent aerial imagery (winter)"
+msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgstr ""
+
+msgid "AGIV Flanders most recent aerial imagery"
+msgstr ""
+
+msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
msgstr ""
-msgid "AGIV aerial imagery 10cm 2013-15"
+msgid "AGIV Flanders GRB"
msgstr ""
msgid "URBISfr numerical imagery (2013)"
@@ -14841,7 +14930,16 @@ msgstr ""
msgid "TEC bus lines (2014)"
msgstr ""
-msgid "Benin:cotonou_pleiade_2016"
+msgid "TEC bus stops (2014)"
+msgstr ""
+
+msgid "Benin: Cotonou Pleiade 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cotonou"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bouvet Island"
msgstr ""
msgid "IBGE Mapa de Setores Urbanos"
@@ -14850,6 +14948,15 @@ msgstr ""
msgid "IBGE Mapa de Setores Rurais"
msgstr ""
+msgid "IBGE Distrito Federal"
+msgstr ""
+
+msgid "Rio Mosaic 2013"
+msgstr ""
+
+msgid "Rio Mosaic 2015"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -14862,12 +14969,34 @@ msgstr ""
msgid "British Columbia Mosaic"
msgstr ""
+msgid "Latest southwest British Columbia Landsat"
+msgstr ""
+
msgid "Kelowna 2012"
msgstr ""
msgid "Kelowna Roads overlay"
msgstr ""
+msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgstr ""
+
msgid "Czech CUZK:KM"
msgstr ""
@@ -14904,6 +15033,12 @@ msgstr ""
msgid "Vejmidte (Denmark)"
msgstr ""
+msgid "imagico.de OSM images for mapping: El Altar"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgstr ""
+
msgid "Estonia Basemap (Maaamet)"
msgstr ""
@@ -14937,9 +15072,6 @@ msgstr "Cadastre"
msgid "CRAIG - Auvergne 2013 - 25 cm"
msgstr ""
-msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgstr ""
-
msgid "GrandNancy Orthophotographie 2012"
msgstr ""
@@ -14996,9 +15128,6 @@ msgid ""
"- 1 m"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
msgid "Hamburg (40 cm)"
msgstr ""
@@ -15026,9 +15155,6 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
-msgid "Stuttgart (aerial imagery)"
-msgstr ""
-
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15062,9 +15188,54 @@ msgstr ""
msgid "Metropole Ruhr: Luftbilder (10 cm)"
msgstr ""
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern German west coast tidalflats "
+"(infrared)"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
+"September 2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
+"2015"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgstr ""
+
msgid "Drone Imagery (Haiti)"
msgstr ""
+msgid ""
+"Temporary inavailable until presumably January 2017 due to a server switch."
+msgstr ""
+
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
@@ -15101,19 +15272,28 @@ msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XII ortophoto 2013"
+msgid "Budapest district XI ortophoto 2015"
+msgstr ""
+
+msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
-msgid "Interspect Budapest ortophoto 2014"
+msgid "Hillshade Hungary"
msgstr ""
-msgid "Five districts of Budapest: III, IV, XIII, XIV, XV"
+msgid "imagico.de OSM images for mapping: Eastern Iceland"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "imagico.de OSM images for mapping: Rann of Kutch"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Batam"
msgstr ""
msgid "Ireland British War Office 1:25k GSGS 3906"
@@ -15176,9 +15356,21 @@ msgstr ""
msgid "South Tyrol Orthofoto 2011"
msgstr ""
+msgid "South Tyrol Orthofoto 2011 (highres)"
+msgstr ""
+
+msgid "South Tyrol Orthofoto 2014"
+msgstr ""
+
msgid "South Tyrol Topomap"
msgstr ""
+msgid "Japan GSI ortho Imagery"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgstr ""
+
msgid "USSR - Latvia"
msgstr ""
@@ -15212,12 +15404,34 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgstr ""
+
msgid "Gaza Strip - Pléiades - 2014/07/06"
msgstr ""
msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
msgstr ""
+msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Panama Canal"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vanatinai"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: New Ireland"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Coropuna"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr ""
+
msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
@@ -15344,9 +15558,6 @@ msgstr ""
msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
msgstr ""
-msgid "trail.pl: Szlaki (paths)"
-msgstr ""
-
msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
@@ -15356,6 +15567,20 @@ msgstr ""
msgid "ScanEx SPOT"
msgstr ""
+msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgstr ""
+
+msgid ""
+"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
+"2016"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15377,12 +15602,30 @@ msgstr ""
msgid "RABA-KGZ: Slovenia built-up areas"
msgstr ""
+msgid "City of Cape Town 2013 Aerial"
+msgstr ""
+
msgid "City of Cape Town 2015 Aerial"
msgstr ""
msgid "South Africa CD:NGI Aerial"
msgstr ""
+msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Scott Island"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -15404,6 +15647,9 @@ msgstr ""
msgid "GRAFCAN Express - Canary Islands"
msgstr ""
+msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgstr ""
+
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
@@ -15446,6 +15692,9 @@ msgstr ""
msgid "Stadt Bern 10cm/25cm (2012)"
msgstr ""
+msgid "Stadt Bern 10cm (2016)"
+msgstr ""
+
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
@@ -15467,6 +15716,12 @@ msgstr ""
msgid "Fiez Orthophoto 2013"
msgstr ""
+msgid "Kanton Basel-Stadt 2015"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
+msgstr ""
+
msgid "Taiwan e-Map Open Data"
msgstr "臺灣通用版電子地圖開放資料版"
@@ -15482,6 +15737,9 @@ msgstr "臺灣國土利用調查成果圖"
msgid "NLSC Open Data WMTS"
msgstr "國土測繪中心開放資料版WMTS"
+msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgstr ""
+
msgid "MSR Maps Topo"
msgstr ""
@@ -15509,9 +15767,54 @@ msgstr ""
msgid "U.S. Forest Service roads"
msgstr ""
+msgid "imagico.de OSM images for mapping: Alaska Range"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr ""
+
+msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr ""
+
+msgid "San Juan Metro Area: 2013 USACE Orthophotos"
+msgstr ""
+
+msgid "WA 2013 aerial imagery for San Juan County"
+msgstr ""
+
+msgid "WA Vector Streetmap for San Juan County"
+msgstr ""
+
+msgid "Texas Orthophoto"
+msgstr ""
+
+msgid "Philadelphia 2015 Imagery"
+msgstr ""
+
+msgid "MD 2014 6 Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Three Inch Aerial Imagery"
+msgstr ""
+
+msgid "MD Transportation Basemap"
+msgstr ""
+
+msgid "Delaware 2012 Orthophotography"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgstr ""
+
+msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgstr ""
+
msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
+msgid "Works only from within Ukraine or with an Ukrainian proxy server."
+msgstr ""
+
msgid "Ukraine - Kyiv 2014 (DZK)"
msgstr ""
@@ -15522,10 +15825,10 @@ msgid "OS New Popular Edition historic"
msgstr ""
msgid "OS OpenData StreetView"
-msgstr ""
+msgstr "英國地形測量局開放資料街圖"
msgid "OS OpenData Locator"
-msgstr ""
+msgstr "英國地形測量局開放資料定位器"
msgid "Surrey Air Survey"
msgstr ""
@@ -15533,9 +15836,6 @@ msgstr ""
msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "NLS - OS 6-inch County Series 1888-1913"
-msgstr ""
-
msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
@@ -15545,9 +15845,6 @@ msgstr ""
msgid "NLS - OS 25-inch (Scotland) 1892-1905"
msgstr ""
-msgid "OS 1:25k historic (OSM-Best)"
-msgstr ""
-
msgid "OS 1:25k historic (OSM-Limited)"
msgstr ""
@@ -15859,7 +16156,7 @@ msgstr ""
msgid "Create a grid of ways."
msgstr "建立路徑的格線。"
-msgid "Customization of public transport stops."
+msgid "Customization of public public transport stops."
msgstr ""
msgid ""
@@ -15947,6 +16244,9 @@ msgstr "用來標記門牌號碼的簡單工具。"
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr "從多邊形產生圖片 XML 邊界"
+msgid "Export tiles from the imagery layer cache into the file system."
+msgstr ""
+
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
@@ -15999,7 +16299,7 @@ msgstr "提供 Java Topology Suite (JTS) 程式庫與相關工具。不需要由
msgid ""
"creates a channel digraph and checks a subset of channels if it is a "
"junction or searches in a subset of channels for junctions"
-msgstr ""
+msgstr "創建頻道圖並且檢查頻道的子集（如果是匯集點或在頻道的子集中搜索匯集點）"
msgid "Tools to help import Kartverket N50"
msgstr ""
@@ -16023,7 +16323,7 @@ msgid ""
msgstr ""
msgid "Allows the user to work with pictures hosted at mapillary.com"
-msgstr ""
+msgstr "Mapillary外掛"
msgid ""
"Provide a measurement dialog and a layer to measure length and angle of "
@@ -16057,7 +16357,7 @@ msgid "Import OSM data in o5m format"
msgstr ""
msgid "Convert data from Open Data portals to OSM layer"
-msgstr ""
+msgstr "轉換從開放資格平臺的資料到OSM資料層"
msgid "extended options for editing opening_hours"
msgstr "用來編輯 opening_hours 的擴充選項"
@@ -16551,7 +16851,7 @@ msgid "Motorcar"
msgstr "汽車"
msgid "Reference"
-msgstr "道路編號"
+msgstr "編號"
msgid "Operator"
msgstr "經營者"
@@ -16987,7 +17287,7 @@ msgid "Population"
msgstr "人口"
msgid "Postal Code"
-msgstr ""
+msgstr "郵遞區號"
msgid "Website"
msgstr "網站"
@@ -17452,7 +17752,7 @@ msgid "Passing Places"
msgstr ""
msgid "Residential"
-msgstr "居住的(Residential)"
+msgstr "住宅道路"
msgid "Bicycle Road"
msgstr "自行車道"
@@ -17462,7 +17762,7 @@ msgstr "公路類型"
msgctxt "Highway"
msgid "residential"
-msgstr ""
+msgstr "住宅道路"
msgctxt "Highway"
msgid "service"
@@ -17528,7 +17828,7 @@ msgid ""
msgstr ""
msgid "Raceway"
-msgstr ""
+msgstr "賽車道"
msgid "Road (Unknown Type)"
msgstr "道路（不明的類型）"
@@ -18119,19 +18419,19 @@ msgid "Traffic Mirror"
msgstr "交通鏡"
msgid "Highway milestone"
-msgstr ""
+msgstr "公路里程牌"
msgid "Distance (kilometers)"
msgstr ""
msgctxt "junction=yes"
msgid "Named Junction"
-msgstr ""
+msgstr "命名的匯集點"
msgid ""
"Used in some countries for a named road junction who’s name serves for local "
"orientation."
-msgstr ""
+msgstr "在一些國家採用匯集點名稱，當作當地導航依據"
msgid "Elevator"
msgstr "電梯"
@@ -18345,6 +18645,9 @@ msgstr "溪流"
msgid "River"
msgstr "河流"
+msgid "Lock"
+msgstr ""
+
msgid "Canal"
msgstr "運河"
@@ -18802,7 +19105,7 @@ msgid "Railway Signal"
msgstr ""
msgid "Railway milestone"
-msgstr ""
+msgstr "鐵路里程牌"
msgid "Aerialway"
msgstr "空中路線"
@@ -19231,10 +19534,10 @@ msgid "Bus"
msgstr ""
msgid "Bus stop (legacy)"
-msgstr ""
+msgstr "公車站牌 (傳統)"
msgid "Tram stop (legacy)"
-msgstr ""
+msgstr "路面電車站 (傳統)"
msgid "Train"
msgstr ""
@@ -19393,6 +19696,12 @@ msgstr "汽車旅館"
msgid "Guest House/Bed & Breakfast"
msgstr ""
+msgid "Apartment"
+msgstr ""
+
+msgid "Number of apartments"
+msgstr ""
+
msgid "Chalet"
msgstr "小木屋"
@@ -19459,6 +19768,12 @@ msgstr ""
msgid "Takeaway"
msgstr ""
+msgid "Delivery"
+msgstr ""
+
+msgid "Mo-Su 12:00-22:00"
+msgstr ""
+
msgid "Fast Food"
msgstr "速食"
@@ -20402,31 +20717,19 @@ msgstr ""
msgid "Hunting Stand"
msgstr ""
-msgid "Height"
-msgstr "高度"
-
-msgctxt "height"
-msgid "low"
-msgstr ""
-
-msgctxt "height"
-msgid "half"
-msgstr ""
-
-msgctxt "height"
-msgid "full"
-msgstr ""
-
msgctxt "hunting stand"
msgid "Hide"
msgstr ""
-msgid "Lock"
-msgstr "鎖"
+msgid "Lockable"
+msgstr ""
msgid "Water Point"
msgstr ""
+msgid "Animal watering place"
+msgstr ""
+
msgid "Compressed Air"
msgstr ""
@@ -20995,11 +21298,11 @@ msgid "Levels"
msgstr ""
msgid "Residential Building"
-msgstr "居住的建築"
+msgstr "住宅建築"
msgctxt "building"
msgid "residential"
-msgstr ""
+msgstr "住宅建築"
msgctxt "building"
msgid "apartments"
@@ -21018,6 +21321,10 @@ msgid "hut"
msgstr ""
msgctxt "building"
+msgid "bungalow"
+msgstr ""
+
+msgctxt "building"
msgid "dormitory"
msgstr ""
@@ -22311,6 +22618,9 @@ msgstr "肉類"
msgid "Seafood"
msgstr "海產"
+msgid "Dairy"
+msgstr ""
+
msgid "Deli (Fine Food)"
msgstr ""
@@ -22925,7 +23235,7 @@ msgid "Administrative level"
msgstr "行政層級"
msgid "Maritime"
-msgstr ""
+msgstr "領海"
msgid "Political"
msgstr "政治的"
@@ -22943,10 +23253,10 @@ msgid "ward"
msgstr ""
msgid "National Park"
-msgstr ""
+msgstr "國家公園"
msgid "Protected Area"
-msgstr ""
+msgstr "保護區"
msgid "Protect Class"
msgstr ""
@@ -23124,9 +23434,6 @@ msgstr "一排樹"
msgid "A line of trees."
msgstr "一排樹"
-msgid "Wood"
-msgstr "樹林"
-
msgid "Woodland where timber production does not dominate use."
msgstr ""
@@ -23385,7 +23692,7 @@ msgid "Recreation Ground"
msgstr ""
msgid "Residential Area"
-msgstr ""
+msgstr "住宅區"
msgid "Graveyard"
msgstr ""
@@ -23744,19 +24051,19 @@ msgid "administrative"
msgstr "行政區"
msgid "maritime"
-msgstr ""
+msgstr "領海"
msgid "national_park"
-msgstr ""
+msgstr "國家公園"
msgid "political"
msgstr "政治的"
msgid "postal_code"
-msgstr ""
+msgstr "郵遞區號"
msgid "protected_area"
-msgstr ""
+msgstr "保護區"
msgid "Sub area"
msgstr "子區域"
@@ -23978,13 +24285,13 @@ msgid "Colour of border/arrow"
msgstr ""
msgid "last way before junction"
-msgstr ""
+msgstr "在匯集點之前最後的路徑"
msgid "node of the intersection"
msgstr ""
msgid "first way after junction"
-msgstr ""
+msgstr "在匯集點之後第一個的路徑"
msgid "position of sign"
msgstr ""
@@ -24171,6 +24478,9 @@ msgstr ""
msgid "possibly missing {0} tag"
msgstr ""
+msgid "street with odd number of {0}, but without {1} and {2} or {3}"
+msgstr ""
+
msgid "{0} is deprecated"
msgstr "{0} 已經廢棄"
@@ -24262,6 +24572,12 @@ msgstr ""
msgid "The key {0} has an uncommon value."
msgstr ""
+msgid "misspelled value"
+msgstr ""
+
+msgid "wrong value: {0}"
+msgstr ""
+
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24338,6 +24654,11 @@ msgstr ""
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
+msgid ""
+"{0} is the tag for the linear waterway. To tag the water area use {1} + {2} "
+"instead."
+msgstr ""
+
msgid "abbreviated street name"
msgstr ""
@@ -24362,6 +24683,9 @@ msgstr ""
msgid "street name contains ss"
msgstr ""
+msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
+msgstr ""
+
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
"''{3}'' instead."
@@ -25060,10 +25384,10 @@ msgid "Error while creating image layer: "
msgstr "在建立圖片圖層時發生錯誤： "
msgid "Mapillary Images"
-msgstr ""
+msgstr "Mapillary影像"
msgid "Mapillary layer"
-msgstr ""
+msgstr "Mapillary圖層"
msgid "Total images:"
msgstr ""
@@ -25078,22 +25402,22 @@ msgid "Could not read font-file from ''{0}''"
msgstr ""
msgid "Mapillary"
-msgstr ""
+msgstr "Mapillary"
msgid "Create Mapillary layer"
-msgstr ""
+msgstr "建立Mapillary圖層"
msgid "Start Mapillary layer"
-msgstr ""
+msgstr "開始Mapillary圖層"
msgid "Download Mapillary images in current view"
-msgstr ""
+msgstr "依據目前檢視下載Mapillary影像"
msgid "Export pictures"
msgstr ""
msgid "Export Mapillary pictures"
-msgstr ""
+msgstr "匯出Mapillary圖片"
msgid "Export images"
msgstr ""
@@ -25105,7 +25429,7 @@ msgid "Import local pictures"
msgstr ""
msgid "Import pictures into Mapillary layer"
-msgstr ""
+msgstr "匯入圖片到Mapillary圖層"
msgid "Select pictures"
msgstr ""
@@ -25114,7 +25438,7 @@ msgid "Import pictures into sequence"
msgstr ""
msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
+msgstr "以序列方式匯入圖片到Mapillary圖層"
msgid "Join mode"
msgstr ""
@@ -25123,7 +25447,7 @@ msgid "Join/unjoin pictures"
msgstr ""
msgid "Join Mapillary pictures"
-msgstr ""
+msgstr "加入Mapillary圖片"
msgid "Submit changeset"
msgstr ""
@@ -25134,11 +25458,21 @@ msgstr ""
msgid "Submit the current changeset to Mapillary"
msgstr ""
+msgid "Changeset upload failed with {0} error ''{1} {2}''!"
+msgstr ""
+
+msgid ""
+"An exception occured while trying to submit a changeset. If this happens "
+"repeatedly, consider reporting a bug via the Help menu. If this message "
+"appears for the first time, simply try it again. This might have been an "
+"issue with the internet connection."
+msgstr ""
+
msgid "Upload pictures"
msgstr ""
msgid "Upload Mapillary pictures"
-msgstr ""
+msgstr "上傳Mapillary圖片"
msgid "Upload pictures."
msgstr ""
@@ -25153,7 +25487,7 @@ msgid "Zoom to selected image"
msgstr ""
msgid "Zoom to the currently selected Mapillary image"
-msgstr ""
+msgstr "縮放到目前選取的Mapiilary影像"
msgid "View in website"
msgstr ""
@@ -25176,7 +25510,7 @@ msgstr ""
msgid "Mapillary changeset"
msgstr ""
-msgid "Submit"
+msgid "Submitting changeset to server…"
msgstr ""
msgid "Export all images"
@@ -25261,7 +25595,7 @@ msgid "Choose signs"
msgstr ""
msgid "Mapillary history"
-msgstr ""
+msgstr "Mapillary歷史記錄"
msgid "Open Mapillary history dialog"
msgstr ""
@@ -26013,6 +26347,9 @@ msgstr ""
msgid "Area Selector"
msgstr ""
+msgid "Trying to detect an area at:"
+msgstr ""
+
msgid "Created area"
msgstr ""
@@ -26054,8 +26391,8 @@ msgid "Algorithm"
msgstr ""
msgid ""
-"Maximum pixels a point can be away from a line and still be considered as a "
-"member of this line (Default: {0})."
+"Maximum distance in meters between a point and the line to be considered as "
+"a member of this line (Default: {0})."
msgstr ""
msgid "Distance Tolerance"
@@ -26571,7 +26908,7 @@ msgid ""
msgstr ""
msgid "Extract commune boundary"
-msgstr ""
+msgstr "提取社區邊界"
msgid "Only on vectorized layers"
msgstr "只在向量式圖層"
@@ -27691,6 +28028,65 @@ msgstr ""
msgid "Open Imagery XML file"
msgstr ""
+msgid "Export tiles"
+msgstr ""
+
+msgid "Export cached tiles to file system."
+msgstr ""
+
+msgid "Exporting cached tiles"
+msgstr ""
+
+msgid "Failed to write image file {0}: {1}"
+msgstr ""
+
+msgid "Failed to write image file {0}."
+msgstr ""
+
+msgid "Exported {0} tile from layer {1}."
+msgid_plural "Exported {0} tiles from layer {1}."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Export file system path already exists but is not a directory."
+msgstr ""
+
+msgid "Failed to create export directory: {0}"
+msgstr ""
+
+msgid "Failed to create export directory."
+msgstr ""
+
+msgid "Append cache name"
+msgstr ""
+
+msgid "Export Tiles"
+msgstr ""
+
+msgid "Cache name:"
+msgstr ""
+
+msgid "Object count:"
+msgstr ""
+
+msgid "file system path"
+msgstr ""
+
+msgid "File system path the tiles are exported to."
+msgstr ""
+
+msgid "Export directory:"
+msgstr ""
+
+msgid "Append cache name to export directory."
+msgstr ""
+
+msgid "Tiles will be exported to directory {0}"
+msgstr ""
+
+msgid "No export directory set."
+msgstr ""
+
msgid "Calibration Layer"
msgstr ""
@@ -28121,10 +28517,10 @@ msgid ""
msgstr ""
msgid "The marked channels are a {0}-ways junction"
-msgstr ""
+msgstr "標記的頻道是 {0}- 路徑匯集點"
msgid "The marked channels are not a junction:"
-msgstr ""
+msgstr "標記的頻道並非匯集點"
msgid "construct channel digraph and search for junctions"
msgstr ""
@@ -28666,13 +29062,13 @@ msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
msgid "Download open data"
-msgstr ""
+msgstr "下載開放資料"
msgid "License URL not available: {0}"
msgstr ""
msgid "OpenData preferences"
-msgstr ""
+msgstr "開放資料插件設定"
msgid "License Agreement"
msgstr ""
@@ -28693,7 +29089,7 @@ msgid "I refuse these terms and conditions. Cancel download."
msgstr ""
msgid "Module bundled with opendata plugin"
-msgstr ""
+msgstr "模組與開放資料插件相捆"
msgid ""
"Please click on <strong>Download list</strong> to download and display a "
@@ -28746,13 +29142,13 @@ msgid "Configure the list of sites where modules are downloaded from"
msgstr "設定用來下載模組的網站清單"
msgid "Add Open Data Module description URL."
-msgstr ""
+msgstr "增加開放資料模組描述網址。"
msgid "Edit Open Data Module description URL."
-msgstr ""
+msgstr "編輯開放資料模組描述網址。"
msgid "Open Data Module description URL"
-msgstr ""
+msgstr "開放資料模組描述網址。"
msgid "Download OSM data corresponding to the current data set."
msgstr ""
@@ -28770,19 +29166,19 @@ msgid "Open tools menu for this data."
msgstr ""
msgid "Open the OpenData window."
-msgstr ""
+msgstr "開啟開放資料視窗"
msgid "Raw data"
msgstr ""
msgid "OpenData Preferences"
-msgstr ""
+msgstr "開放資料插件設定"
msgid ""
"A special handler for various Open Data portals<br/><br/>Please read the "
"Terms and Conditions of Use of each portal<br/>before any upload of data "
"loaded by this plugin."
-msgstr ""
+msgstr "不同開放資料平臺的特別檔頭。<br/>在上傳使用這個插件的資料時<br/>每一個平臺的使用條款需詳加閱讀"
msgid "General settings"
msgstr ""
@@ -28820,7 +29216,7 @@ msgid ""
msgstr ""
msgid "OpenData XML files"
-msgstr ""
+msgstr "開放資料XML檔案"
msgid "File to load"
msgstr ""
@@ -29773,7 +30169,7 @@ msgid "Printing has failed."
msgstr ""
msgid "Add stop position"
-msgstr ""
+msgstr "增加停車位置"
msgid "Repeat last fix"
msgstr ""
@@ -29855,9 +30251,6 @@ msgstr ""
msgid "PT: First or last way needs to be split"
msgstr ""
-msgid "PT: Problem in the route segment"
-msgstr ""
-
msgid "PT: Stop not served"
msgstr ""
@@ -30015,9 +30408,6 @@ msgstr ""
msgid "[gap]"
msgstr ""
-msgid " [ID] {0}"
-msgstr ""
-
msgid "Route patterns ..."
msgstr "路線模式 ..."
@@ -30034,7 +30424,7 @@ msgid "Itinerary"
msgstr "行程"
msgid "Stops"
-msgstr "停止點"
+msgstr "公車站牌"
msgid "Meta"
msgstr "中繼"
@@ -30075,6 +30465,9 @@ msgstr ""
msgid "Maximum distance from route"
msgstr ""
+msgid " [ID] {0}"
+msgstr ""
+
msgid "Public Transport: Change stop type"
msgstr ""
@@ -30132,10 +30525,10 @@ msgid "Public Transport: sort track stop list"
msgstr ""
msgid "Public Transport: Suggest stops"
-msgstr ""
+msgstr "大眾運輸：建議站牌"
msgid "Stopname"
-msgstr ""
+msgstr "站牌名稱"
msgid "Public Transport: Detach waypoints"
msgstr ""
@@ -30150,7 +30543,7 @@ msgid "Public Transport: Edit waypoint name"
msgstr ""
msgid "Distance between stops"
-msgstr ""
+msgstr "站牌之間距離"
msgid "A valid public_transport:version=2 route is required"
msgstr ""
@@ -30192,7 +30585,7 @@ msgid "Change relation member roles to {0}"
msgstr "將關係成員角色改變為 {0}"
msgid "Create administrative boundary relations"
-msgstr ""
+msgstr "新增行政邊界關係"
msgid "Add tags boundary and admin_level to boundary relation ways"
msgstr ""
@@ -30272,9 +30665,6 @@ msgstr ""
msgid "Multipolygon must consist only of ways"
msgstr ""
-msgid "Reconstruction of polygons can be done only from outer ways"
-msgstr ""
-
msgid "Reconstruct polygons from relation {0}"
msgstr ""
@@ -32284,7 +32674,7 @@ msgid ""
msgstr ""
msgid "Copy tags from previous selection"
-msgstr ""
+msgstr "從先前選取複製標籤"
msgid "Pastes tags of previously selected object(s)"
msgstr "從先前選取物件貼上標籤"
@@ -32566,16 +32956,16 @@ msgid ""
msgstr ""
msgid "Select Highway"
-msgstr ""
+msgstr "選擇道路"
msgid "Select highway for the name/ref given"
msgstr ""
msgid "Please select one or two ways for this action"
-msgstr ""
+msgstr "請為此動作選擇一至兩條路徑"
msgid "Select last modified nodes"
-msgstr ""
+msgstr "選擇前次修改的節點"
msgid "Select last modified ways"
msgstr ""
@@ -32831,20 +33221,19 @@ msgstr "複製 {0} 模板"
msgid "Overwrite ''{0}'' tag {1} from {2} with new value ''{3}''?"
msgid_plural "Overwrite ''{0}'' tags {1} from {2} with new value ''{3}''?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "自 {2} 以 ''{3}'' 這個值去覆蓋 ''{0}'' 標籤 {1} 嗎？"
msgid "Search Wikidata items"
msgstr "搜尋維基數據項目"
msgid "Target key: "
-msgstr ""
+msgstr "目標連結 "
msgid "Search Wikipedia category"
-msgstr ""
+msgstr "搜尋維基百科分類"
msgid "Load category"
-msgstr ""
+msgstr "載入分類"
msgid "Fetch Wikipedia articles with coordinates"
msgstr "獲取含有地理坐標的維基百科條目"
@@ -32864,7 +33253,7 @@ msgid "Not linked yet"
msgstr "尚未連結"
msgid "{0}: {1}"
-msgstr ""
+msgstr "{0}: {1}"
msgid "Wikidata"
msgstr "維基數據"
diff --git a/images/presets/accommodation/apartment.svg b/images/presets/accommodation/apartment.svg
new file mode 100644
index 0000000..d85b81c
--- /dev/null
+++ b/images/presets/accommodation/apartment.svg
@@ -0,0 +1,131 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.91 r13725"
+ version="1.0"
+ sodipodi:docname="14.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <pattern
+ y="0"
+ x="0"
+ height="6"
+ width="6"
+ patternUnits="userSpaceOnUse"
+ id="EMFhbasepattern" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="31.678384"
+ inkscape:cx="16.134079"
+ inkscape:cy="7.3826676"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ width="32px"
+ height="32px"
+ inkscape:window-width="1680"
+ inkscape:window-height="988"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ showgrid="true"
+ inkscape:window-maximized="1"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4160" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <cc:license
+ rdf:resource="http://web.resource.org/cc/PublicDomain" />
+ <dc:title></dc:title>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://web.resource.org/cc/PublicDomain">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-8,-8.000001)">
+ <rect
+ x="8"
+ y="8.000001"
+ width="16"
+ height="16"
+ rx="2"
+ ry="2"
+ id="shield"
+ style="fill:#ffffff;stroke:none" />
+ <g
+ id="g4264"
+ transform="matrix(1.3960228,0,0,1.4671449,9.0011285,4.4882701)"
+ style="fill:#cd9369;fill-opacity:1;stroke:#c67036;stroke-opacity:1">
+ <path
+ sodipodi:nodetypes="cccc"
+ id="path8372"
+ d="m 2.478544,11.578874 0,-8.0822 5.0753842,0 0,8.0822"
+ style="fill:#cd9369;fill-opacity:1;stroke:#c67036;stroke-width:1.03557968;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
+ <rect
+ y="4.0554256"
+ x="2.8336146"
+ height="7.4207835"
+ width="4.292532"
+ id="rect8376"
+ style="opacity:0.2;fill:#cd9369;fill-opacity:1;stroke:#c67036;stroke-width:1.10825205;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ </g>
+ <rect
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ae6230;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+ id="rect4174"
+ width="2"
+ height="1"
+ x="17"
+ y="15.000001"
+ rx="0.00049591064"
+ ry="4.6325681e-008" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4152"
+ d="M 9.59893,15.000001 C 9.224597,15.000001 9,15.224302 9,15.747664 l 0,7.252337 1.272728,0 0,-1.794396 c 0,0 10.331534,0.07478 11.454537,0 l 0,1.794396 1.272735,0 0,-2.392519 0,-3.887853 c 0,-0.29908 -0.149722,-0.747664 -0.673802,-0.747664 -0.449201,0 -0.598933,0.448598 -0.598933,0.747664 l 0,3.289715 -11.454537,0 0,-4.26168 c 0,-0.523366 -0.299479,-0.747663 -0.673798,-0.747663 z m 2.919783,0.971964 c -0.823528,0 -1.497319,0.672899 -1.497319,1.495323 0,0.822439 0.673791,1.495331 [...]
+ style="fill:#0083c3;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+ </g>
+</svg>
diff --git a/images/presets/accommodation/chalet.svg b/images/presets/accommodation/chalet.svg
index acc05fd..54de7fa 100644
--- a/images/presets/accommodation/chalet.svg
+++ b/images/presets/accommodation/chalet.svg
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -9,16 +9,57 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg831"
+ width="16"
+ height="16"
+ id="svg2"
sodipodi:version="0.32"
- width="66.032692pt"
- height="65.311539pt"
- sodipodi:docname="chalet.svg"
inkscape:version="0.91 r13725"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- version="1.1">
+ version="1.0"
+ sodipodi:docname="22.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <pattern
+ y="0"
+ x="0"
+ height="6"
+ width="6"
+ patternUnits="userSpaceOnUse"
+ id="EMFhbasepattern" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="31.678384"
+ inkscape:cx="8.8662849"
+ inkscape:cy="11.66826"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ width="32px"
+ height="32px"
+ inkscape:window-width="1680"
+ inkscape:window-height="988"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ showgrid="true"
+ inkscape:window-maximized="1"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4160" />
+ </sodipodi:namedview>
<metadata
- id="metadata2216">
+ id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
@@ -40,67 +81,48 @@
</cc:License>
</rdf:RDF>
</metadata>
- <defs
- id="defs833" />
- <sodipodi:namedview
- id="base"
- inkscape:zoom="4.3131439"
- inkscape:cx="19.414108"
- inkscape:cy="29.615847"
- inkscape:window-width="1680"
- inkscape:window-height="988"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:current-layer="svg831"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid4138"
- originx="-15.444941"
- originy="-24.440363" />
- </sodipodi:namedview>
- <rect
- style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
- id="rect4140"
- width="82.540863"
- height="81.639427"
- x="3.6975297e-007"
- y="0" />
<g
- id="g825"
- transform="matrix(0.680918,0,0,0.658159,-80.582191,-28.356326)">
- <g
- id="g815"
- transform="matrix(0.268353,0,0,0.275569,94.8544,31.97102)">
- <path
- style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
- d="m 147.599,86.2593 -15.334,13.418 21.085,23.0017 15.335,-11.501 13.418,11.501 21.086,-19.168 21.085,19.168 36.421,0 c 11.501,11.501 26.835,32.587 51.756,32.587 24.919,0 54.971,-13.533 55.589,-51.755 2.412,-36.3837 -26.837,-53.6723 -53.673,-53.6723 -26.836,1.9168 -44.088,19.1686 -53.672,36.4206 l -113.096,0 z m 210.856,16.2927 c 0,12.168 -6.441,22.044 -14.377,22.044 -7.935,0 -14.376,-9.876 -14.376,-22.044 0,-12.1677 6.441,-22.0437 14.376,-22.0437 7.936,0 14.377,9.876 14.377,22.0437 z"
- id="path808"
- sodipodi:nodetypes="cccccccccccccccccc"
- inkscape:connector-curvature="0" />
- <path
- style="font-size:12px;fill-rule:evenodd;stroke:#000000;stroke-width:0.774998pt"
- d="m 357.772,94.7983 c -4.75,5.111 -4.749,7.4347 3.166,12.5467 l 36.41,-4.183 c 3.694,-2.323 4.222,-7.4347 -3.166,-11.1517 l -36.41,2.788 z"
- id="path809"
- sodipodi:nodetypes="ccccc"
- inkscape:connector-curvature="0" />
- <path
- style="font-size:12px;fill-rule:evenodd;stroke:#000000;stroke-width:0.981394pt"
- d="m 389.251,76.8318 8.868,29.3682 16.667,-6.6617 -8.834,-27.2582 -16.701,4.5517 z m -9.995,-10.3533 14.623,58.7975 89.458,-24.987 -14.383,-58.8024 -89.698,24.9919 z"
- id="path814"
- sodipodi:nodetypes="cccccccccc"
- inkscape:connector-curvature="0" />
- </g>
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-8,-8.000001)">
+ <rect
+ x="8"
+ y="8.000001"
+ width="16"
+ height="16"
+ rx="2"
+ ry="2"
+ id="shield"
+ style="fill:#ffffff;stroke:none" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4152"
+ d="M 9.59893,15.000001 C 9.224597,15.000001 9,15.224302 9,15.747664 l 0,7.252337 1.272728,0 0,-1.794396 c 0,0 10.331534,0.07478 11.454537,0 l 0,1.794396 1.272735,0 0,-2.392519 0,-3.887853 c 0,-0.29908 -0.149722,-0.747664 -0.673802,-0.747664 -0.449201,0 -0.598933,0.448598 -0.598933,0.747664 l 0,3.289715 -11.454537,0 0,-4.26168 c 0,-0.523366 -0.299479,-0.747663 -0.673798,-0.747663 z m 2.919783,0.971964 c -0.823528,0 -1.497319,0.672899 -1.497319,1.495323 0,0.822439 0.673791,1.495331 [...]
+ style="fill:#0085c8;fill-opacity:1;fill-rule:nonzero;stroke:none" />
<path
- style="font-size:12px;fill-rule:evenodd;stroke:#000000;stroke-width:0.57346001pt"
- d="m 179.113,80.5082 -60.267,36.8048 6.027,9.2 7.232,-3.451 0,43.706 94.018,0 0,-43.706 6.845,3.336 6.027,-9.201 -59.882,-36.6888 z m -26.517,41.4048 -0.262,13.861 54.241,0 0.262,-13.861 -54.241,0 z"
- id="path824"
- sodipodi:nodetypes="ccccccccccccccc"
- inkscape:connector-curvature="0" />
+ style="fill:#a36b47;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 15,15.000001 7,0 -0.02232,-3.973214 L 23,11.000001 l 0,-1 -4.446429,-2 -4.553571,2 0,1 0.999093,-0.02524 z"
+ id="path4182"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc" />
+ <rect
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c1987d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+ id="rect4184"
+ width="2"
+ height="3"
+ x="19"
+ y="12.000001"
+ rx="2"
+ ry="4.6325681e-008" />
+ <rect
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c79e83;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;sha [...]
+ id="rect4186"
+ width="2"
+ height="2"
+ x="16"
+ y="11.000001"
+ rx="2"
+ ry="4.6325681e-008" />
</g>
</svg>
diff --git a/images/presets/accommodation/guest_house.svg b/images/presets/accommodation/guest_house.svg
index 3b145e0..6b97fc3 100644
--- a/images/presets/accommodation/guest_house.svg
+++ b/images/presets/accommodation/guest_house.svg
@@ -15,10 +15,18 @@
sodipodi:version="0.32"
inkscape:version="0.91 r13725"
version="1.0"
- sodipodi:docname="guest_house.svg"
+ sodipodi:docname="04.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
- id="defs4" />
+ id="defs4">
+ <pattern
+ y="0"
+ x="0"
+ height="6"
+ width="6"
+ patternUnits="userSpaceOnUse"
+ id="EMFhbasepattern" />
+ </defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
@@ -29,9 +37,9 @@
objecttolerance="10"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="11.2"
- inkscape:cx="-6.2994363"
- inkscape:cy="4.3181102"
+ inkscape:zoom="22.4"
+ inkscape:cx="7.4241071"
+ inkscape:cy="5.6013608"
inkscape:document-units="px"
inkscape:current-layer="layer1"
width="32px"
@@ -40,12 +48,16 @@
inkscape:window-height="988"
inkscape:window-x="-8"
inkscape:window-y="-8"
- showgrid="false"
+ showgrid="true"
inkscape:window-maximized="1"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
- fit-margin-bottom="0" />
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4160" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
@@ -75,55 +87,24 @@
id="layer1"
transform="translate(-8,-8.000001)">
<rect
- style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
- id="rect4140"
+ x="8"
+ y="8.000001"
width="16"
height="16"
- x="8"
- y="8.000001" />
+ rx="2"
+ ry="2"
+ id="shield"
+ style="fill:#ffffff;stroke:none" />
<path
- style="font-size:12px;fill:#b3b3b3;fill-rule:evenodd;stroke:#000000;stroke-width:0.03181237"
+ style="font-size:12px;fill:#c3c3c3;fill-rule:evenodd;stroke:#000000;stroke-width:0.03181237;fill-opacity:1"
d="m 16.249466,8.6436365 -5.563218,5.7098325 1.112637,0 0,8.564744 3.337938,0 0,-4.352519 2.30158,0 7e-6,4.352519 3.261638,0 0,-8.564744 1.112644,0 -5.563226,-5.7098325 0,0 0,0 z"
id="path645"
sodipodi:nodetypes="ccccccccccccc"
inkscape:connector-curvature="0" />
<path
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 9.3392857,15.160715 9.25,22.125"
- id="path2157"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 9.4285715,19.535715 22.821428,19.625"
- id="path2159"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 22.910714,21.857143 23,17.303572"
- id="path2161"
- inkscape:connector-curvature="0" />
- <rect
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.14999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect2163"
- width="7.0535712"
- height="1.25"
- x="14.696428"
- y="16.991074"
- ry="0.625" />
- <ellipse
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.47860229;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="path2167"
- cx="12.53125"
- cy="15.741072"
- rx="0.97409177"
- ry="0.86248463" />
- <rect
- style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect2169"
- width="2.7232141"
- height="0.22321428"
- x="10.544642"
- y="17.973215"
- ry="0.11160714" />
+ inkscape:connector-curvature="0"
+ id="path4152"
+ d="M 9.59893,15.000001 C 9.224597,15.000001 9,15.224302 9,15.747664 l 0,7.252337 1.272728,0 0,-1.794396 c 0,0 10.331534,0.07478 11.454537,0 l 0,1.794396 1.272735,0 0,-2.392519 0,-3.887853 c 0,-0.29908 -0.149722,-0.747664 -0.673802,-0.747664 -0.449201,0 -0.598933,0.448598 -0.598933,0.747664 l 0,3.289715 -11.454537,0 0,-4.26168 c 0,-0.523366 -0.299479,-0.747663 -0.673798,-0.747663 z m 2.919783,0.971964 c -0.823528,0 -1.497319,0.672899 -1.497319,1.495323 0,0.822439 0.673791,1.495331 [...]
+ style="fill:#007ebc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
</g>
</svg>
diff --git a/images/presets/misc/watering_place.svg b/images/presets/misc/watering_place.svg
new file mode 100644
index 0000000..b590181
--- /dev/null
+++ b/images/presets/misc/watering_place.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.1"
+ id="Ebene_2"
+ x="0px"
+ y="0px"
+ width="16"
+ height="11"
+ viewBox="0 0 16 11"
+ enable-background="new 0 0 16 11"
+ xml:space="preserve"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="02.svg"><metadata
+ id="metadata19"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs17">
+</defs>
+<polygon
+ style="fill:#666666"
+ id="polygon5"
+ points="19,6 16.942,9.3 12.828,9.3 10.771,6 12.144,6 "
+ transform="matrix(0.88888889,0,0,1,-0.88888889,-6)" /><polygon
+ style="fill:#734a08"
+ id="polygon7"
+ points="1,13.7 10.872,6 19,6 9.229,13.7 "
+ transform="matrix(0.88888889,0,0,1,-0.88888889,-6)" /><polygon
+ style="fill:#0092da"
+ id="polygon9"
+ points="10.558,7.386 15.76,7.386 9.506,12.313 4.24,12.313 "
+ transform="matrix(0.83947215,0,0,1,-0.11008101,-6)" /><polygon
+ style="fill:#734a08"
+ id="polygon11"
+ points="9.229,13.7 7.171,17 3.057,17 1,13.7 2.372,13.7 "
+ transform="matrix(0.88888889,0,0,1,-0.88888889,-6)" /><polyline
+ style="fill:#734a08"
+ id="polyline13"
+ points="7.171,17 16.942,9.3 19,6 9.229,13.7 "
+ transform="matrix(0.88888889,0,0,1,-0.88888889,-6)" />
+</svg>
\ No newline at end of file
diff --git a/images/presets/shop/groceries/dairy.svg b/images/presets/shop/groceries/dairy.svg
new file mode 100644
index 0000000..2b7dc23
--- /dev/null
+++ b/images/presets/shop/groceries/dairy.svg
@@ -0,0 +1,101 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2"
+ xml:space="preserve"
+ viewBox="0 0 7 16"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="02.svg"
+ width="7"
+ height="16"><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1680"
+ inkscape:window-height="988"
+ id="namedview135"
+ showgrid="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:zoom="32.000002"
+ inkscape:cx="2.7522437"
+ inkscape:cy="8.8105878"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2"><inkscape:grid
+ type="xygrid"
+ id="grid4151"
+ originx="-3.8384907e-009"
+ originy="-9.0541047e-007" /></sodipodi:namedview><defs
+ id="defs6"><clipPath
+ id="clipPath136"><path
+ id="path138"
+ d="m 7,-0.48208 18,0 0,32 -18,0 0,-32 z"
+ inkscape:connector-curvature="0" /></clipPath><mask
+ id="mask140"><g
+ id="g142"><g
+ id="g144"
+ clip-path="url(#clipPath136)"><path
+ id="path146"
+ style="fill:#000000;fill-opacity:0.19140003"
+ d="m 7,-0.48208 18,0 0,32 -18,0 0,-32 z"
+ inkscape:connector-curvature="0" /></g></g></mask><clipPath
+ id="clipPath152"><path
+ id="path154"
+ d="m 7,-0.48208 18,0 0,32 -18,0 0,-32 z"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ id="clipPath156"><path
+ id="path158"
+ d="M 7,0 25,0 25,32 7,32 7,0 Z"
+ inkscape:connector-curvature="0" /></clipPath></defs><path
+ style="fill:#ac39ac;fill-opacity:1;fill-rule:evenodd"
+ d="M 5.3631235,0.00774818 1.5401075,1.1827408e-6 C 1.3973465,-2.8781726e-4 1.2801525,0.05240118 1.1870195,0.14087718 c -0.109654,0.08523 -0.170769,0.272815 -0.173665,0.424574 -0.0032,0.168207 0.05486,0.352497 0.174409,0.47687802 0.08542,0.08887 0.205432,0.154175 0.346398,0.149328 l 0.08325,0 c 0.0044,0.131856 0.0026,0.268998 -0.01264,0.417696 -0.03895,0.485996 -0.169381,0.846752 -0.392486,1.087561 -0.71158374,0.820981 -1.09851424,1.666133 -1.16035824,2.533649 -0.061996,0.815672 -0.0 [...]
+ id="path58"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sscaaccccccsscccccacccassccasccccaacc" /><g
+ id="g132"
+ style="fill:#800080"
+ transform="matrix(1.0961218,-0.60084682,-0.60084682,-1.0961218,9.5481161,18.541016)"><g
+ id="g148"
+ mask="url(#mask140)"
+ style="fill:#800080"><g
+ id="g160"
+ style="fill:#800080"><g
+ id="g162"
+ clip-path="url(#clipPath152)"
+ style="fill:#800080"><g
+ id="g164"
+ transform="translate(0,-0.48208)"
+ style="fill:#800080"><g
+ id="g168"
+ style="fill:#800080"><g
+ id="g170"
+ clip-path="url(#clipPath156)"
+ style="fill:#800080"><g
+ id="g172"
+ style="fill:#800080" /></g></g></g></g></g></g></g><metadata
+ id="metadata133"><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/publicdomain/zero/1.0/" /><dc:publisher><cc:Agent
+ rdf:about="http://openclipart.org/"><dc:title /></cc:Agent></dc:publisher><dc:title></dc:title></cc:Work><cc:License
+ rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"><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></svg>
\ No newline at end of file
diff --git a/linux/latest/usr/share/man/man1/josm-latest.1 b/linux/latest/usr/share/man/man1/josm-latest.1
index 8447fbb..8be6d5c 100644
--- a/linux/latest/usr/share/man/man1/josm-latest.1
+++ b/linux/latest/usr/share/man/man1/josm-latest.1
@@ -61,6 +61,19 @@ Print debugging messages to console
.TP
.B \-\-offline=<osm_api|josm_website|all>
Disable access to the given resource(s), separated by comma
+.SH FILES
+JOSM files are saved according to the XDG Base Directory Specification:
+.TP
+.B $HOME/.config/JOSM-latest
+Preferences
+.TP
+.B $HOME/.local/share/JOSM-latest
+User data
+.TP
+.B $HOME/.cache/JOSM-latest
+Cache
+.TP
+If the directory $HOME/.josm-latest exists, all files are stored there.
.SH JAVA PROPERTIES
The following options can be set by using Java system properties (i.e. \-Dkey=value
passed to java, or specified inside JAVA_OPTS).
@@ -75,8 +88,10 @@ Set the JOSM user data directory.
Set the JOSM cache directory.
.TP
.B josm.home=<homedir>
-Relocate all 3 directories to homedir. Cache directory will be in homedir/cache.
-Default is ~/.josm/.
+Relocate all 3 directories to homedir. Cache directory will be in <homedir>/cache.
+.TP
+.B josm.name=<JOSM-latest>
+Change the JOSM directory name.
.SH ENVIRONMENT
.IP JAVA_HOME
Specify an alternate Java environment.
diff --git a/linux/tested/usr/share/man/man1/josm.1 b/linux/tested/usr/share/man/man1/josm.1
index 2c8b0da..d0d67f5 100644
--- a/linux/tested/usr/share/man/man1/josm.1
+++ b/linux/tested/usr/share/man/man1/josm.1
@@ -61,6 +61,19 @@ Print debugging messages to console
.TP
.B \-\-offline=<osm_api|josm_website|all>
Disable access to the given resource(s), separated by comma
+.SH FILES
+JOSM files are saved according to the XDG Base Directory Specification:
+.TP
+.B $HOME/.config/JOSM
+Preferences
+.TP
+.B $HOME/.local/share/JOSM
+User data
+.TP
+.B $HOME/.cache/JOSM
+Cache
+.TP
+If the directory $HOME/.josm exists, all files are stored there.
.SH JAVA PROPERTIES
The following options can be set by using Java system properties (i.e. \-Dkey=value
passed to java, or specified inside JAVA_OPTS).
@@ -75,8 +88,10 @@ Set the JOSM user data directory.
Set the JOSM cache directory.
.TP
.B josm.home=<homedir>
-Relocate all 3 directories to homedir. Cache directory will be in homedir/cache.
-Default is ~/.josm/.
+Relocate all 3 directories to homedir. Cache directory will be in <homedir>/cache.
+.TP
+.B josm.name=<JOSM>
+Change the JOSM directory name.
.SH ENVIRONMENT
.IP JAVA_HOME
Specify an alternate Java environment.
diff --git a/netbeans/nbproject/project.properties b/netbeans/nbproject/project.properties
index 1c5a22f..c7ace5c 100644
--- a/netbeans/nbproject/project.properties
+++ b/netbeans/nbproject/project.properties
@@ -36,7 +36,7 @@ file.reference.commons-lang-2.6.jar=../test/lib/unitils-core/commons-lang-2.6.ja
file.reference.commons-logging-1.1.3.jar=../test/lib/unitils-core/commons-logging-1.1.3.jar
file.reference.core-src=../src
file.reference.debug-1.0.jar=../test/lib/fest/debug-1.0.jar
-file.reference.equalsverifier-2.1.5.jar=../test/lib/equalsverifier-2.1.5.jar
+file.reference.equalsverifier-2.1.8.jar=../test/lib/equalsverifier-2.1.8.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
@@ -69,8 +69,8 @@ javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
${file.reference.junit-4.12.jar}:\
- ${file.reference.equalsverifier-2.1.5.jar}:\
${file.reference.jfcunit.jar}:\
+ ${file.reference.equalsverifier-2.1.8.jar}:\
${file.reference.hamcrest-core-1.3.jar}:\
${file.reference.MRJToolkitStubs-1.0.jar}:\
${file.reference.debug-1.0.jar}:\
diff --git a/scripts/BuildProjectionDefinitions.java b/scripts/BuildProjectionDefinitions.java
index 0a47b23..b3591cc 100644
--- a/scripts/BuildProjectionDefinitions.java
+++ b/scripts/BuildProjectionDefinitions.java
@@ -62,11 +62,12 @@ public class BuildProjectionDefinitions {
epsgProj4.put(pd.code, pd);
}
- try (BufferedWriter out = new BufferedWriter(new OutputStreamWriter(
- new FileOutputStream(baseDir + File.separator + OUTPUT_EPSG_FILE), StandardCharsets.UTF_8))) {
+ try (FileOutputStream output = new FileOutputStream(baseDir + File.separator + OUTPUT_EPSG_FILE);
+ BufferedWriter out = new BufferedWriter(new OutputStreamWriter(output, StandardCharsets.UTF_8))) {
out.write("## This file is autogenerated, do not edit!\n");
out.write("## Run ant task \"epsg\" to rebuild.\n");
- out.write(String.format("## Source files are %s (can be changed) and %s (copied from the proj.4 project).%n", JOSM_EPSG_FILE, PROJ4_EPSG_FILE));
+ out.write(String.format("## Source files are %s (can be changed) and %s (copied from the proj.4 project).%n",
+ JOSM_EPSG_FILE, PROJ4_EPSG_FILE));
out.write("##\n");
out.write("## Entries checked and maintained by the JOSM team:\n");
for (ProjectionDefinition pd : epsgJosm.values()) {
diff --git a/scripts/SyncEditorImageryIndex.groovy b/scripts/SyncEditorImageryIndex.groovy
index dc485d2..06ca8f8 100644
--- a/scripts/SyncEditorImageryIndex.groovy
+++ b/scripts/SyncEditorImageryIndex.groovy
@@ -12,7 +12,7 @@
*
* Main JOSM binary needs to be in classpath, e.g.
*
- * $ groovy -cp ../dist/josm-custom.jar sync_editor-imagery-index.groovy
+ * $ groovy -cp ../dist/josm-custom.jar SyncEditorImageryIndex.groovy
*
* Add option "-h" to show the available command line flags.
*/
@@ -20,8 +20,10 @@ import javax.json.Json
import javax.json.JsonArray
import javax.json.JsonObject
import javax.json.JsonReader
+import javax.json.JsonValue
import org.openstreetmap.josm.data.imagery.ImageryInfo
+import org.openstreetmap.josm.data.imagery.Shape
import org.openstreetmap.josm.io.imagery.ImageryReader
class SyncEditorImageryIndex {
@@ -31,13 +33,17 @@ class SyncEditorImageryIndex {
def eiiUrls = new HashMap<String, JsonObject>()
def josmUrls = new HashMap<String, ImageryInfo>()
+ def josmMirrors = new HashMap<String, ImageryInfo>()
- static String eiiInputFile = 'imagery.json'
+ static String eiiInputFile = 'imagery.geojson'
static String josmInputFile = 'maps.xml'
+ static String ignoreInputFile = 'maps_ignores.txt'
static FileWriter outputFile = null
static BufferedWriter outputStream = null
int skipCount = 0;
+ String skipColor = "greenyellow" // should never be visible
def skipEntries = [:]
+ def skipColors = [:]
static def options
@@ -70,6 +76,7 @@ class SyncEditorImageryIndex {
cli.o(longOpt:'output', args:1, argName: "output", "Output file, - prints to stdout (default: -)")
cli.e(longOpt:'eii_input', args:1, argName:"eii_input", "Input file for the editor imagery index (json). Default is $eiiInputFile (current directory).")
cli.j(longOpt:'josm_input', args:1, argName:"josm_input", "Input file for the JOSM imagery list (xml). Default is $josmInputFile (current directory).")
+ cli.i(longOpt:'ignore_input', args:1, argName:"ignore_input", "Input file for the ignore list. Default is $ignoreInputFile (current directory).")
cli.s(longOpt:'shorten', "shorten the output, so it is easier to read in a console window")
cli.n(longOpt:'noskip', argName:"noskip", "don't skip known entries")
cli.x(longOpt:'xhtmlbody', argName:"xhtmlbody", "create XHTML body for display in a web page")
@@ -88,6 +95,9 @@ class SyncEditorImageryIndex {
if (options.josm_input) {
josmInputFile = options.josm_input
}
+ if (options.ignore_input) {
+ ignoreInputFile = options.ignore_input
+ }
if (options.output && options.output != "-") {
outputFile = new FileWriter(options.output)
outputStream = new BufferedWriter(outputFile)
@@ -95,75 +105,21 @@ class SyncEditorImageryIndex {
}
void loadSkip() {
- /* TMS proxies for our wms */
- skipEntries["- [CH] Stadt Zürich Luftbild 2011 - http://mapproxy.sosm.ch:8080/tiles/zh_luftbild2011/EPSG900913/{z}/{x}/{y}.png?origin=nw"] = 1
- skipEntries["- [CH] Übersichtsplan Zürich - http://mapproxy.sosm.ch:8080/tiles/zh_uebersichtsplan/EPSG900913/{zoom}/{x}/{y}.png?origin=nw"] = 1
- skipEntries["- [CH] Kanton Solothurn 25cm (SOGIS 2011-2014) - http://mapproxy.osm.ch:8080/tiles/sogis2014/EPSG900913/{z}/{x}/{y}.png?origin=nw"] = 1
- /* URL style mismatch */
- skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://{switch:a,b,c,d}.tile.stamen.com/terrain-background/{z}/{x}/{y}.jpg"] = 1
- skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://whoots.mapwarper.net/tms/{z}/{x}/{y}/MD_SixInchImagery/http://geodata.md.gov/imap/services/Imagery/MD_SixInchImagery/MapServer/WmsServer"] = 1
- skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://whoots.mapwarper.net/tms/{z}/{x}/{y}/Infrared2015/http://geodata.state.nj.us/imagerywms/Infrared2015"] = 1
- skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://whoots.mapwarper.net/tms/{z}/{x}/{y}/Natural2015/http://geodata.state.nj.us/imagerywms/Natural2015"] = 1
- skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://cyberjapandata.gsi.go.jp/xyz/ort/{z}/{x}/{y}.jpg"] = 1
- skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://tms.cadastre.openstreetmap.fr/*/tout/{z}/{x}/{y}.png"] = 1
- skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://mapproxy.osm.ch:8080/tiles/AGIS2014/EPSG900913/{z}/{x}/{y}.png?origin=nw"] = 1
- skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://mapproxy.osm.ch:8080/tiles/sogis2014/EPSG900913/{z}/{x}/{y}.png?origin=nw"] = 1
- skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://mapproxy.openmap.lt/ort10lt/g/{z}/{x}/{y}.jpeg"] = 1
- skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://mapproxy.sosm.ch:8080/tiles/zh_luftbild2011/EPSG900913/{z}/{x}/{y}.png?origin=nw"] = 1
- skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://mapproxy.openmap.lt/ort10lt/g/{z}/{x}/{y}.jpeg"] = 1
- skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://mapproxy.osm.ch:8080/tiles/KTZUERICH2015/EPSG900913/{z}/{x}/{y}.png?origin=nw"] = 1
- skipEntries["+++ EII-URL uses {z} instead of {zoom}: http://geoservices.buergernetz.bz.it/geoserver/gwc/service/wmts/?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=P_BZ_BASEMAP_TOPO&STYLE=default&TILEMATRIXSET=GoogleMapsCompatible&TILEMATRIX=GoogleMapsCompatible%3A{z}&TILEROW={y}&TILECOL={x}&FORMAT=image%2Fjpeg"] = 1
+ FileReader fr = new FileReader(ignoreInputFile)
+ def line
- skipEntries["+++ EII-URL is not unique: http://geolittoral.application.equipement.gouv.fr/wms/metropole?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=ortholittorale&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 1
- skipEntries["- OpenStreetMap (German Language) - http://toolserver.org/tiles/osm-locale-de/{zoom}/{x}/{y}.png"] = 1
- skipEntries["- OpenStreetMap (Sorbian Language) - http://toolserver.org/tiles/osm-locale-hsb/{zoom}/{x}/{y}.png"] = 1
- skipEntries["- OpenStreetMap (Standard Black & White) - http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png"] = 1
- skipEntries["- OpenStreetMap (Standard) - http://{switch:a,b,c}.tile.openstreetmap.org/{zoom}/{x}/{y}.png"] = 1
- skipEntries["- Streets NRW Geofabrik.de - http://tools.geofabrik.de/osmi/view/strassennrw/wxs?REQUEST=GetMap&SERVICE=wms&VERSION=1.1.1&FORMAT=image/png&SRS={proj}&STYLES=&LAYERS=unzugeordnete_strassen,kreisstrassen_ast,kreisstrassen,landesstrassen_ast,landesstrassen,bundesstrassen_ast,bundesstrassen,autobahnen_ast,autobahnen,endpunkte&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 1
- skipEntries["- [CH] Kanton Solothurn 25cm (SOGIS 2011-2014) - http://www.sogis1.so.ch/cgi-bin/sogis/sogis_orthofoto.wms?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS=Orthofoto_SO&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 1
- skipEntries["- [CH] Kanton Solothurn Infrarot 12.5cm (SOGIS 2011) - http://www.sogis1.so.ch/cgi-bin/sogis/sogis_ortho.wms?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Orthofoto11_CIR&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 1
- skipEntries["- [CH] Stadt Bern 10cm/25cm (2008) - http://map.bern.ch/arcgis/services/Orthofoto_2008/MapServer/WMSServer?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=0,1&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 1
- skipEntries["- [CZ] Czech CUZK:KM tiles proxy - http://osm-{switch:a,b,c}.zby.cz/tiles_cuzk.php/{zoom}/{x}/{y}.png"] = 1
- skipEntries["- [CZ] Czech UHUL:ORTOFOTO - http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS={proj}&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 1
- skipEntries["- [CZ] Czech ÚHUL:ORTOFOTO tiles proxy - http://osm-{switch:a,b,c}.zby.cz/tiles_uhul.php/{zoom}/{x}/{y}.jpg"] = 1
- skipEntries["- [DE] Hamburg (40 cm) - http://gateway.hamburg.de/OGCFassade/HH_WMS_DOP40.aspx?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS=0&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 1
- skipEntries["- [DE] Hamburg (DK5) - http://gateway.hamburg.de/OGCFassade/HH_WMS_Geobasisdaten.aspx?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS=1&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 1
- skipEntries["- [EE] Estonia Basemap (Maaamet) - http://kaart.maaamet.ee/wms/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 1
- skipEntries["- [EE] Estonia Forestry (Maaamet) - http://kaart.maaamet.ee/wms/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=cir_ngr&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 1
- skipEntries["- [EE] Estonia Hillshading (Maaamet) - http://kaart.maaamet.ee/wms/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=reljeef&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 1
- skipEntries["- [EE] Estonia Ortho (Maaamet) - http://kaart.maaamet.ee/wms/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&SRS={proj}&FORMAT=image/jpeg&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 1
- skipEntries[" name differs: http://wms.openstreetmap.fr/tms/1.0.0/tours_2013/{zoom}/{x}/{y}"] = 3
- skipEntries[" name differs: http://wms.openstreetmap.fr/tms/1.0.0/tours/{zoom}/{x}/{y}"] = 3
- skipEntries[" name differs: https://secure.erlangen.de/arcgiser/services/Luftbilder2011/MapServer/WmsServer?FORMAT=image/bmp&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS=Erlangen_ratio10_5cm_gk4.jp2&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 3
- skipEntries[" name differs: http://wms.openstreetmap.fr/tms/1.0.0/iomhaiti/{zoom}/{x}/{y}"] = 3
- skipEntries[" name differs: http://{switch:a,b,c}.layers.openstreetmap.fr/bano/{zoom}/{x}/{y}.png"] = 3
- skipEntries[" name differs: http://ooc.openstreetmap.org/os1/{zoom}/{x}/{y}.jpg"] = 3
- skipEntries[" name differs: http://www.gisnet.lv/cgi-bin/osm_latvia?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=piekraste&SRS={proj}&WIDTH={width}&height={height}&BBOX={bbox}"] = 3
- skipEntries[" name differs: http://tms.cadastre.openstreetmap.fr/*/tout/{zoom}/{x}/{y}.png"] = 3
- skipEntries[" name differs: http://{switch:a,b,c}.tiles.mapbox.com/v4/enf.e0b8291e/{zoom}/{x}/{y}.png?access_token=pk.eyJ1Ijoib3BlbnN0cmVldG1hcCIsImEiOiJhNVlHd29ZIn0.ti6wATGDWOmCnCYen-Ip7Q"] = 3
- skipEntries[" name differs: http://geo.nls.uk/mapdata2/os/25_inch/scotland_1/{zoom}/{x}/{y}.png"] = 3
- skipEntries[" name differs: http://geo.nls.uk/mapdata3/os/6_inch_gb_1900/{zoom}/{x}/{y}.png"] = 3
- skipEntries[" name differs: http://geoserver.infobex.hu/Budapest2014/IST/{zoom}/{x}/{y}.jpg"] = 3
- skipEntries[" name differs: http://mapproxy.openmap.lt/ort10lt/g/{zoom}/{x}/{y}.jpeg"] = 3
- skipEntries[" name differs: http://e.tile.openstreetmap.hu/ortofoto2000/{zoom}/{x}/{y}.jpg"] = 3
- skipEntries[" name differs: http://tools.geofabrik.de/osmi/tiles/routing/{zoom}/{x}/{y}.png"] = 3
- skipEntries[" name differs: http://e.tile.openstreetmap.hu/ortofoto2005/{zoom}/{x}/{y}.jpg"] = 3
- skipEntries[" name differs: http://gis3.stuttgart.de/wss/service/wms_Luftbilder2011_jpg_internet/guest?FORMAT=image/jpeg&VERSION=1.3.0&SERVICE=WMS&REQUEST=GetMap&Layers=0,1,2,3,4,5,6,7,8&STYLES=default,default,default,default,default,default,default,default,default&CRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 3
- skipEntries[" name differs: https://secure.erlangen.de/arcgiser/services/Luftbilder2013/MapServer/WmsServer?FORMAT=image/bmp&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS=Erlangen_ratio5_6.25cm.jp2&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 3
- skipEntries[" name differs: http://tools.geofabrik.de/osmi/tiles/addresses/{zoom}/{x}/{y}.png"] = 3
- skipEntries[" name differs: http://{switch:a,b,c}.gps-tile.openstreetmap.org/lines/{zoom}/{x}/{y}.png"] = 3
- skipEntries[" maxzoom differs: [DE] Bavaria (2 m) - http://geodaten.bayern.de/ogc/ogc_dop200_oa.cgi?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=adv_dop200c&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"] = 3
- skipEntries[" minzoom differs: [AU] LPI NSW Administrative Boundaries County - http://maps.six.nsw.gov.au/arcgis/services/public/NSW_Administrative_Boundaries/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS={proj}&BBOX={bbox}&WIDTH={width}&HEIGHT={height}&LAYERS=County&STYLES=&FORMAT=image/png32&DPI=96&MAP_RESOLUTION=96&FORMAT_OPTIONS=dpi:96&TRANSPARENT=TRUE"] = 3
- skipEntries[" minzoom differs: [AU] LPI NSW Administrative Boundaries NPWS Reserve - http://maps.six.nsw.gov.au/arcgis/services/public/NSW_Administrative_Boundaries/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS={proj}&BBOX={bbox}&WIDTH={width}&HEIGHT={height}&LAYERS=NPWSReserve&STYLES=&FORMAT=image/png32&DPI=96&MAP_RESOLUTION=96&FORMAT_OPTIONS=dpi:96&TRANSPARENT=TRUE"] = 3
- skipEntries[" minzoom differs: [AU] LPI NSW Administrative Boundaries Parish - http://maps.six.nsw.gov.au/arcgis/services/public/NSW_Administrative_Boundaries/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS={proj}&BBOX={bbox}&WIDTH={width}&HEIGHT={height}&LAYERS=Parish&STYLES=&FORMAT=image/png32&DPI=96&MAP_RESOLUTION=96&FORMAT_OPTIONS=dpi:96&TRANSPARENT=TRUE"] = 3
- skipEntries[" minzoom differs: [AU] LPI NSW Administrative Boundaries Suburb - http://maps.six.nsw.gov.au/arcgis/services/public/NSW_Administrative_Boundaries/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS={proj}&BBOX={bbox}&WIDTH={width}&HEIGHT={height}&LAYERS=Suburb&STYLES=&FORMAT=image/png32&DPI=96&MAP_RESOLUTION=96&FORMAT_OPTIONS=dpi:96&TRANSPARENT=TRUE"] = 3
- skipEntries[" minzoom differs: [AU] LPI NSW Imagery - http://maps.six.nsw.gov.au/arcgis/rest/services/public/NSW_Imagery/MapServer/tile/{zoom}/{y}/{x}"] = 3
- skipEntries[" minzoom differs: [AU] LPI NSW Topographic Map - http://maps.six.nsw.gov.au/arcgis/rest/services/public/NSW_Topo_Map/MapServer/tile/{zoom}/{y}/{x}"] = 3
- skipEntries[" minzoom differs: [AU] LPI NSW Administrative Boundaries State Forest - http://maps.six.nsw.gov.au/arcgis/services/public/NSW_Administrative_Boundaries/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS={proj}&BBOX={bbox}&WIDTH={width}&HEIGHT={height}&LAYERS=StateForest&STYLES=&FORMAT=image/png32&DPI=96&MAP_RESOLUTION=96&FORMAT_OPTIONS=dpi:96&TRANSPARENT=TRUE"] = 3
- skipEntries[" minzoom differs: [AU] LPI NSW Administrative Boundaries LGA - http://maps.six.nsw.gov.au/arcgis/services/public/NSW_Administrative_Boundaries/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS={proj}&BBOX={bbox}&WIDTH={width}&HEIGHT={height}&LAYERS=LocalGovernmentArea&STYLES=&FORMAT=image/png32&DPI=96&MAP_RESOLUTION=96&FORMAT_OPTIONS=dpi:96&TRANSPARENT=TRUE"] = 3
- skipEntries[" minzoom differs: [AU] LPI NSW Base Map - http://maps.six.nsw.gov.au/arcgis/rest/services/public/NSW_Base_Map/MapServer/tile/{zoom}/{y}/{x}"] = 3
- skipEntries[" country code differs: [EU] OSM Inspector: Boundaries (EU) - http://tools.geofabrik.de/osmi/tiles/boundaries/{zoom}/{x}/{y}.png"] = 3
- skipEntries[" country code differs: [TH] Cambodia, Laos, Thailand, Vietnam bilingual - http://{switch:a,b,c,d}.tile.osm-tools.org/osm_then/{zoom}/{x}/{y}.png"] = 3
+ while((line = fr.readLine()) != null) {
+ def res = (line =~ /^\|\| *(\d) *\|\| *(EII|Ignore) *\|\| *\{\{\{(.+)\}\}\} *\|\|/)
+ if(res.count)
+ {
+ skipEntries[res[0][3]] = res[0][1] as int
+ if(res[0][2].equals("Ignore")) {
+ skipColors[res[0][3]] = "green"
+ } else {
+ skipColors[res[0][3]] = "darkgoldenrod"
+ }
+ }
+ }
}
void myprintlnfinal(String s) {
@@ -179,17 +135,22 @@ class SyncEditorImageryIndex {
if(skipEntries.containsKey(s)) {
skipCount = skipEntries.get(s)
skipEntries.remove(s)
+ if(skipColors.containsKey(s)) {
+ skipColor = skipColors.get(s)
+ } else {
+ skipColor = "greenyellow"
+ }
}
if(skipCount) {
skipCount -= 1;
if(options.xhtmlbody || options.xhtml) {
- s = "<pre style=\"margin:3px;color:green\">"+s.replaceAll("&","&").replaceAll("<","<").replaceAll(">",">")+"</pre>"
+ s = "<pre style=\"margin:3px;color:"+skipColor+"\">"+s.replaceAll("&","&").replaceAll("<","<").replaceAll(">",">")+"</pre>"
}
if (!options.noskip) {
return;
}
} else if(options.xhtmlbody || options.xhtml) {
- String color = s.startsWith("***") ? "black" : (s.startsWith("+ ") ? "blue" : "red")
+ String color = s.startsWith("***") ? "black" : ((s.startsWith("+ ") || s.startsWith("+++ EII")) ? "blue" : "red")
s = "<pre style=\"margin:3px;color:"+color+"\">"+s.replaceAll("&","&").replaceAll("<","<").replaceAll(">",">")+"</pre>"
}
myprintlnfinal(s)
@@ -214,7 +175,7 @@ class SyncEditorImageryIndex {
void loadEIIEntries() {
FileReader fr = new FileReader(eiiInputFile)
JsonReader jr = Json.createReader(fr)
- eiiEntries = jr.readArray()
+ eiiEntries = jr.readObject().get("features")
jr.close()
for (def e : eiiEntries) {
@@ -245,14 +206,15 @@ class SyncEditorImageryIndex {
if (josmUrls.containsKey(url)) {
myprintln "+++ JOSM-URL is not unique: "+url
} else {
- josmUrls.put(url, e)
+ josmUrls.put(url, e)
}
for (def m : e.getMirrors()) {
url = getUrl(m)
if (josmUrls.containsKey(url)) {
myprintln "+++ JOSM-Mirror-URL is not unique: "+url
} else {
- josmUrls.put(url, m)
+ josmUrls.put(url, m)
+ josmMirrors.put(url, m)
}
}
}
@@ -274,8 +236,9 @@ class SyncEditorImageryIndex {
def l1 = inOneButNotTheOther(eiiUrls, josmUrls)
myprintln "*** URLs found in EII but not in JOSM (${l1.size()}): ***"
if (!l1.isEmpty()) {
- for (def l : l1)
- myprintln "-"+l
+ for (def l : l1) {
+ myprintln "-" + l
+ }
}
if (options.nomissingeii)
@@ -283,8 +246,9 @@ class SyncEditorImageryIndex {
def l2 = inOneButNotTheOther(josmUrls, eiiUrls)
myprintln "*** URLs found in JOSM but not in EII (${l2.size()}): ***"
if (!l2.isEmpty()) {
- for (def l : l2)
+ for (def l : l2) {
myprintln "+" + l
+ }
}
}
@@ -296,7 +260,7 @@ class SyncEditorImageryIndex {
def j = josmUrls.get(url)
if (!getName(e).equals(getName(j))) {
myprintln " name differs: $url"
- myprintln " (IEE): ${getName(e)}"
+ myprintln " (EII): ${getName(e)}"
myprintln " (JOSM): ${getName(j)}"
}
}
@@ -308,7 +272,7 @@ class SyncEditorImageryIndex {
def j = josmUrls.get(url)
if (!getType(e).equals(getType(j))) {
myprintln " type differs: ${getName(j)} - $url"
- myprintln " (IEE): ${getType(e)}"
+ myprintln " (EII): ${getType(e)}"
myprintln " (JOSM): ${getType(j)}"
}
}
@@ -323,14 +287,14 @@ class SyncEditorImageryIndex {
Integer jMinZoom = getMinZoom(j)
if (eMinZoom != jMinZoom && !(eMinZoom == 0 && jMinZoom == null)) {
myprintln " minzoom differs: ${getDescription(j)}"
- myprintln " (IEE): ${eMinZoom}"
+ myprintln " (EII): ${eMinZoom}"
myprintln " (JOSM): ${jMinZoom}"
}
Integer eMaxZoom = getMaxZoom(e)
Integer jMaxZoom = getMaxZoom(j)
if (eMaxZoom != jMaxZoom) {
myprintln " maxzoom differs: ${getDescription(j)}"
- myprintln " (IEE): ${eMaxZoom}"
+ myprintln " (EII): ${eMaxZoom}"
myprintln " (JOSM): ${jMaxZoom}"
}
}
@@ -342,7 +306,7 @@ class SyncEditorImageryIndex {
def j = josmUrls.get(url)
if (!getCountryCode(e).equals(getCountryCode(j))) {
myprintln " country code differs: ${getDescription(j)}"
- myprintln " (IEE): ${getCountryCode(e)}"
+ myprintln " (EII): ${getCountryCode(e)}"
myprintln " (JOSM): ${getCountryCode(j)}"
}
}
@@ -359,10 +323,125 @@ class SyncEditorImageryIndex {
def j = josmUrls.get(url)
if (!getQuality(e).equals(getQuality(j))) {
myprintln " quality differs: ${getDescription(j)}"
- myprintln " (IEE): ${getQuality(e)}"
+ myprintln " (EII): ${getQuality(e)}"
myprintln " (JOSM): ${getQuality(j)}"
}
}*/
+ myprintln "*** Mismatching shapes: ***"
+ for (def url : josmUrls.keySet()) {
+ def j = josmUrls.get(url)
+ def num = 1
+ for (def shape : getShapes(j)) {
+ def p = shape.getPoints()
+ if(!p[0].equals(p[p.size()-1])) {
+ myprintln "+++ JOSM shape $num unclosed: ${getDescription(j)}"
+ }
+ ++num
+ }
+ }
+ for (def url : eiiUrls.keySet()) {
+ def e = eiiUrls.get(url)
+ def num = 1
+ def s = getShapes(e)
+ for (def shape : s) {
+ def p = shape.getPoints()
+ if(!p[0].equals(p[p.size()-1]) && !options.nomissingeii) {
+ myprintln "+++ EII shape $num unclosed: ${getDescription(e)}"
+ }
+ ++num
+ }
+ if (!josmUrls.containsKey(url)) {
+ continue
+ }
+ def j = josmUrls.get(url)
+ def js = getShapes(j)
+ if(!s.size() && js.size()) {
+ if(!options.nomissingeii) {
+ myprintln "+ No EII shape: ${getDescription(j)}"
+ }
+ } else if(!js.size() && s.size()) {
+ // don't report boundary like 5 point shapes as difference
+ if (s.size() != 1 || s[0].getPoints().size() != 5) {
+ myprintln "- No JOSM shape: ${getDescription(j)}"
+ }
+ } else if(s.size() != js.size()) {
+ myprintln "* Different number of shapes (${s.size()} != ${js.size()}): ${getDescription(j)}"
+ } else {
+ for(def nums = 0; nums < s.size(); ++nums) {
+ def ep = s[nums].getPoints()
+ def jp = js[nums].getPoints()
+ if(ep.size() != jp.size()) {
+ myprintln "* Different number of points for shape ${nums+1} (${ep.size()} ! = ${jp.size()})): ${getDescription(j)}"
+ } else {
+ for(def nump = 0; nump < ep.size(); ++nump) {
+ def ept = ep[nump]
+ def jpt = jp[nump]
+ if(Math.abs(ept.getLat()-jpt.getLat()) > 0.000001 || Math.abs(ept.getLon()-jpt.getLon()) > 0.000001) {
+ myprintln "* Different coordinate for point ${nump+1} of shape ${nums+1}: ${getDescription(j)}"
+ nump = ep.size()
+ num = s.size()
+ }
+ }
+ }
+ }
+ }
+ }
+ myprintln "*** Mismatching icons: ***"
+ for (def url : eiiUrls.keySet()) {
+ def e = eiiUrls.get(url)
+ if (!josmUrls.containsKey(url)) {
+ continue
+ }
+ def j = josmUrls.get(url)
+ def ij = getIcon(j)
+ def ie = getIcon(e)
+ if(ij != null && ie == null) {
+ if(!options.nomissingeii) {
+ myprintln "+ No EII icon: ${getDescription(j)}"
+ }
+ } else if(ij == null && ie != null) {
+ myprintln "- No JOSM icon: ${getDescription(j)}"
+ } else if(!ij.equals(ie)) {
+ myprintln "* Different icons: ${getDescription(j)}"
+ }
+ }
+ myprintln "*** Miscellaneous checks: ***"
+ def josmIds = new HashMap<String, ImageryInfo>()
+ for (def url : josmUrls.keySet()) {
+ def j = josmUrls.get(url)
+ def id = getId(j)
+ if(josmMirrors.containsKey(url)) {
+ continue;
+ }
+ if(id == null) {
+ myprintln "* No JOSM-ID: ${getDescription(j)}"
+ } else if(josmIds.containsKey(id)) {
+ myprintln "* JOSM-ID ${id} not unique: ${getDescription(j)}"
+ } else {
+ josmIds.put(id, j);
+ }
+ def js = getShapes(j)
+ if(js.size()) {
+ def minlat = 1000;
+ def minlon = 1000;
+ def maxlat = -1000;
+ def maxlon = -1000;
+ for(def s: js) {
+ for(def p: s.getPoints()) {
+ def lat = p.getLat();
+ def lon = p.getLon();
+ if(lat > maxlat) maxlat = lat;
+ if(lon > maxlon) maxlon = lon;
+ if(lat < minlat) minlat = lat;
+ if(lon < minlon) minlon = lon;
+ }
+ }
+ def b = j.getBounds();
+ if(b.getMinLat() != minlat || b.getMinLon() != minlon || b.getMaxLat() != maxlat || b.getMaxLon() != maxlon) {
+ myprintln "* Bounds do not match shape (is ${b.getMinLat()},${b.getMinLon()},${b.getMaxLat()},${b.getMaxLon()}, calculated <bounds min-lat='${minlat}' min-lon='${minlon}' max-lat='${maxlat}' max-lon='${maxlon}'>): ${getDescription(j)}"
+ }
+ }
+ }
}
/**
@@ -370,24 +449,53 @@ class SyncEditorImageryIndex {
*/
static String getUrl(Object e) {
if (e instanceof ImageryInfo) return e.url
- return e.getString("url")
+ return e.get("properties").getString("url")
+ }
+ static String getId(Object e) {
+ if (e instanceof ImageryInfo) return e.getId()
+ return e.get("properties").getString("id")
}
static String getName(Object e) {
if (e instanceof ImageryInfo) return e.getOriginalName()
- return e.getString("name")
+ return e.get("properties").getString("name")
+ }
+ static List<Shape> getShapes(Object e) {
+ if (e instanceof ImageryInfo) {
+ def bounds = e.getBounds();
+ if(bounds != null) {
+ return bounds.getShapes();
+ }
+ return []
+ }
+ if(!e.isNull("geometry")) {
+ def ex = e.get("geometry")
+ if(ex != null && !ex.isNull("coordinates")) {
+ def poly = ex.get("coordinates")
+ List<Shape> l = []
+ for(def shapes: poly) {
+ def s = new Shape()
+ for(def point: shapes) {
+ def lon = point[0].toString()
+ def lat = point[1].toString()
+ s.addPoint(lat, lon)
+ }
+ l.add(s)
+ }
+ return l
+ }
+ }
+ return []
}
static String getType(Object e) {
if (e instanceof ImageryInfo) return e.getImageryType().getTypeString()
- return e.getString("type")
+ return e.get("properties").getString("type")
}
static Integer getMinZoom(Object e) {
if (e instanceof ImageryInfo) {
int mz = e.getMinZoom()
return mz == 0 ? null : mz
} else {
- def ext = e.getJsonObject("extent")
- if (ext == null) return null
- def num = ext.getJsonNumber("min_zoom")
+ def num = e.get("properties").getJsonNumber("min_zoom")
if (num == null) return null
return num.intValue()
}
@@ -397,21 +505,23 @@ class SyncEditorImageryIndex {
int mz = e.getMaxZoom()
return mz == 0 ? null : mz
} else {
- def ext = e.getJsonObject("extent")
- if (ext == null) return null
- def num = ext.getJsonNumber("max_zoom")
+ def num = e.get("properties").getJsonNumber("max_zoom")
if (num == null) return null
return num.intValue()
}
}
static String getCountryCode(Object e) {
if (e instanceof ImageryInfo) return "".equals(e.getCountryCode()) ? null : e.getCountryCode()
- return e.getString("country_code", null)
+ return e.get("properties").getString("country_code", null)
}
static String getQuality(Object e) {
//if (e instanceof ImageryInfo) return "".equals(e.getQuality()) ? null : e.getQuality()
if (e instanceof ImageryInfo) return null
- return e.get("best") ? "best" : null
+ return e.get("properties").get("best") ? "best" : null
+ }
+ static String getIcon(Object e) {
+ if (e instanceof ImageryInfo) return e.getIcon()
+ return e.get("properties").getString("icon", null)
}
String getDescription(Object o) {
def url = getUrl(o)
diff --git a/scripts/TagInfoExtract.groovy b/scripts/TagInfoExtract.groovy
index 190a915..3192519 100644
--- a/scripts/TagInfoExtract.groovy
+++ b/scripts/TagInfoExtract.groovy
@@ -8,8 +8,6 @@
* groovy -cp dist/josm-custom.jar scripts/taginfoextract.groovy -t presets
* groovy -cp dist/josm-custom.jar scripts/taginfoextract.groovy -t external_presets
*/
-import groovy.json.JsonBuilder
-
import java.awt.image.BufferedImage
import java.nio.file.FileSystems
import java.nio.file.Files
@@ -44,8 +42,13 @@ import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType
import org.openstreetmap.josm.gui.tagging.presets.items.KeyedItem
import org.openstreetmap.josm.gui.tagging.presets.items.KeyedItem.MatchType
import org.openstreetmap.josm.io.CachedFile
+import org.openstreetmap.josm.tools.RightAndLefthandTraffic
+import org.openstreetmap.josm.tools.Territories
import org.openstreetmap.josm.tools.Utils
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
+import groovy.json.JsonBuilder
+
class TagInfoExtract {
static def options
@@ -115,6 +118,7 @@ class TagInfoExtract {
abstract def find_url(boolean generate_image)
}
+ @SuppressFBWarnings(value = "MF_CLASS_MASKS_FIELD")
class NodeChecker extends Checker {
NodeChecker(tag) {
super(tag)
@@ -134,6 +138,7 @@ class TagInfoExtract {
}
}
+ @SuppressFBWarnings(value = "MF_CLASS_MASKS_FIELD")
class WayChecker extends Checker {
WayChecker(tag) {
super(tag)
@@ -156,6 +161,7 @@ class TagInfoExtract {
}
}
+ @SuppressFBWarnings(value = "MF_CLASS_MASKS_FIELD")
class AreaChecker extends Checker {
AreaChecker(tag) {
super(tag)
@@ -375,6 +381,8 @@ class TagInfoExtract {
Path tmpdir = Files.createTempDirectory(FileSystems.getDefault().getPath(base_dir), "pref")
tmpdir.toFile().deleteOnExit()
System.setProperty("josm.home", tmpdir.toString())
+ Territories.initialize()
+ RightAndLefthandTraffic.initialize()
josm_svn_revision = Version.getInstance().getVersion()
assert josm_svn_revision != Version.JOSM_UNKNOWN_VERSION
diff --git a/src/org/apache/commons/jcs/JCS.java b/src/org/apache/commons/jcs/JCS.java
index 696847d..304df37 100644
--- a/src/org/apache/commons/jcs/JCS.java
+++ b/src/org/apache/commons/jcs/JCS.java
@@ -1,5 +1,7 @@
package org.apache.commons.jcs;
+import java.util.Properties;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -28,8 +30,6 @@ import org.apache.commons.jcs.engine.control.CompositeCache;
import org.apache.commons.jcs.engine.control.CompositeCacheManager;
import org.apache.commons.jcs.engine.control.group.GroupAttrName;
-import java.util.Properties;
-
/**
* Simple class for using JCS. To use JCS in your application, you can use the static methods of
* this class to get access objects (instances of this class) for your cache regions. One CacheAccess
@@ -58,8 +58,11 @@ public abstract class JCS
* @param name Name that will identify the region
* @return CacheAccess instance for the new region
* @throws CacheException
+ *
+ * @deprecated Duplicate of getInstance(String)
*/
- public static <K, V> CacheAccess<K, V> defineRegion( String name )
+ @Deprecated
+ public static <K, V> CacheAccess<K, V> defineRegion( String name )
throws CacheException
{
CompositeCache<K, V> cache = getCacheManager().getCache( name );
@@ -73,8 +76,11 @@ public abstract class JCS
* @param cattr CompositeCacheAttributes for the region
* @return CacheAccess instance for the new region
* @throws CacheException
+ *
+ * @deprecated Duplicate of getInstance(String, ICompositeCacheAttributes)
*/
- public static <K, V> CacheAccess<K, V> defineRegion( String name, ICompositeCacheAttributes cattr )
+ @Deprecated
+ public static <K, V> CacheAccess<K, V> defineRegion( String name, ICompositeCacheAttributes cattr )
throws CacheException
{
CompositeCache<K, V> cache = getCacheManager().getCache( name, cattr );
@@ -90,8 +96,11 @@ public abstract class JCS
* @param attr Attributes for the region
* @return CacheAccess instance for the new region
* @throws CacheException
+ *
+ * @deprecated Duplicate of getInstance(String, ICompositeCacheAttributes, IElementAttributes)
*/
- public static <K, V> CacheAccess<K, V> defineRegion( String name, ICompositeCacheAttributes cattr, IElementAttributes attr )
+ @Deprecated
+ public static <K, V> CacheAccess<K, V> defineRegion( String name, ICompositeCacheAttributes cattr, IElementAttributes attr )
throws CacheException
{
CompositeCache<K, V> cache = getCacheManager().getCache( name, cattr, attr );
@@ -182,6 +191,22 @@ public abstract class JCS
}
/**
+ * Get a CacheAccess which accesses the provided region.
+ * <p>
+ * @param region Region that return CacheAccess will provide access to
+ * @param icca CacheAttributes for region
+ * @param eattr ElementAttributes for the region
+ * @return A CacheAccess which provides access to a given region.
+ * @throws CacheException
+ */
+ public static <K, V> CacheAccess<K, V> getInstance( String region, ICompositeCacheAttributes icca, IElementAttributes eattr )
+ throws CacheException
+ {
+ CompositeCache<K, V> cache = getCacheManager().getCache( region, icca, eattr );
+ return new CacheAccess<K, V>( cache );
+ }
+
+ /**
* Get a GroupCacheAccess which accesses the provided region.
* <p>
* @param region Region that return GroupCacheAccess will provide access to
@@ -209,4 +234,20 @@ public abstract class JCS
CompositeCache<GroupAttrName<K>, V> cache = getCacheManager().getCache( region, icca );
return new GroupCacheAccess<K, V>( cache );
}
+
+ /**
+ * Get a GroupCacheAccess which accesses the provided region.
+ * <p>
+ * @param region Region that return CacheAccess will provide access to
+ * @param icca CacheAttributes for region
+ * @param eattr ElementAttributes for the region
+ * @return A GroupCacheAccess which provides access to a given region.
+ * @throws CacheException
+ */
+ public static <K, V> GroupCacheAccess<K, V> getGroupCacheInstance( String region, ICompositeCacheAttributes icca, IElementAttributes eattr )
+ throws CacheException
+ {
+ CompositeCache<GroupAttrName<K>, V> cache = getCacheManager().getCache( region, icca, eattr );
+ return new GroupCacheAccess<K, V>( cache );
+ }
}
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java b/src/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java
index 0cd6ea7..9533171 100644
--- a/src/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java
+++ b/src/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java
@@ -41,17 +41,18 @@ import org.apache.commons.jcs.engine.stats.StatElement;
import org.apache.commons.jcs.engine.stats.Stats;
import org.apache.commons.jcs.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs.engine.stats.behavior.IStats;
+import org.apache.commons.jcs.utils.struct.LRUMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* Abstract class providing a base implementation of a disk cache, which can be easily extended to
* implement a disk cache for a specific persistence mechanism.
- *
+ *
* When implementing the abstract methods note that while this base class handles most things, it
* does not acquire or release any locks. Implementations should do so as necessary. This is mainly
* done to minimize the time spent in critical sections.
- *
+ *
* Error handling in this class needs to be addressed. Currently if an exception is thrown by the
* persistence mechanism, this class destroys the event queue. Should it also destroy purgatory?
* Should it dispose itself?
@@ -69,7 +70,7 @@ public abstract class AbstractDiskCache<K, V>
* Map where elements are stored between being added to this cache and actually spooled to disk.
* This allows puts to the disk cache to return quickly, and the more expensive operation of
* serializing the elements to persistent storage queued for later.
- *
+ *
* If the elements are pulled into the memory cache while the are still in purgatory, writing to
* disk can be canceled.
*/
@@ -104,7 +105,7 @@ public abstract class AbstractDiskCache<K, V>
/**
* Construct the abstract disk cache, create event queues and purgatory. Child classes should
* set the alive flag to true after they are initialized.
- *
+ *
* @param attr
*/
protected AbstractDiskCache( IDiskCacheAttributes attr )
@@ -141,7 +142,7 @@ public abstract class AbstractDiskCache<K, V>
/**
* Purgatory size of -1 means to use a HashMap with no size limit. Anything greater will use an
* LRU map of some sort.
- *
+ *
* TODO Currently setting this to 0 will cause nothing to be put to disk, since it will assume
* that if an item is not in purgatory, then it must have been plucked. We should make 0
* work, a way to not use purgatory.
@@ -158,7 +159,7 @@ public abstract class AbstractDiskCache<K, V>
{
if ( diskCacheAttributes.getMaxPurgatorySize() >= 0 )
{
- purgatory = new LRUMapJCS<K, PurgatoryElement<K, V>>( diskCacheAttributes.getMaxPurgatorySize() );
+ purgatory = new LRUMap<K, PurgatoryElement<K, V>>( diskCacheAttributes.getMaxPurgatorySize() );
}
else
{
@@ -177,10 +178,10 @@ public abstract class AbstractDiskCache<K, V>
/**
* Adds the provided element to the cache. Element will be added to purgatory, and then queued
* for later writing to the serialized storage mechanism.
- *
+ *
* An update results in a put event being created. The put event will call the handlePut method
* defined here. The handlePut method calls the implemented doPut on the child.
- *
+ *
* @param cacheElement
* @throws IOException
* @see org.apache.commons.jcs.engine.behavior.ICache#update
@@ -224,7 +225,7 @@ public abstract class AbstractDiskCache<K, V>
/**
* Check to see if the item is in purgatory. If so, return it. If not, check to see if we have
* it on disk.
- *
+ *
* @param key
* @return ICacheElement<K, V> or null
* @see AuxiliaryCache#get
@@ -302,12 +303,12 @@ public abstract class AbstractDiskCache<K, V>
/**
* Gets items from the cache matching the given pattern. Items from memory will replace those
* from remote sources.
- *
+ *
* This only works with string keys. It's too expensive to do a toString on every key.
- *
+ *
* Auxiliaries will do their best to handle simple expressions. For instance, the JDBC disk
* cache will convert * to % and . to _
- *
+ *
* @param pattern
* @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
* data matching the pattern.
@@ -341,7 +342,7 @@ public abstract class AbstractDiskCache<K, V>
/**
* Gets multiple items from the cache based on the given set of keys.
- *
+ *
* @param keys
* @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
* data in cache for any of these keys
@@ -369,7 +370,7 @@ public abstract class AbstractDiskCache<K, V>
/**
* The keys in the cache.
- *
+ *
* @see org.apache.commons.jcs.auxiliary.AuxiliaryCache#getKeySet()
*/
@Override
@@ -377,7 +378,7 @@ public abstract class AbstractDiskCache<K, V>
/**
* Removes are not queued. A call to remove is immediate.
- *
+ *
* @param key
* @return whether the item was present to be removed.
* @throws IOException
@@ -449,7 +450,7 @@ public abstract class AbstractDiskCache<K, V>
/**
* Adds a dispose request to the disk cache.
- *
+ *
* Disposal proceeds in several steps.
* <ol>
* <li>Prior to this call the Composite cache dumped the memory into the disk cache. If it is
@@ -524,7 +525,7 @@ public abstract class AbstractDiskCache<K, V>
/**
* Gets basic stats for the abstract disk cache.
- *
+ *
* @return String
*/
@Override
@@ -535,7 +536,7 @@ public abstract class AbstractDiskCache<K, V>
/**
* Returns semi-structured data.
- *
+ *
* @see org.apache.commons.jcs.auxiliary.AuxiliaryCache#getStatistics()
*/
@Override
@@ -571,7 +572,7 @@ public abstract class AbstractDiskCache<K, V>
/**
* Size cannot be determined without knowledge of the cache implementation, so subclasses will
* need to implement this method.
- *
+ *
* @return the number of items.
* @see ICache#getSize
*/
@@ -761,17 +762,17 @@ public abstract class AbstractDiskCache<K, V>
* Before the event logging layer, the subclasses implemented the do* methods. Now the do*
* methods call the *WithEventLogging method on the super. The *WithEventLogging methods call
* the abstract process* methods. The children implement the process methods.
- *
+ *
* ex. doGet calls getWithEventLogging, which calls processGet
*/
/**
* Get a value from the persistent store.
- *
+ *
* Before the event logging layer, the subclasses implemented the do* methods. Now the do*
* methods call the *EventLogging method on the super. The *WithEventLogging methods call the
* abstract process* methods. The children implement the process methods.
- *
+ *
* @param key Key to locate value for.
* @return An object matching key, or null.
* @throws IOException
@@ -784,11 +785,11 @@ public abstract class AbstractDiskCache<K, V>
/**
* Get a value from the persistent store.
- *
+ *
* Before the event logging layer, the subclasses implemented the do* methods. Now the do*
* methods call the *EventLogging method on the super. The *WithEventLogging methods call the
* abstract process* methods. The children implement the process methods.
- *
+ *
* @param pattern Used to match keys.
* @return A map of matches..
* @throws IOException
@@ -801,11 +802,11 @@ public abstract class AbstractDiskCache<K, V>
/**
* Add a cache element to the persistent store.
- *
+ *
* Before the event logging layer, the subclasses implemented the do* methods. Now the do*
* methods call the *EventLogging method on the super. The *WithEventLogging methods call the
* abstract process* methods. The children implement the process methods.
- *
+ *
* @param cacheElement
* @throws IOException
*/
@@ -817,11 +818,11 @@ public abstract class AbstractDiskCache<K, V>
/**
* Remove an object from the persistent store if found.
- *
+ *
* Before the event logging layer, the subclasses implemented the do* methods. Now the do*
* methods call the *EventLogging method on the super. The *WithEventLogging methods call the
* abstract process* methods. The children implement the process methods.
- *
+ *
* @param key Key of object to remove.
* @return whether or no the item was present when removed
* @throws IOException
@@ -834,11 +835,11 @@ public abstract class AbstractDiskCache<K, V>
/**
* Remove all objects from the persistent store.
- *
+ *
* Before the event logging layer, the subclasses implemented the do* methods. Now the do*
* methods call the *EventLogging method on the super. The *WithEventLogging methods call the
* abstract process* methods. The children implement the process methods.
- *
+ *
* @throws IOException
*/
protected final void doRemoveAll()
@@ -850,11 +851,11 @@ public abstract class AbstractDiskCache<K, V>
/**
* Dispose of the persistent store. Note that disposal of purgatory and setting alive to false
* does NOT need to be done by this method.
- *
+ *
* Before the event logging layer, the subclasses implemented the do* methods. Now the do*
* methods call the *EventLogging method on the super. The *WithEventLogging methods call the
* abstract process* methods. The children implement the process methods.
- *
+ *
* @throws IOException
*/
protected final void doDispose()
@@ -865,7 +866,7 @@ public abstract class AbstractDiskCache<K, V>
/**
* Gets the extra info for the event log.
- *
+ *
* @return disk location
*/
@Override
@@ -876,7 +877,7 @@ public abstract class AbstractDiskCache<K, V>
/**
* This is used by the event logging.
- *
+ *
* @return the location of the disk, either path or ip.
*/
protected abstract String getDiskLocation();
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/LRUMapJCS.java b/src/org/apache/commons/jcs/auxiliary/disk/LRUMapJCS.java
deleted file mode 100644
index c6b1801..0000000
--- a/src/org/apache/commons/jcs/auxiliary/disk/LRUMapJCS.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.apache.commons.jcs.auxiliary.disk;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.commons.jcs.utils.struct.LRUMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * Extension of LRUMap for logging of removals. Can switch this back to a HashMap easily. This
- * provides some abstraction. It also makes it easy to log overflow.
- */
-public class LRUMapJCS<K, V>
- extends LRUMap<K, V>
-{
- /** The logger */
- private static final Log log = LogFactory.getLog( LRUMapJCS.class );
-
- /**
- * This creates an unbounded version.
- */
- public LRUMapJCS()
- {
- super();
- }
-
- /**
- * This creates a list bounded by the max key size argument. The Boundary is enforces by an LRU
- * eviction policy.
- * <p>
- * This is used in the Disk cache to store keys and purgatory elements if a boundary is
- * requested.
- * <p>
- * The LRU memory cache uses its own LRU implementation.
- * <p>
- * @param maxKeySize
- */
- public LRUMapJCS( int maxKeySize )
- {
- super( maxKeySize );
- }
-
- /**
- * This is called when an item is removed from the LRU. We just log some information.
- * <p>
- * @param key
- * @param value
- */
- @Override
- protected void processRemovedLRU(K key, V value)
- {
- if ( log.isDebugEnabled() )
- {
- log.debug( "Removing key [" + key + "] from key store, value [" + value + "]" );
- log.debug( "Key store size [" + this.size() + "]" );
- }
- }
-}
diff --git a/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java b/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java
index 28d79b2..30a82d3 100644
--- a/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java
+++ b/src/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java
@@ -25,7 +25,6 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
-import java.util.ConcurrentModificationException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -588,16 +587,6 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
+ ", size: " + ded.len);
}
}
- catch (ConcurrentModificationException cme)
- {
- // do nothing, this means it has gone back to memory mid
- // serialization
- if (log.isDebugEnabled())
- {
- // this shouldn't be possible
- log.debug(logCacheName + "Caught ConcurrentModificationException." + cme);
- }
- }
catch (IOException e)
{
log.error(logCacheName + "Failure updating element, key: " + ce.getKey() + " old: " + old, e);
diff --git a/src/org/apache/commons/jcs/engine/AbstractCacheEventQueue.java b/src/org/apache/commons/jcs/engine/AbstractCacheEventQueue.java
index e421843..216a94d 100644
--- a/src/org/apache/commons/jcs/engine/AbstractCacheEventQueue.java
+++ b/src/org/apache/commons/jcs/engine/AbstractCacheEventQueue.java
@@ -1,5 +1,8 @@
package org.apache.commons.jcs.engine;
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -25,8 +28,6 @@ import org.apache.commons.jcs.engine.behavior.ICacheListener;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.io.IOException;
-
/**
* An abstract base class to the different implementations
*/
@@ -45,34 +46,32 @@ public abstract class AbstractCacheEventQueue<K, V>
*/
private int waitToDieMillis = DEFAULT_WAIT_TO_DIE_MILLIS;
- // TODO privatise the fields
-
/**
- * When the events are pulled off the queue, the tell the listener to handle the specific event
+ * When the events are pulled off the queue, then tell the listener to handle the specific event
* type. The work is done by the listener.
*/
- protected ICacheListener<K, V> listener;
+ private ICacheListener<K, V> listener;
/** Id of the listener registered with this queue */
- protected long listenerId;
+ private long listenerId;
/** The cache region name, if applicable. */
- protected String cacheName;
+ private String cacheName;
/** Maximum number of failures before we buy the farm. */
- protected int maxFailure;
+ private int maxFailure;
/** in milliseconds */
- protected int waitBeforeRetry;
+ private int waitBeforeRetry;
- /** this is true if there is no worker thread. */
- protected boolean destroyed = true;
+ /** this is true if there is any worker thread. */
+ private final AtomicBoolean alive = new AtomicBoolean(false);
/**
* This means that the queue is functional. If we reached the max number of failures, the queue
* is marked as non functional and will never work again.
*/
- private boolean working = true;
+ private final AtomicBoolean working = new AtomicBoolean(true);
/**
* Returns the time to wait for events before killing the background thread.
@@ -111,9 +110,9 @@ public abstract class AbstractCacheEventQueue<K, V>
* @return The alive value
*/
@Override
- public synchronized boolean isAlive()
+ public boolean isAlive()
{
- return !destroyed;
+ return alive.get();
}
/**
@@ -121,9 +120,9 @@ public abstract class AbstractCacheEventQueue<K, V>
* <p>
* @param aState
*/
- public synchronized void setAlive( boolean aState )
+ public void setAlive( boolean aState )
{
- destroyed = !aState;
+ alive.set(aState);
}
/**
@@ -136,6 +135,43 @@ public abstract class AbstractCacheEventQueue<K, V>
}
/**
+ * @return the cacheName
+ */
+ protected String getCacheName()
+ {
+ return cacheName;
+ }
+
+ /**
+ * Initializes the queue.
+ * <p>
+ * @param listener
+ * @param listenerId
+ * @param cacheName
+ * @param maxFailure
+ * @param waitBeforeRetry
+ */
+ protected void initialize( ICacheListener<K, V> listener, long listenerId, String cacheName, int maxFailure,
+ int waitBeforeRetry)
+ {
+ if ( listener == null )
+ {
+ throw new IllegalArgumentException( "listener must not be null" );
+ }
+
+ this.listener = listener;
+ this.listenerId = listenerId;
+ this.cacheName = cacheName;
+ this.maxFailure = maxFailure <= 0 ? 3 : maxFailure;
+ this.waitBeforeRetry = waitBeforeRetry <= 0 ? 500 : waitBeforeRetry;
+
+ if ( log.isDebugEnabled() )
+ {
+ log.debug( "Constructed: " + this );
+ }
+ }
+
+ /**
* This adds a put event to the queue. When it is processed, the element will be put to the
* listener.
* <p>
@@ -150,12 +186,9 @@ public abstract class AbstractCacheEventQueue<K, V>
{
put( new PutEvent( ce ) );
}
- else
+ else if ( log.isWarnEnabled() )
{
- if ( log.isWarnEnabled() )
- {
- log.warn( "Not enqueuing Put Event for [" + this + "] because it's non-functional." );
- }
+ log.warn( "Not enqueuing Put Event for [" + this + "] because it's non-functional." );
}
}
@@ -174,12 +207,9 @@ public abstract class AbstractCacheEventQueue<K, V>
{
put( new RemoveEvent( key ) );
}
- else
+ else if ( log.isWarnEnabled() )
{
- if ( log.isWarnEnabled() )
- {
- log.warn( "Not enqueuing Remove Event for [" + this + "] because it's non-functional." );
- }
+ log.warn( "Not enqueuing Remove Event for [" + this + "] because it's non-functional." );
}
}
@@ -197,12 +227,9 @@ public abstract class AbstractCacheEventQueue<K, V>
{
put( new RemoveAllEvent() );
}
- else
+ else if ( log.isWarnEnabled() )
{
- if ( log.isWarnEnabled() )
- {
- log.warn( "Not enqueuing RemoveAll Event for [" + this + "] because it's non-functional." );
- }
+ log.warn( "Not enqueuing RemoveAll Event for [" + this + "] because it's non-functional." );
}
}
@@ -217,12 +244,9 @@ public abstract class AbstractCacheEventQueue<K, V>
{
put( new DisposeEvent() );
}
- else
+ else if ( log.isWarnEnabled() )
{
- if ( log.isWarnEnabled() )
- {
- log.warn( "Not enqueuing Dispose Event for [" + this + "] because it's non-functional." );
- }
+ log.warn( "Not enqueuing Dispose Event for [" + this + "] because it's non-functional." );
}
}
@@ -235,24 +259,12 @@ public abstract class AbstractCacheEventQueue<K, V>
// /////////////////////////// Inner classes /////////////////////////////
-
- /** The queue is composed of nodes. */
- protected static class Node
- {
- /** Next node in the singly linked list. */
- Node next = null;
-
- /** The payload. */
- AbstractCacheEventQueue<?, ?>.AbstractCacheEvent event = null;
- }
-
/**
* Retries before declaring failure.
* <p>
* @author asmuts
*/
- protected abstract class AbstractCacheEvent
- implements Runnable
+ protected abstract class AbstractCacheEvent implements Runnable
{
/** Number of failures encountered processing this event. */
int failures = 0;
@@ -260,8 +272,8 @@ public abstract class AbstractCacheEventQueue<K, V>
/**
* Main processing method for the AbstractCacheEvent object
*/
- @SuppressWarnings("synthetic-access")
@Override
+ @SuppressWarnings("synthetic-access")
public void run()
{
try
@@ -442,7 +454,6 @@ public abstract class AbstractCacheEventQueue<K, V>
{
return "RemoveAllEvent";
}
-
}
/**
@@ -483,7 +494,7 @@ public abstract class AbstractCacheEventQueue<K, V>
@Override
public boolean isWorking()
{
- return working;
+ return working.get();
}
/**
@@ -494,6 +505,6 @@ public abstract class AbstractCacheEventQueue<K, V>
*/
public void setWorking( boolean b )
{
- working = b;
+ working.set(b);
}
}
diff --git a/src/org/apache/commons/jcs/engine/CacheEventQueue.java b/src/org/apache/commons/jcs/engine/CacheEventQueue.java
index 230dd09..f4904df 100644
--- a/src/org/apache/commons/jcs/engine/CacheEventQueue.java
+++ b/src/org/apache/commons/jcs/engine/CacheEventQueue.java
@@ -1,5 +1,9 @@
package org.apache.commons.jcs.engine;
+import java.util.ArrayList;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -27,8 +31,6 @@ import org.apache.commons.jcs.engine.stats.behavior.IStats;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.util.ArrayList;
-
/**
* An event queue is used to propagate ordered cache events to one and only one target listener.
* <p>
@@ -48,17 +50,8 @@ public class CacheEventQueue<K, V>
/** the thread that works the queue. */
private Thread processorThread;
- /** sync */
- private final Object queueLock = new Object();
-
- /** the head of the queue */
- private Node head = new Node();
-
- /** the end of the queue */
- private Node tail = head;
-
- /** Number of items in the queue */
- private int size = 0;
+ /** Queue implementation */
+ private LinkedBlockingQueue<AbstractCacheEvent> queue = new LinkedBlockingQueue<AbstractCacheEvent>();
/**
* Constructs with the specified listener and the cache name.
@@ -84,38 +77,7 @@ public class CacheEventQueue<K, V>
public CacheEventQueue( ICacheListener<K, V> listener, long listenerId, String cacheName, int maxFailure,
int waitBeforeRetry )
{
- initialize( listener, listenerId, cacheName, maxFailure, waitBeforeRetry, null );
- }
-
- /**
- * Initializes the queue.
- * <p>
- * @param listener
- * @param listenerId
- * @param cacheName
- * @param maxFailure
- * @param waitBeforeRetry
- * @param threadPoolName
- */
- @Override
- public void initialize( ICacheListener<K, V> listener, long listenerId, String cacheName, int maxFailure,
- int waitBeforeRetry, String threadPoolName )
- {
- if ( listener == null )
- {
- throw new IllegalArgumentException( "listener must not be null" );
- }
-
- this.listener = listener;
- this.listenerId = listenerId;
- this.cacheName = cacheName;
- this.maxFailure = maxFailure <= 0 ? 3 : maxFailure;
- this.waitBeforeRetry = waitBeforeRetry <= 0 ? 500 : waitBeforeRetry;
-
- if ( log.isDebugEnabled() )
- {
- log.debug( "Constructed: " + this );
- }
+ initialize( listener, listenerId, cacheName, maxFailure, waitBeforeRetry );
}
/**
@@ -133,13 +95,10 @@ public class CacheEventQueue<K, V>
* Kill the processor thread and indicate that the queue is destroyed and no longer alive, but it
* can still be working.
*/
- public void stopProcessing()
+ protected void stopProcessing()
{
- synchronized (queueLock)
- {
- destroyed = true;
- processorThread = null;
- }
+ setAlive(false);
+ processorThread = null;
}
/**
@@ -150,37 +109,31 @@ public class CacheEventQueue<K, V>
@Override
public void destroy()
{
- synchronized (queueLock)
+ if ( isAlive() )
{
- if ( !destroyed )
- {
- destroyed = true;
+ setAlive(false);
- if ( log.isInfoEnabled() )
- {
- log.info( "Destroying queue, stats = " + getStatistics() );
- }
-
- // Synchronize on queue so the thread will not wait forever,
- // and then interrupt the QueueProcessor
+ if ( log.isInfoEnabled() )
+ {
+ log.info( "Destroying queue, stats = " + getStatistics() );
+ }
- if ( processorThread != null )
- {
- processorThread.interrupt();
- processorThread = null;
- }
+ if ( processorThread != null )
+ {
+ processorThread.interrupt();
+ processorThread = null;
+ }
- if ( log.isInfoEnabled() )
- {
- log.info( "Cache event queue destroyed: " + this );
- }
+ if ( log.isInfoEnabled() )
+ {
+ log.info( "Cache event queue destroyed: " + this );
}
- else
+ }
+ else
+ {
+ if ( log.isInfoEnabled() )
{
- if ( log.isInfoEnabled() )
- {
- log.info( "Destroy was called after queue was destroyed. Doing nothing. Stats = " + getStatistics() );
- }
+ log.info( "Destroy was called after queue was destroyed. Doing nothing. Stats = " + getStatistics() );
}
}
}
@@ -193,34 +146,23 @@ public class CacheEventQueue<K, V>
@Override
protected void put( AbstractCacheEvent event )
{
- Node newNode = new Node();
if ( log.isDebugEnabled() )
{
- log.debug( "Event entering Queue for " + cacheName + ": " + event );
+ log.debug( "Event entering Queue for " + getCacheName() + ": " + event );
}
- newNode.event = event;
+ queue.offer(event);
- synchronized ( queueLock )
+ if ( isWorking() )
{
- size++;
- tail.next = newNode;
- tail = newNode;
- if ( isWorking() )
+ if ( !isAlive() )
{
- if ( !isAlive() )
- {
- destroyed = false;
- processorThread = new QProcessor( this );
- processorThread.start();
- if ( log.isInfoEnabled() )
- {
- log.info( "Cache event queue created: " + this );
- }
- }
- else
+ setAlive(true);
+ processorThread = new QProcessor();
+ processorThread.start();
+ if ( log.isInfoEnabled() )
{
- queueLock.notify();
+ log.info( "Cache event queue created: " + this );
}
}
}
@@ -234,23 +176,18 @@ public class CacheEventQueue<K, V>
* @author asmuts
* @created January 15, 2002
*/
- private class QProcessor
+ protected class QProcessor
extends Thread
{
- /** The queue to work */
- CacheEventQueue<K, V> queue;
-
/**
* Constructor for the QProcessor object
* <p>
* @param aQueue the event queue to take items from.
*/
- QProcessor( CacheEventQueue<K, V> aQueue )
+ QProcessor()
{
- super( "CacheEventQueue.QProcessor-" + aQueue.cacheName );
-
+ super( "CacheEventQueue.QProcessor-" + getCacheName() );
setDaemon( true );
- queue = aQueue;
}
/**
@@ -259,15 +196,22 @@ public class CacheEventQueue<K, V>
* Waits for a specified time (waitToDieMillis) for something to come in and if no new
* events come in during that period the run method can exit and the thread is dereferenced.
*/
- @SuppressWarnings("synthetic-access")
@Override
public void run()
{
- AbstractCacheEvent event = null;
- while ( queue.isAlive() )
+ while ( isAlive() )
{
- event = queue.take();
+ AbstractCacheEvent event = null;
+
+ try
+ {
+ event = queue.poll(getWaitToDieMillis(), TimeUnit.MILLISECONDS);
+ }
+ catch (InterruptedException e)
+ {
+ // is ok
+ }
if ( log.isDebugEnabled() )
{
@@ -276,79 +220,18 @@ public class CacheEventQueue<K, V>
if ( event == null )
{
- synchronized ( queueLock )
- {
- try
- {
- queueLock.wait( queue.getWaitToDieMillis() );
- }
- catch ( InterruptedException e )
- {
- log.warn( "Interrupted while waiting for another event to come in before we die." );
- return;
- }
- event = queue.take();
- if ( log.isDebugEnabled() )
- {
- log.debug( "Event from queue after sleep = " + event );
- }
- }
- if ( event == null )
- {
- queue.stopProcessing();
- }
+ stopProcessing();
}
- if ( queue.isWorking() && queue.isAlive() && event != null )
+ if ( event != null && isWorking() && isAlive() )
{
event.run();
}
}
if ( log.isDebugEnabled() )
{
- log.debug( "QProcessor exiting for " + queue );
- }
- }
- }
-
- /**
- * Returns the next cache event from the queue or null if there are no events in the queue.
- * <p>
- * We have an empty node at the head and the tail. When we take an item from the queue we move
- * the next node to the head and then clear the value from that node. This value is returned.
- * <p>
- * When the queue is empty the head node is the same as the tail node.
- * <p>
- * @return An event to process.
- */
- protected AbstractCacheEvent take()
- {
- synchronized ( queueLock )
- {
- // wait until there is something to read
- if ( head == tail )
- {
- return null;
- }
-
- Node node = head.next;
-
- @SuppressWarnings("unchecked") // No generics for public fields
- AbstractCacheEvent value = (AbstractCacheEvent) node.event;
-
- if ( log.isDebugEnabled() )
- {
- log.debug( "head.event = " + head.event );
- log.debug( "node.event = " + node.event );
+ log.debug( "QProcessor exiting for " + getCacheName() );
}
-
- // Node becomes the new head (head is always empty)
-
- node.event = null;
- head = node;
-
- size--;
- return value;
}
}
@@ -366,30 +249,10 @@ public class CacheEventQueue<K, V>
ArrayList<IStatElement<?>> elems = new ArrayList<IStatElement<?>>();
- elems.add(new StatElement<Boolean>( "Working", Boolean.valueOf(super.isWorking()) ) );
+ elems.add(new StatElement<Boolean>( "Working", Boolean.valueOf(this.isWorking()) ) );
elems.add(new StatElement<Boolean>( "Alive", Boolean.valueOf(this.isAlive()) ) );
elems.add(new StatElement<Boolean>( "Empty", Boolean.valueOf(this.isEmpty()) ) );
-
- int sz = 0;
- synchronized ( queueLock )
- {
- // wait until there is something to read
- if ( head == tail )
- {
- sz = 0;
- }
- else
- {
- Node n = head;
- while ( n != null )
- {
- n = n.next;
- sz++;
- }
- }
-
- elems.add(new StatElement<Integer>( "Size", Integer.valueOf(sz) ) );
- }
+ elems.add(new StatElement<Integer>( "Size", Integer.valueOf(this.size()) ) );
stats.setStatElements( elems );
@@ -402,7 +265,7 @@ public class CacheEventQueue<K, V>
@Override
public boolean isEmpty()
{
- return tail == head;
+ return queue.isEmpty();
}
/**
@@ -413,6 +276,6 @@ public class CacheEventQueue<K, V>
@Override
public int size()
{
- return size;
+ return queue.size();
}
}
diff --git a/src/org/apache/commons/jcs/engine/CacheWatchRepairable.java b/src/org/apache/commons/jcs/engine/CacheWatchRepairable.java
index c5654a2..51c5987 100644
--- a/src/org/apache/commons/jcs/engine/CacheWatchRepairable.java
+++ b/src/org/apache/commons/jcs/engine/CacheWatchRepairable.java
@@ -1,5 +1,12 @@
package org.apache.commons.jcs.engine;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CopyOnWriteArraySet;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -24,12 +31,6 @@ import org.apache.commons.jcs.engine.behavior.ICacheObserver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
/**
* Intercepts the requests to the underlying ICacheObserver object so that the listeners can be
* recorded locally for remote connection recovery purposes. (Durable subscription like those in JMS
@@ -45,11 +46,11 @@ public class CacheWatchRepairable
private ICacheObserver cacheWatch;
/** Map of cache regions. */
- private final Map<String, Set<ICacheListener<?, ?>>> cacheMap =
- new HashMap<String, Set<ICacheListener<?, ?>>>();
+ private final ConcurrentMap<String, Set<ICacheListener<?, ?>>> cacheMap =
+ new ConcurrentHashMap<String, Set<ICacheListener<?, ?>>>();
/**
- * Replaces the underlying cache watch service and reattached all existing listeners to the new
+ * Replaces the underlying cache watch service and re-attaches all existing listeners to the new
* cache watch.
* <p>
* @param cacheWatch The new cacheWatch value
@@ -57,27 +58,24 @@ public class CacheWatchRepairable
public void setCacheWatch( ICacheObserver cacheWatch )
{
this.cacheWatch = cacheWatch;
- synchronized ( cacheMap )
+ for (Map.Entry<String, Set<ICacheListener<?, ?>>> entry : cacheMap.entrySet())
{
- for (Map.Entry<String, Set<ICacheListener<?, ?>>> entry : cacheMap.entrySet())
+ String cacheName = entry.getKey();
+ for (ICacheListener<?, ?> listener : entry.getValue())
{
- String cacheName = entry.getKey();
- for (ICacheListener<?, ?> listener : entry.getValue())
+ try
{
- try
- {
- if ( log.isInfoEnabled() )
- {
- log.info( "Adding listener to cache watch. ICacheListener = " + listener
- + " | ICacheObserver = " + cacheWatch );
- }
- cacheWatch.addCacheListener( cacheName, listener );
- }
- catch ( IOException ex )
+ if ( log.isInfoEnabled() )
{
- log.error( "Problem adding listener. ICacheListener = " + listener + " | ICacheObserver = "
- + cacheWatch, ex );
+ log.info( "Adding listener to cache watch. ICacheListener = " + listener
+ + " | ICacheObserver = " + cacheWatch );
}
+ cacheWatch.addCacheListener( cacheName, listener );
+ }
+ catch ( IOException ex )
+ {
+ log.error( "Problem adding listener. ICacheListener = " + listener + " | ICacheObserver = "
+ + cacheWatch, ex );
}
}
}
@@ -96,16 +94,20 @@ public class CacheWatchRepairable
{
// Record the added cache listener locally, regardless of whether the
// remote add-listener operation succeeds or fails.
- synchronized ( cacheMap )
+ Set<ICacheListener<?, ?>> listenerSet = cacheMap.get( cacheName );
+ if ( listenerSet == null )
{
- Set<ICacheListener<?, ?>> listenerSet = cacheMap.get( cacheName );
- if ( listenerSet == null )
+ Set<ICacheListener<?, ?>> newListenerSet = new CopyOnWriteArraySet<ICacheListener<?, ?>>();
+ listenerSet = cacheMap.putIfAbsent( cacheName, newListenerSet );
+
+ if (listenerSet == null)
{
- listenerSet = new HashSet<ICacheListener<?, ?>>();
- cacheMap.put( cacheName, listenerSet );
+ listenerSet = newListenerSet;
}
- listenerSet.add( obj );
}
+
+ listenerSet.add( obj );
+
if ( log.isInfoEnabled() )
{
log.info( "Adding listener to cache watch. ICacheListener = " + obj
@@ -126,13 +128,11 @@ public class CacheWatchRepairable
{
// Record the added cache listener locally, regardless of whether the
// remote add-listener operation succeeds or fails.
- synchronized ( cacheMap )
+ for (Set<ICacheListener<?, ?>> listenerSet : cacheMap.values())
{
- for (Set<ICacheListener<?, ?>> listenerSet : cacheMap.values())
- {
- listenerSet.add( obj );
- }
+ listenerSet.add( obj );
}
+
if ( log.isInfoEnabled() )
{
log.info( "Adding listener to cache watch. ICacheListener = " + obj
@@ -158,13 +158,10 @@ public class CacheWatchRepairable
}
// Record the removal locally, regardless of whether the remote
// remove-listener operation succeeds or fails.
- synchronized ( cacheMap )
+ Set<ICacheListener<?, ?>> listenerSet = cacheMap.get( cacheName );
+ if ( listenerSet != null )
{
- Set<ICacheListener<?, ?>> listenerSet = cacheMap.get( cacheName );
- if ( listenerSet != null )
- {
- listenerSet.remove( obj );
- }
+ listenerSet.remove( obj );
}
cacheWatch.removeCacheListener( cacheName, obj );
}
@@ -184,16 +181,13 @@ public class CacheWatchRepairable
// Record the removal locally, regardless of whether the remote
// remove-listener operation succeeds or fails.
- synchronized ( cacheMap )
+ for (Set<ICacheListener<?, ?>> listenerSet : cacheMap.values())
{
- for (Set<ICacheListener<?, ?>> listenerSet : cacheMap.values())
+ if ( log.isDebugEnabled() )
{
- if ( log.isDebugEnabled() )
- {
- log.debug( "Before removing [" + obj + "] the listenerSet = " + listenerSet );
- }
- listenerSet.remove( obj );
+ log.debug( "Before removing [" + obj + "] the listenerSet = " + listenerSet );
}
+ listenerSet.remove( obj );
}
cacheWatch.removeCacheListener( obj );
}
diff --git a/src/org/apache/commons/jcs/engine/PooledCacheEventQueue.java b/src/org/apache/commons/jcs/engine/PooledCacheEventQueue.java
index 56cc973..81dfe23 100644
--- a/src/org/apache/commons/jcs/engine/PooledCacheEventQueue.java
+++ b/src/org/apache/commons/jcs/engine/PooledCacheEventQueue.java
@@ -1,5 +1,9 @@
package org.apache.commons.jcs.engine;
+import java.util.ArrayList;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -28,10 +32,6 @@ import org.apache.commons.jcs.utils.threadpool.ThreadPoolManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.util.ArrayList;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-
/**
* An event queue is used to propagate ordered cache events to one and only one target listener.
* <p>
@@ -80,29 +80,14 @@ public class PooledCacheEventQueue<K, V>
* @param waitBeforeRetry
* @param threadPoolName
*/
- @Override
- public void initialize( ICacheListener<K, V> listener, long listenerId, String cacheName, int maxFailure,
+ protected void initialize( ICacheListener<K, V> listener, long listenerId, String cacheName, int maxFailure,
int waitBeforeRetry, String threadPoolName )
{
- if ( listener == null )
- {
- throw new IllegalArgumentException( "listener must not be null" );
- }
-
- this.listener = listener;
- this.listenerId = listenerId;
- this.cacheName = cacheName;
- this.maxFailure = maxFailure <= 0 ? 3 : maxFailure;
- this.waitBeforeRetry = waitBeforeRetry <= 0 ? 500 : waitBeforeRetry;
+ super.initialize(listener, listenerId, cacheName, maxFailure, waitBeforeRetry);
// this will share the same pool with other event queues by default.
pool = ThreadPoolManager.getInstance().getPool(
(threadPoolName == null) ? "cache_event_queue" : threadPoolName );
-
- if ( log.isDebugEnabled() )
- {
- log.debug( "Initialized: " + this );
- }
}
/**
@@ -115,22 +100,14 @@ public class PooledCacheEventQueue<K, V>
}
/**
- * Event Q is empty.
- */
- public synchronized void stopProcessing()
- {
- destroyed = true;
- }
-
- /**
* Destroy the queue. Interrupt all threads.
*/
@Override
public synchronized void destroy()
{
- if ( !destroyed )
+ if ( isAlive() )
{
- destroyed = true;
+ setAlive(false);
pool.shutdownNow();
if ( log.isInfoEnabled() )
{
@@ -151,14 +128,6 @@ public class PooledCacheEventQueue<K, V>
}
/**
- * @return Statistics info
- */
- public String getStats()
- {
- return getStatistics().toString();
- }
-
- /**
* @return IStats
*/
@Override
diff --git a/src/org/apache/commons/jcs/engine/behavior/ICacheEventQueue.java b/src/org/apache/commons/jcs/engine/behavior/ICacheEventQueue.java
index 397fa75..a29ed33 100644
--- a/src/org/apache/commons/jcs/engine/behavior/ICacheEventQueue.java
+++ b/src/org/apache/commons/jcs/engine/behavior/ICacheEventQueue.java
@@ -1,5 +1,7 @@
package org.apache.commons.jcs.engine.behavior;
+import java.io.IOException;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,8 +23,6 @@ package org.apache.commons.jcs.engine.behavior;
import org.apache.commons.jcs.engine.stats.behavior.IStats;
-import java.io.IOException;
-
/**
* Interface for a cache event queue. An event queue is used to propagate
* ordered cache events to one and only one target listener.
@@ -39,19 +39,6 @@ public interface ICacheEventQueue<K, V>
}
/**
- * Initializes the queue.
- * <p>
- * @param listener
- * @param listenerId
- * @param cacheName
- * @param maxFailure
- * @param waitBeforeRetry
- * @param threadPoolName
- */
- void initialize( ICacheListener<K, V> listener, long listenerId, String cacheName, int maxFailure,
- int waitBeforeRetry, String threadPoolName );
-
- /**
* Return the type of event queue we are using, either single or pooled.
* <p>
* @return the queue type: single or pooled
diff --git a/src/org/apache/commons/jcs/engine/control/CompositeCacheManager.java b/src/org/apache/commons/jcs/engine/control/CompositeCacheManager.java
index 28d1db9..2d012ce 100644
--- a/src/org/apache/commons/jcs/engine/control/CompositeCacheManager.java
+++ b/src/org/apache/commons/jcs/engine/control/CompositeCacheManager.java
@@ -24,11 +24,11 @@ import java.io.InputStream;
import java.lang.management.ManagementFactory;
import java.security.AccessControlException;
import java.util.ArrayList;
-import java.util.LinkedHashSet;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
@@ -125,8 +125,8 @@ public class CompositeCacheManager
/** Once configured, you can force a reconfiguration of sorts. */
private static final boolean DEFAULT_FORCE_RECONFIGURATION = false;
- /** Those waiting for notification of a shutdown. */
- private final LinkedHashSet<IShutdownObserver> shutdownObservers = new LinkedHashSet<IShutdownObserver>();
+ /** Stack for those waiting for notification of a shutdown. */
+ private final LinkedBlockingDeque<IShutdownObserver> shutdownObservers = new LinkedBlockingDeque<IShutdownObserver>();
/** The central background scheduler. */
private ScheduledExecutorService scheduledExecutor;
@@ -604,8 +604,6 @@ public class CompositeCacheManager
if ( cache == null )
{
- cattr.setCacheName( cattr.getCacheName() );
-
CompositeCacheConfigurator configurator = new CompositeCacheConfigurator();
cache = configurator.parseRegion( this.getConfigurationProperties(), this, cattr.getCacheName(),
@@ -662,17 +660,10 @@ public class CompositeCacheManager
ThreadPoolManager.dispose();
// notify any observers
- synchronized ( shutdownObservers )
+ IShutdownObserver observer = null;
+ while ((observer = shutdownObservers.poll()) != null)
{
- // We don't need to worry about locking the set.
- // since this is a shutdown command, nor do we need
- // to queue these up.
- for (IShutdownObserver observer : shutdownObservers)
- {
- observer.shutdown();
- }
-
- shutdownObservers.clear();
+ observer.shutdown();
}
// Unregister JMX bean
@@ -914,13 +905,14 @@ public class CompositeCacheManager
@Override
public void registerShutdownObserver( IShutdownObserver observer )
{
- // synchronized to take care of iteration safety
- // during shutdown.
- synchronized ( shutdownObservers )
- {
- // the set will take care of duplication protection
- shutdownObservers.add( observer );
- }
+ if (!shutdownObservers.contains(observer))
+ {
+ shutdownObservers.push( observer );
+ }
+ else
+ {
+ log.warn("Shutdown observer added twice " + observer);
+ }
}
/**
@@ -929,10 +921,7 @@ public class CompositeCacheManager
@Override
public void deregisterShutdownObserver( IShutdownObserver observer )
{
- synchronized ( shutdownObservers )
- {
- shutdownObservers.remove( observer );
- }
+ shutdownObservers.remove( observer );
}
/**
diff --git a/src/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java b/src/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java
index dea234f..b1faf25 100644
--- a/src/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java
+++ b/src/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java
@@ -20,13 +20,13 @@ package org.apache.commons.jcs.engine.memory;
*/
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.ConcurrentMap;
import org.apache.commons.jcs.engine.CacheConstants;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
@@ -35,7 +35,6 @@ import org.apache.commons.jcs.engine.control.group.GroupAttrName;
import org.apache.commons.jcs.engine.memory.util.DefaultMemoryElementDescriptor;
import org.apache.commons.jcs.engine.memory.util.MemoryElementDescriptor;
import org.apache.commons.jcs.engine.stats.StatElement;
-import org.apache.commons.jcs.engine.stats.Stats;
import org.apache.commons.jcs.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs.engine.stats.behavior.IStats;
import org.apache.commons.jcs.utils.struct.DoubleLinkedList;
@@ -58,15 +57,6 @@ public abstract class AbstractDoubleLinkedListMemoryCache<K, V> extends Abstract
/** thread-safe double linked list for lru */
protected DoubleLinkedList<MemoryElementDescriptor<K, V>> list; // TODO privatise
- /** number of hits */
- private AtomicLong hitCnt;
-
- /** number of misses */
- private AtomicLong missCnt;
-
- /** number of puts */
- private AtomicLong putCnt;
-
/**
* For post reflection creation initialization.
* <p>
@@ -76,35 +66,9 @@ public abstract class AbstractDoubleLinkedListMemoryCache<K, V> extends Abstract
@Override
public void initialize(CompositeCache<K, V> hub)
{
- lock.lock();
- try
- {
- super.initialize(hub);
- hitCnt = new AtomicLong(0);
- missCnt = new AtomicLong(0);
- putCnt = new AtomicLong(0);
- list = new DoubleLinkedList<MemoryElementDescriptor<K, V>>();
- log.info("initialized MemoryCache for " + getCacheName());
- }
- finally
- {
- lock.unlock();
- }
- }
-
- /**
- * Reset statistics
- *
- * @see org.apache.commons.jcs.engine.memory.AbstractMemoryCache#dispose()
- */
- @Override
- public void dispose() throws IOException
- {
- super.dispose();
- removeAll();
- hitCnt.set(0);
- missCnt.set(0);
- putCnt.set(0);
+ super.initialize(hub);
+ list = new DoubleLinkedList<MemoryElementDescriptor<K, V>>();
+ log.info("initialized MemoryCache for " + getCacheName());
}
/**
@@ -117,7 +81,7 @@ public abstract class AbstractDoubleLinkedListMemoryCache<K, V> extends Abstract
* @return new ConcurrentHashMap()
*/
@Override
- public Map<K, MemoryElementDescriptor<K, V>> createMap()
+ public ConcurrentMap<K, MemoryElementDescriptor<K, V>> createMap()
{
return new ConcurrentHashMap<K, MemoryElementDescriptor<K, V>>();
}
@@ -688,26 +652,12 @@ public abstract class AbstractDoubleLinkedListMemoryCache<K, V> extends Abstract
@Override
public IStats getStatistics()
{
- IStats stats = new Stats();
+ IStats stats = super.getStatistics();
stats.setTypeName( /* add algorithm name */"Memory Cache");
- ArrayList<IStatElement<?>> elems = new ArrayList<IStatElement<?>>();
-
- lock.lock(); // not sure that's really relevant here but not that important
- try
- {
- elems.add(new StatElement<Integer>("List Size", Integer.valueOf(list.size())));
- elems.add(new StatElement<Integer>("Map Size", Integer.valueOf(map.size())));
- elems.add(new StatElement<AtomicLong>("Put Count", putCnt));
- elems.add(new StatElement<AtomicLong>("Hit Count", hitCnt));
- elems.add(new StatElement<AtomicLong>("Miss Count", missCnt));
- }
- finally
- {
- lock.unlock();
- }
+ List<IStatElement<?>> elems = stats.getStatElements();
- stats.setStatElements(elems);
+ elems.add(new StatElement<Integer>("List Size", Integer.valueOf(list.size())));
return stats;
}
diff --git a/src/org/apache/commons/jcs/engine/memory/AbstractMemoryCache.java b/src/org/apache/commons/jcs/engine/memory/AbstractMemoryCache.java
index b136823..b357bbc 100644
--- a/src/org/apache/commons/jcs/engine/memory/AbstractMemoryCache.java
+++ b/src/org/apache/commons/jcs/engine/memory/AbstractMemoryCache.java
@@ -20,28 +20,28 @@ package org.apache.commons.jcs.engine.memory;
*/
import java.io.IOException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.commons.jcs.engine.CacheStatus;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
import org.apache.commons.jcs.engine.behavior.ICompositeCacheAttributes;
import org.apache.commons.jcs.engine.control.CompositeCache;
import org.apache.commons.jcs.engine.memory.behavior.IMemoryCache;
import org.apache.commons.jcs.engine.memory.util.MemoryElementDescriptor;
+import org.apache.commons.jcs.engine.stats.StatElement;
import org.apache.commons.jcs.engine.stats.Stats;
+import org.apache.commons.jcs.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs.engine.stats.behavior.IStats;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* This base includes some common code for memory caches.
- * <p>
- * This keeps a static reference to a memory shrinker clock daemon. If this region is configured to
- * use the shrinker, the clock daemon will be setup to run the shrinker on this region.
*/
public abstract class AbstractMemoryCache<K, V>
implements IMemoryCache<K, V>
@@ -49,18 +49,12 @@ public abstract class AbstractMemoryCache<K, V>
/** Log instance */
private static final Log log = LogFactory.getLog( AbstractMemoryCache.class );
- /** The region name. This defines a namespace of sorts. */
- private String cacheName;
-
/** Cache Attributes. Regions settings. */
private ICompositeCacheAttributes cacheAttributes;
/** The cache region this store is associated with */
private CompositeCache<K, V> cache;
- /** status */
- private CacheStatus status;
-
/** How many to spool at a time. */
protected int chunkSize;
@@ -69,6 +63,15 @@ public abstract class AbstractMemoryCache<K, V>
/** Map where items are stored by key. This is created by the concrete child class. */
protected Map<K, MemoryElementDescriptor<K, V>> map;// TODO privatise
+ /** number of hits */
+ protected AtomicLong hitCnt;
+
+ /** number of misses */
+ protected AtomicLong missCnt;
+
+ /** number of puts */
+ protected AtomicLong putCnt;
+
/**
* For post reflection creation initialization
* <p>
@@ -77,21 +80,15 @@ public abstract class AbstractMemoryCache<K, V>
@Override
public void initialize( CompositeCache<K, V> hub )
{
- lock.lock();
- try
- {
- this.cacheName = hub.getCacheName();
- this.cacheAttributes = hub.getCacheAttributes();
- this.cache = hub;
- map = createMap();
+ hitCnt = new AtomicLong(0);
+ missCnt = new AtomicLong(0);
+ putCnt = new AtomicLong(0);
- chunkSize = cacheAttributes.getSpoolChunkSize();
- status = CacheStatus.ALIVE;
- }
- finally
- {
- lock.unlock();
- }
+ this.cacheAttributes = hub.getCacheAttributes();
+ this.chunkSize = cacheAttributes.getSpoolChunkSize();
+ this.cache = hub;
+
+ this.map = createMap();
}
/**
@@ -173,14 +170,14 @@ public abstract class AbstractMemoryCache<K, V>
{
if ( log.isDebugEnabled() )
{
- log.debug( cacheName + ": MemoryCache quiet hit for " + key );
+ log.debug( getCacheName() + ": MemoryCache quiet hit for " + key );
}
ce = me.getCacheElement();
}
else if ( log.isDebugEnabled() )
{
- log.debug( cacheName + ": MemoryCache quiet miss for " + key );
+ log.debug( getCacheName() + ": MemoryCache quiet miss for " + key );
}
return ce;
@@ -217,7 +214,7 @@ public abstract class AbstractMemoryCache<K, V>
}
/**
- * Prepares for shutdown.
+ * Prepares for shutdown. Reset statistics
* <p>
* @throws IOException
*/
@@ -225,6 +222,10 @@ public abstract class AbstractMemoryCache<K, V>
public void dispose()
throws IOException
{
+ removeAll();
+ hitCnt.set(0);
+ missCnt.set(0);
+ putCnt.set(0);
log.info( "Memory Cache dispose called." );
}
@@ -236,6 +237,15 @@ public abstract class AbstractMemoryCache<K, V>
{
IStats stats = new Stats();
stats.setTypeName( "Abstract Memory Cache" );
+
+ ArrayList<IStatElement<?>> elems = new ArrayList<IStatElement<?>>();
+ stats.setStatElements(elems);
+
+ elems.add(new StatElement<AtomicLong>("Put Count", putCnt));
+ elems.add(new StatElement<AtomicLong>("Hit Count", hitCnt));
+ elems.add(new StatElement<AtomicLong>("Miss Count", missCnt));
+ elems.add(new StatElement<Integer>( "Map Size", Integer.valueOf(getSize()) ) );
+
return stats;
}
@@ -251,16 +261,6 @@ public abstract class AbstractMemoryCache<K, V>
}
/**
- * Returns the cache status.
- * <p>
- * @return The status value
- */
- public CacheStatus getStatus()
- {
- return this.status;
- }
-
- /**
* Returns the cache (aka "region") name.
* <p>
* @return The cacheName value
@@ -272,18 +272,16 @@ public abstract class AbstractMemoryCache<K, V>
{
return attributeCacheName;
}
- return cacheName;
+ return cache.getCacheName();
}
/**
* Puts an item to the cache.
* <p>
- * @param ce
- * @throws IOException
+ * @param ce the item
*/
@Override
public void waterfal( ICacheElement<K, V> ce )
- throws IOException
{
this.cache.spoolToDisk( ce );
}
diff --git a/src/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java b/src/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java
index 53f55c3..acb3cee 100644
--- a/src/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java
+++ b/src/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java
@@ -20,13 +20,11 @@ package org.apache.commons.jcs.engine.memory.lru;
*/
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
import org.apache.commons.jcs.engine.CacheConstants;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
@@ -35,9 +33,6 @@ import org.apache.commons.jcs.engine.control.group.GroupAttrName;
import org.apache.commons.jcs.engine.memory.AbstractMemoryCache;
import org.apache.commons.jcs.engine.memory.util.DefaultMemoryElementDescriptor;
import org.apache.commons.jcs.engine.memory.util.MemoryElementDescriptor;
-import org.apache.commons.jcs.engine.stats.StatElement;
-import org.apache.commons.jcs.engine.stats.Stats;
-import org.apache.commons.jcs.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs.engine.stats.behavior.IStats;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -51,15 +46,6 @@ public class LHMLRUMemoryCache<K, V>
/** The Logger. */
private static final Log log = LogFactory.getLog( LRUMemoryCache.class );
- /** number of hits */
- private AtomicLong hitCnt;
-
- /** number of misses */
- private AtomicLong missCnt;
-
- /** number of puts */
- private AtomicLong putCnt;
-
/**
* For post reflection creation initialization
* <p>
@@ -69,9 +55,6 @@ public class LHMLRUMemoryCache<K, V>
public void initialize( CompositeCache<K, V> hub )
{
super.initialize( hub );
- hitCnt = new AtomicLong(0);
- missCnt = new AtomicLong(0);
- putCnt = new AtomicLong(0);
log.info( "initialized LHMLRUMemoryCache for " + getCacheName() );
}
@@ -101,28 +84,6 @@ public class LHMLRUMemoryCache<K, V>
}
/**
- * Get an item from the cache without affecting its last access time or position. There is no
- * way to do this with the LinkedHashMap!
- * <p>
- * @param key Identifies item to find
- * @return Element matching key if found, or null
- * @throws IOException
- */
- @Override
- public ICacheElement<K, V> getQuiet( K key )
- throws IOException
- {
- MemoryElementDescriptor<K, V> me = map.get( key );
-
- if (me != null)
- {
- return me.getCacheElement();
- }
-
- return null;
- }
-
- /**
* Get an item from the cache
* <p>
* @param key Identifies item to find
@@ -130,7 +91,7 @@ public class LHMLRUMemoryCache<K, V>
* @throws IOException
*/
@Override
- public synchronized ICacheElement<K, V> get( K key )
+ public ICacheElement<K, V> get( K key )
throws IOException
{
if ( log.isDebugEnabled() )
@@ -171,7 +132,7 @@ public class LHMLRUMemoryCache<K, V>
* @throws IOException
*/
@Override
- public synchronized boolean remove( K key )
+ public boolean remove( K key )
throws IOException
{
if ( log.isDebugEnabled() )
@@ -240,12 +201,7 @@ public class LHMLRUMemoryCache<K, V>
@Override
public Set<K> getKeySet()
{
- // need a better locking strategy here.
- synchronized ( this )
- {
- // may need to lock to map here?
- return new LinkedHashSet<K>(map.keySet());
- }
+ return new LinkedHashSet<K>(map.keySet());
}
/**
@@ -255,23 +211,11 @@ public class LHMLRUMemoryCache<K, V>
* @return IStats
*/
@Override
- public synchronized IStats getStatistics()
+ public IStats getStatistics()
{
- IStats stats = new Stats();
+ IStats stats = super.getStatistics();
stats.setTypeName( "LHMLRU Memory Cache" );
- ArrayList<IStatElement<?>> elems = new ArrayList<IStatElement<?>>();
-
- elems.add(new StatElement<Integer>( "Map Size", Integer.valueOf(map.size()) ) );
- elems.add(new StatElement<AtomicLong>("Put Count", putCnt));
- elems.add(new StatElement<AtomicLong>("Hit Count", hitCnt));
- elems.add(new StatElement<AtomicLong>("Miss Count", missCnt));
-
- stats.setStatElements( elems );
-
- // int rate = ((hitCnt + missCnt) * 100) / (hitCnt * 100) * 100;
- // buf.append("\n Hit Rate = " + rate + " %" );
-
return stats;
}
@@ -305,7 +249,7 @@ public class LHMLRUMemoryCache<K, V>
/**
* Implementation of removeEldestEntry in LinkedHashMap
*/
- public class LHMSpooler
+ protected class LHMSpooler
extends java.util.LinkedHashMap<K, MemoryElementDescriptor<K, V>>
{
/** Don't change. */
@@ -344,7 +288,8 @@ public class LHMLRUMemoryCache<K, V>
log.debug( "LHMLRU max size: " + getCacheAttributes().getMaxObjects()
+ ". Spooling element, key: " + element.getKey() );
}
- spoolToDisk( element );
+
+ waterfal( element );
if ( log.isDebugEnabled() )
{
@@ -353,21 +298,5 @@ public class LHMLRUMemoryCache<K, V>
}
return true;
}
-
- /**
- * Puts the element in the DiskStore
- * <p>
- * @param element The CacheElement
- */
- @SuppressWarnings("synthetic-access")
- private void spoolToDisk( ICacheElement<K, V> element )
- {
- getCompositeCache().spoolToDisk( element );
-
- if ( log.isDebugEnabled() )
- {
- log.debug( getCacheName() + "Spooled element to disk: " + element.getKey() );
- }
- }
}
}
diff --git a/src/org/apache/commons/jcs/engine/memory/soft/SoftReferenceMemoryCache.java b/src/org/apache/commons/jcs/engine/memory/soft/SoftReferenceMemoryCache.java
index ea80d2f..5108c66 100644
--- a/src/org/apache/commons/jcs/engine/memory/soft/SoftReferenceMemoryCache.java
+++ b/src/org/apache/commons/jcs/engine/memory/soft/SoftReferenceMemoryCache.java
@@ -21,14 +21,14 @@ package org.apache.commons.jcs.engine.memory.soft;
import java.io.IOException;
import java.lang.ref.SoftReference;
-import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.atomic.AtomicLong;
import org.apache.commons.jcs.engine.CacheConstants;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
@@ -39,7 +39,6 @@ import org.apache.commons.jcs.engine.memory.AbstractMemoryCache;
import org.apache.commons.jcs.engine.memory.util.MemoryElementDescriptor;
import org.apache.commons.jcs.engine.memory.util.SoftReferenceElementDescriptor;
import org.apache.commons.jcs.engine.stats.StatElement;
-import org.apache.commons.jcs.engine.stats.Stats;
import org.apache.commons.jcs.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs.engine.stats.behavior.IStats;
import org.apache.commons.logging.Log;
@@ -69,15 +68,6 @@ public class SoftReferenceMemoryCache<K, V> extends AbstractMemoryCache<K, V>
*/
private LinkedBlockingQueue<ICacheElement<K, V>> strongReferences;
- /** number of hits */
- private AtomicLong hitCnt;
-
- /** number of misses */
- private AtomicLong missCnt;
-
- /** number of puts */
- private AtomicLong putCnt;
-
/**
* For post reflection creation initialization
* <p>
@@ -88,9 +78,6 @@ public class SoftReferenceMemoryCache<K, V> extends AbstractMemoryCache<K, V>
{
super.initialize( hub );
strongReferences = new LinkedBlockingQueue<ICacheElement<K, V>>();
- hitCnt = new AtomicLong(0);
- missCnt = new AtomicLong(0);
- putCnt = new AtomicLong(0);
log.info( "initialized Soft Reference Memory Cache for " + getCacheName() );
}
@@ -98,7 +85,7 @@ public class SoftReferenceMemoryCache<K, V> extends AbstractMemoryCache<K, V>
* @see org.apache.commons.jcs.engine.memory.AbstractMemoryCache#createMap()
*/
@Override
- public Map<K, MemoryElementDescriptor<K, V>> createMap()
+ public ConcurrentMap<K, MemoryElementDescriptor<K, V>> createMap()
{
return new ConcurrentHashMap<K, MemoryElementDescriptor<K, V>>();
}
@@ -148,21 +135,13 @@ public class SoftReferenceMemoryCache<K, V> extends AbstractMemoryCache<K, V>
@Override
public IStats getStatistics()
{
- ArrayList<IStatElement<?>> elems = new ArrayList<IStatElement<?>>();
-
- int size = getSize();
- int emptyrefs = map.size() - size;
+ IStats stats = super.getStatistics();
+ stats.setTypeName("Soft Reference Memory Cache");
- elems.add(new StatElement<Integer>("Size", Integer.valueOf(size)));
+ List<IStatElement<?>> elems = stats.getStatElements();
+ int emptyrefs = map.size() - getSize();
elems.add(new StatElement<Integer>("Empty References", Integer.valueOf(emptyrefs)));
elems.add(new StatElement<Integer>("Strong References", Integer.valueOf(strongReferences.size())));
- elems.add(new StatElement<AtomicLong>("Put Count", putCnt));
- elems.add(new StatElement<AtomicLong>("Hit Count", hitCnt));
- elems.add(new StatElement<AtomicLong>("Miss Count", missCnt));
-
- IStats stats = new Stats();
- stats.setTypeName("Soft Reference Memory Cache");
- stats.setStatElements(elems);
return stats;
}
@@ -301,10 +280,8 @@ public class SoftReferenceMemoryCache<K, V> extends AbstractMemoryCache<K, V>
/**
* Trim the number of strong references to equal or below the number given
* by the maxObjects parameter.
- *
- * @throws IOException
*/
- private void trimStrongReferences() throws IOException
+ private void trimStrongReferences()
{
int max = getCacheAttributes().getMaxObjects();
int startsize = strongReferences.size();
@@ -359,21 +336,6 @@ public class SoftReferenceMemoryCache<K, V> extends AbstractMemoryCache<K, V>
}
/**
- * Prepares for shutdown.
- * <p>
- * @throws IOException
- */
- @Override
- public void dispose() throws IOException
- {
- super.dispose();
- removeAll();
- hitCnt.set(0);
- missCnt.set(0);
- putCnt.set(0);
- }
-
- /**
* This can't be implemented.
* <p>
* @param numberToFree
diff --git a/src/org/apache/commons/jcs/utils/struct/AbstractLRUMap.java b/src/org/apache/commons/jcs/utils/struct/AbstractLRUMap.java
index c747f4c..9effd97 100644
--- a/src/org/apache/commons/jcs/utils/struct/AbstractLRUMap.java
+++ b/src/org/apache/commons/jcs/utils/struct/AbstractLRUMap.java
@@ -64,21 +64,19 @@ public abstract class AbstractLRUMap<K, V>
private final DoubleLinkedList<LRUElementDescriptor<K, V>> list;
/** Map where items are stored by key. */
- private Map<K, LRUElementDescriptor<K, V>> map;
+ private final Map<K, LRUElementDescriptor<K, V>> map;
- /** stats */
- int hitCnt = 0;
+ /** lock to keep map and list synchronous */
+ private final Lock lock = new ReentrantLock();
/** stats */
- int missCnt = 0;
+ private long hitCnt = 0;
/** stats */
- int putCnt = 0;
+ private long missCnt = 0;
- /** make configurable */
- private int chunkSize = 1;
-
- private final Lock lock = new ReentrantLock();
+ /** stats */
+ private long putCnt = 0;
/**
* This creates an unbounded version. Setting the max objects will result in spooling on
@@ -196,7 +194,7 @@ public abstract class AbstractLRUMap<K, V>
@Override
public V get( Object key )
{
- V retVal = null;
+ V retVal;
if ( log.isDebugEnabled() )
{
@@ -205,22 +203,28 @@ public abstract class AbstractLRUMap<K, V>
LRUElementDescriptor<K, V> me = map.get( key );
- if ( me != null )
+ if ( me == null )
+ {
+ missCnt++;
+ retVal = null;
+ }
+ else
{
hitCnt++;
- if ( log.isDebugEnabled() )
- {
- log.debug( "LRUMap hit for " + key );
- }
-
retVal = me.getPayload();
-
list.makeFirst( me );
}
- else
+
+ if ( log.isDebugEnabled() )
{
- missCnt++;
- log.debug( "LRUMap miss for " + key );
+ if ( me == null )
+ {
+ log.debug( "LRUMap miss for " + key );
+ }
+ else
+ {
+ log.debug( "LRUMap hit for " + key );
+ }
}
// verifyCache();
@@ -238,20 +242,23 @@ public abstract class AbstractLRUMap<K, V>
public V getQuiet( Object key )
{
V ce = null;
-
LRUElementDescriptor<K, V> me = map.get( key );
+
if ( me != null )
{
- if ( log.isDebugEnabled() )
- {
- log.debug( "LRUMap quiet hit for " + key );
- }
-
ce = me.getPayload();
}
- else if ( log.isDebugEnabled() )
+
+ if ( log.isDebugEnabled() )
{
- log.debug( "LRUMap quiet miss for " + key );
+ if ( me == null )
+ {
+ log.debug( "LRUMap quiet miss for " + key );
+ }
+ else
+ {
+ log.debug( "LRUMap quiet hit for " + key );
+ }
}
return ce;
@@ -300,17 +307,16 @@ public abstract class AbstractLRUMap<K, V>
putCnt++;
LRUElementDescriptor<K, V> old = null;
+ LRUElementDescriptor<K, V> me = new LRUElementDescriptor<K, V>(key, value);
+
lock.lock();
try
{
- // TODO address double synchronization of addFirst, use write lock
- addFirst( key, value );
- // this must be synchronized
- LRUElementDescriptor<K, V> first = list.getFirst();
- old = map.put(first.getKey(), first);
+ list.addFirst( me );
+ old = map.put(key, me);
// If the node was the same as an existing node, remove it.
- if ( old != null && first.getKey().equals(old.getKey()))
+ if ( old != null && key.equals(old.getKey()))
{
list.remove( old );
}
@@ -321,7 +327,6 @@ public abstract class AbstractLRUMap<K, V>
}
// If the element limit is reached, we need to spool
-
if (shouldRemove())
{
if (log.isDebugEnabled())
@@ -332,7 +337,6 @@ public abstract class AbstractLRUMap<K, V>
// The spool will put them in a disk event queue, so there is no
// need to pre-queue the queuing. This would be a bit wasteful
// and wouldn't save much time in this synchronous call.
-
while ( shouldRemove() )
{
lock.lock();
@@ -366,10 +370,10 @@ public abstract class AbstractLRUMap<K, V>
{
log.debug( "update: After spool map size: " + map.size() );
}
- if ( map.size() != dumpCacheSize() )
+ if ( map.size() != list.size() )
{
- log.error("update: After spool, size mismatch: map.size() = " + map.size() + ", linked list size = "
- + dumpCacheSize());
+ log.error("update: After spool, size mismatch: map.size() = " + map.size() +
+ ", linked list size = " + list.size());
}
}
@@ -382,37 +386,6 @@ public abstract class AbstractLRUMap<K, V>
protected abstract boolean shouldRemove();
-
- /**
- * Adds a new node to the start of the link list.
- * <p>
- * @param key
- * @param val The feature to be added to the First
- */
- private void addFirst(K key, V val)
- {
- lock.lock();
- try
- {
- LRUElementDescriptor<K, V> me = new LRUElementDescriptor<K, V>(key, val);
- list.addFirst( me );
- }
- finally
- {
- lock.unlock();
- }
- }
-
- /**
- * Returns the size of the list.
- * <p>
- * @return int
- */
- private int dumpCacheSize()
- {
- return list.size();
- }
-
/**
* Dump the cache entries from first to list for debugging.
*/
@@ -458,8 +431,8 @@ public abstract class AbstractLRUMap<K, V>
}
boolean found = false;
- log.debug( "verifycache: mapContains " + map.size() + " elements, linked list contains " + dumpCacheSize()
- + " elements" );
+ log.debug( "verifycache: mapContains " + map.size() +
+ " elements, linked list contains " + list.size() + " elements" );
log.debug( "verifycache: checking linked list by key " );
for (LRUElementDescriptor<K, V> li = list.getFirst(); li != null; li = (LRUElementDescriptor<K, V>) li.next )
{
@@ -537,37 +510,6 @@ public abstract class AbstractLRUMap<K, V>
}
/**
- * Logs an error is an element that should be in the cache is not.
- * <p>
- * @param key
- */
- @SuppressWarnings("unchecked") // No generics for public fields
- protected void verifyCache( Object key )
- {
- if ( !log.isDebugEnabled() )
- {
- return;
- }
-
- boolean found = false;
-
- // go through the linked list looking for the key
- for (LRUElementDescriptor<K, V> li = list.getFirst(); li != null; li = (LRUElementDescriptor<K, V>) li.next )
- {
- if ( li.getKey() == key )
- {
- found = true;
- log.debug( "verifycache(key) key match: " + key );
- break;
- }
- }
- if ( !found )
- {
- log.error( "verifycache(key), couldn't find key! : " + key );
- }
- }
-
- /**
* This is called when an item is removed from the LRU. We just log some information.
* <p>
* Children can implement this method for special behavior.
@@ -584,24 +526,6 @@ public abstract class AbstractLRUMap<K, V>
}
/**
- * The chunk size is the number of items to remove when the max is reached. By default it is 1.
- * <p>
- * @param chunkSize The chunkSize to set.
- */
- public void setChunkSize( int chunkSize )
- {
- this.chunkSize = chunkSize;
- }
-
- /**
- * @return Returns the chunkSize.
- */
- public int getChunkSize()
- {
- return chunkSize;
- }
-
- /**
* @return IStats
*/
public IStats getStatistics()
@@ -613,9 +537,9 @@ public abstract class AbstractLRUMap<K, V>
elems.add(new StatElement<Integer>( "List Size", Integer.valueOf(list.size()) ) );
elems.add(new StatElement<Integer>( "Map Size", Integer.valueOf(map.size()) ) );
- elems.add(new StatElement<Integer>( "Put Count", Integer.valueOf(putCnt) ) );
- elems.add(new StatElement<Integer>( "Hit Count", Integer.valueOf(hitCnt) ) );
- elems.add(new StatElement<Integer>( "Miss Count", Integer.valueOf(missCnt) ) );
+ elems.add(new StatElement<Long>( "Put Count", Long.valueOf(putCnt) ) );
+ elems.add(new StatElement<Long>( "Hit Count", Long.valueOf(hitCnt) ) );
+ elems.add(new StatElement<Long>( "Miss Count", Long.valueOf(missCnt) ) );
stats.setStatElements( elems );
diff --git a/src/org/apache/commons/jcs/utils/struct/LRUMap.java b/src/org/apache/commons/jcs/utils/struct/LRUMap.java
index fa100b2..84ff231 100644
--- a/src/org/apache/commons/jcs/utils/struct/LRUMap.java
+++ b/src/org/apache/commons/jcs/utils/struct/LRUMap.java
@@ -19,8 +19,6 @@ package org.apache.commons.jcs.utils.struct;
* under the License.
*/
-import java.util.concurrent.atomic.AtomicInteger;
-
/**
*
* @author Wiktor Niesiobędzki
@@ -32,10 +30,8 @@ import java.util.concurrent.atomic.AtomicInteger;
*/
public class LRUMap<K, V> extends AbstractLRUMap<K, V>
{
-
/** if the max is less than 0, there is no limit! */
- int maxObjects = -1;
- AtomicInteger counter = new AtomicInteger(0);
+ private int maxObjects = -1;
public LRUMap()
{
@@ -49,7 +45,7 @@ public class LRUMap<K, V> extends AbstractLRUMap<K, V>
*/
public LRUMap(int maxObjects)
{
- super();
+ this();
this.maxObjects = maxObjects;
}
@@ -58,9 +54,4 @@ public class LRUMap<K, V> extends AbstractLRUMap<K, V>
{
return maxObjects > 0 && this.size() > maxObjects;
}
-
- public Object getMaxCounter()
- {
- return maxObjects;
- }
}
diff --git a/src/org/openstreetmap/josm/Main.java b/src/org/openstreetmap/josm/Main.java
index c415c91..6a52025 100644
--- a/src/org/openstreetmap/josm/Main.java
+++ b/src/org/openstreetmap/josm/Main.java
@@ -99,6 +99,7 @@ import org.openstreetmap.josm.plugins.PluginHandler;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.I18n;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.Logging;
import org.openstreetmap.josm.tools.OpenBrowser;
import org.openstreetmap.josm.tools.OsmUrlToBounds;
@@ -107,7 +108,9 @@ import org.openstreetmap.josm.tools.PlatformHook;
import org.openstreetmap.josm.tools.PlatformHookOsx;
import org.openstreetmap.josm.tools.PlatformHookUnixoid;
import org.openstreetmap.josm.tools.PlatformHookWindows;
+import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Territories;
import org.openstreetmap.josm.tools.Utils;
/**
@@ -462,13 +465,29 @@ public abstract class Main {
private static volatile InitStatusListener initListener;
+ /**
+ * Initialization task listener.
+ */
public interface InitStatusListener {
+ /**
+ * Called when an initialization task updates its status.
+ * @param event task name
+ * @return new status
+ */
Object updateStatus(String event);
+ /**
+ * Called when an initialization task completes.
+ * @param status final status
+ */
void finish(Object status);
}
+ /**
+ * Sets initialization task listener.
+ * @param listener initialization task listener
+ */
public static void setInitStatusListener(InitStatusListener listener) {
CheckParameterUtil.ensureParameterNotNull(listener);
initListener = listener;
@@ -502,6 +521,9 @@ public abstract class Main {
registerActionShortcut(menu.help, Shortcut.registerShortcut("system:help", tr("Help"),
KeyEvent.VK_F1, Shortcut.DIRECT));
+ // This needs to be done before RightAndLefthandTraffic::initialize is called
+ new InitializationTask(tr("Initializing internal boundaries data"), Territories::initialize).call();
+
// contains several initialization tasks to be executed (in parallel) by a ExecutorService
List<Callable<Void>> tasks = new ArrayList<>();
@@ -516,6 +538,8 @@ public abstract class Main {
}
}));
+ tasks.add(new InitializationTask(tr("Initializing internal traffic data"), RightAndLefthandTraffic::initialize));
+
tasks.add(new InitializationTask(tr("Initializing validator"), OsmValidator::initialize));
tasks.add(new InitializationTask(tr("Initializing presets"), TaggingPresets::initialize));
@@ -536,7 +560,7 @@ public abstract class Main {
service.submit(OverpassTurboQueryWizard::getInstance);
service.shutdown();
} catch (InterruptedException | ExecutionException ex) {
- throw new RuntimeException(ex);
+ throw new JosmRuntimeException(ex);
}
// hooks for the jmapviewer component
@@ -646,10 +670,19 @@ public abstract class Main {
RedirectInputMap.redirect(source, contentPanePrivate);
}
+ /**
+ * Registers a {@code JosmAction} and its shortcut.
+ * @param action action defining its own shortcut
+ */
public static void registerActionShortcut(JosmAction action) {
registerActionShortcut(action, action.getShortcut());
}
+ /**
+ * Registers an action and its shortcut.
+ * @param action action to register
+ * @param shortcut shortcut to associate to {@code action}
+ */
public static void registerActionShortcut(Action action, Shortcut shortcut) {
KeyStroke keyStroke = shortcut.getKeyStroke();
if (keyStroke == null)
@@ -665,14 +698,27 @@ public abstract class Main {
contentPanePrivate.getActionMap().put(action, action);
}
+ /**
+ * Unregisters a shortcut.
+ * @param shortcut shortcut to unregister
+ */
public static void unregisterShortcut(Shortcut shortcut) {
contentPanePrivate.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).remove(shortcut.getKeyStroke());
}
+ /**
+ * Unregisters a {@code JosmAction} and its shortcut.
+ * @param action action to unregister
+ */
public static void unregisterActionShortcut(JosmAction action) {
unregisterActionShortcut(action, action.getShortcut());
}
+ /**
+ * Unregisters an action and its shortcut.
+ * @param action action to unregister
+ * @param shortcut shortcut to unregister
+ */
public static void unregisterActionShortcut(Action action, Shortcut shortcut) {
unregisterShortcut(shortcut);
contentPanePrivate.getActionMap().remove(action);
@@ -1084,15 +1130,9 @@ public abstract class Main {
public static void removeProjectionChangeListener(ProjectionChangeListener listener) {
if (listener == null) return;
synchronized (Main.class) {
- Iterator<WeakReference<ProjectionChangeListener>> it = listeners.iterator();
- while (it.hasNext()) {
- WeakReference<ProjectionChangeListener> wr = it.next();
- // remove the listener - and any other listener which got garbage
- // collected in the meantime
- if (wr.get() == null || wr.get() == listener) {
- it.remove();
- }
- }
+ // remove the listener - and any other listener which got garbage
+ // collected in the meantime
+ listeners.removeIf(wr -> wr.get() == null || wr.get() == listener);
}
}
@@ -1148,15 +1188,9 @@ public abstract class Main {
public static void removeWindowSwitchListener(WindowSwitchListener listener) {
if (listener == null) return;
synchronized (Main.class) {
- Iterator<WeakReference<WindowSwitchListener>> it = windowSwitchListeners.iterator();
- while (it.hasNext()) {
- WeakReference<WindowSwitchListener> wr = it.next();
- // remove the listener - and any other listener which got garbage
- // collected in the meantime
- if (wr.get() == null || wr.get() == listener) {
- it.remove();
- }
- }
+ // remove the listener - and any other listener which got garbage
+ // collected in the meantime
+ windowSwitchListeners.removeIf(wr -> wr.get() == null || wr.get() == listener);
if (windowSwitchListeners.isEmpty()) {
MasterWindowListener.teardown();
}
@@ -1385,14 +1419,27 @@ public abstract class Main {
}
/**
+ * Returns the OSM website URL depending on the selected {@link OsmApi}.
+ * @return the OSM website URL depending on the selected {@link OsmApi}
+ */
+ private static String getOSMWebsiteDependingOnSelectedApi() {
+ final String api = OsmApi.getOsmApi().getServerUrl();
+ if (OsmApi.DEFAULT_API_URL.equals(api)) {
+ return getOSMWebsite();
+ } else {
+ return api.replaceAll("/api$", "");
+ }
+ }
+
+ /**
* Replies the base URL for browsing information about a primitive.
* @return the base URL, i.e. https://www.openstreetmap.org
* @since 7678
*/
public static String getBaseBrowseUrl() {
if (Main.pref != null)
- return Main.pref.get("osm-browse.url", getOSMWebsite());
- return getOSMWebsite();
+ return Main.pref.get("osm-browse.url", getOSMWebsiteDependingOnSelectedApi());
+ return getOSMWebsiteDependingOnSelectedApi();
}
/**
@@ -1402,8 +1449,8 @@ public abstract class Main {
*/
public static String getBaseUserUrl() {
if (Main.pref != null)
- return Main.pref.get("osm-user.url", getOSMWebsite() + "/user");
- return getOSMWebsite() + "/user";
+ return Main.pref.get("osm-user.url", getOSMWebsiteDependingOnSelectedApi() + "/user");
+ return getOSMWebsiteDependingOnSelectedApi() + "/user";
}
/**
diff --git a/src/org/openstreetmap/josm/actions/AbstractInfoAction.java b/src/org/openstreetmap/josm/actions/AbstractInfoAction.java
index 181ae2b..efa1019 100644
--- a/src/org/openstreetmap/josm/actions/AbstractInfoAction.java
+++ b/src/org/openstreetmap/josm/actions/AbstractInfoAction.java
@@ -7,13 +7,13 @@ import static org.openstreetmap.josm.tools.I18n.trn;
import java.awt.event.ActionEvent;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import javax.swing.JOptionPane;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.notes.Note;
+import org.openstreetmap.josm.data.osm.AbstractPrimitive;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
@@ -108,12 +108,7 @@ public abstract class AbstractInfoAction extends JosmAction {
// filter out new primitives which are not yet uploaded to the server
//
- Iterator<OsmPrimitive> it = primitivesToShow.iterator();
- while (it.hasNext()) {
- if (it.next().isNew()) {
- it.remove();
- }
- }
+ primitivesToShow.removeIf(AbstractPrimitive::isNew);
if (primitivesToShow.isEmpty() && noteToShow == null) {
JOptionPane.showMessageDialog(
diff --git a/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java b/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
index b6caa75..94f8ad1 100644
--- a/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
+++ b/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
@@ -22,6 +22,7 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.imagery.DefaultLayer;
import org.openstreetmap.josm.data.imagery.ImageryInfo;
import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
import org.openstreetmap.josm.data.imagery.WMTSTileSource;
@@ -44,6 +45,18 @@ import org.openstreetmap.josm.tools.ImageProvider;
public class AddImageryLayerAction extends JosmAction implements AdaptableAction {
private final transient ImageryInfo info;
+ static class SelectWmsLayersDialog extends ExtendedDialog {
+ SelectWmsLayersDialog(WMSLayerTree tree, JComboBox<String> formats) {
+ super(Main.parent, tr("Select WMS layers"), new String[]{tr("Add layers"), tr("Cancel")});
+ final JScrollPane scrollPane = new JScrollPane(tree.getLayerTree());
+ scrollPane.setPreferredSize(new Dimension(400, 400));
+ final JPanel panel = new JPanel(new GridBagLayout());
+ panel.add(scrollPane, GBC.eol().fill());
+ panel.add(formats, GBC.eol().fill(GBC.HORIZONTAL));
+ setContent(panel);
+ }
+ }
+
/**
* Constructs a new {@code AddImageryLayerAction} for the given {@code ImageryInfo}.
* If an http:// icon is specified, it is fetched asynchronously.
@@ -81,10 +94,10 @@ public class AddImageryLayerAction extends JosmAction implements AdaptableAction
return getWMSLayerInfo();
case WMTS:
// specify which layer to use
- String layerId = new WMTSTileSource(info).userSelectLayer();
+ DefaultLayer layerId = new WMTSTileSource(info).userSelectLayer();
if (layerId != null) {
ImageryInfo copy = new ImageryInfo(info);
- Collection<String> defaultLayers = new ArrayList<>(1);
+ Collection<DefaultLayer> defaultLayers = new ArrayList<>(1);
defaultLayers.add(layerId);
copy.setDefaultLayers(defaultLayers);
return copy;
@@ -149,17 +162,8 @@ public class AddImageryLayerAction extends JosmAction implements AdaptableAction
formats.setSelectedItem(wms.getPreferredFormats());
formats.setToolTipText(tr("Select image format for WMS layer"));
- if (!GraphicsEnvironment.isHeadless()) {
- if (1 != new ExtendedDialog(Main.parent, tr("Select WMS layers"), new String[]{tr("Add layers"), tr("Cancel")}) { {
- final JScrollPane scrollPane = new JScrollPane(tree.getLayerTree());
- scrollPane.setPreferredSize(new Dimension(400, 400));
- final JPanel panel = new JPanel(new GridBagLayout());
- panel.add(scrollPane, GBC.eol().fill());
- panel.add(formats, GBC.eol().fill(GBC.HORIZONTAL));
- setContent(panel);
- } }.showDialog().getValue()) {
- return null;
- }
+ if (!GraphicsEnvironment.isHeadless() && 1 != new SelectWmsLayersDialog(tree, formats).showDialog().getValue()) {
+ return null;
}
final String url = wms.buildGetMapUrl(
diff --git a/src/org/openstreetmap/josm/actions/AutoScaleAction.java b/src/org/openstreetmap/josm/actions/AutoScaleAction.java
index 62447db..f7605e6 100644
--- a/src/org/openstreetmap/josm/actions/AutoScaleAction.java
+++ b/src/org/openstreetmap/josm/actions/AutoScaleAction.java
@@ -14,6 +14,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import javax.swing.JOptionPane;
import javax.swing.event.ListSelectionListener;
@@ -233,7 +234,7 @@ public class AutoScaleAction extends JosmAction {
switch (mode) {
case "problem":
- return modeProblem(v);
+ return modeProblem((ValidatorBoundingXYVisitor) v);
case "data":
return modeData(v);
case "layer":
@@ -248,11 +249,11 @@ public class AutoScaleAction extends JosmAction {
}
}
- private static BoundingXYVisitor modeProblem(BoundingXYVisitor v) {
+ private static BoundingXYVisitor modeProblem(ValidatorBoundingXYVisitor v) {
TestError error = Main.map.validatorDialog.getSelectedError();
if (error == null)
return null;
- ((ValidatorBoundingXYVisitor) v).visit(error);
+ v.visit(error);
if (v.getBounds() == null)
return null;
v.enlargeBoundingBox(Main.pref.getDouble("validator.zoom-enlarge-bbox", 0.0002));
@@ -311,7 +312,8 @@ public class AutoScaleAction extends JosmAction {
}
private BoundingXYVisitor modeDownload(BoundingXYVisitor v) {
- if (lastZoomTime > 0 && System.currentTimeMillis() - lastZoomTime > Main.pref.getLong("zoom.bounds.reset.time", 10L*1000L)) {
+ if (lastZoomTime > 0 &&
+ System.currentTimeMillis() - lastZoomTime > Main.pref.getLong("zoom.bounds.reset.time", TimeUnit.SECONDS.toMillis(10))) {
lastZoomTime = -1;
}
final DataSet dataset = getLayerManager().getEditDataSet();
diff --git a/src/org/openstreetmap/josm/actions/CombineWayAction.java b/src/org/openstreetmap/josm/actions/CombineWayAction.java
index 4d3bb3f..f8fc816 100644
--- a/src/org/openstreetmap/josm/actions/CombineWayAction.java
+++ b/src/org/openstreetmap/josm/actions/CombineWayAction.java
@@ -149,7 +149,7 @@ public class CombineWayAction extends JosmAction {
if (reversedWays.size() > unreversedWays.size()) {
Collections.reverse(path);
List<Way> tempWays = unreversedWays;
- unreversedWays = reversedWays;
+ unreversedWays = null;
reversedWays = tempWays;
}
// if there are still reversed ways with direction-dependent tags, reverse their tags
diff --git a/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java b/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java
index f13f2db..a2b898b 100644
--- a/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java
+++ b/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java
@@ -50,7 +50,7 @@ public class CopyCoordinatesAction extends JosmAction {
private Collection<Node> getSelectedNodes() {
DataSet ds = getLayerManager().getEditDataSet();
- if (ds == null || ds.getSelected() == null) {
+ if (ds == null) {
return Collections.emptyList();
} else {
return Utils.filteredCollection(ds.getSelected(), Node.class);
diff --git a/src/org/openstreetmap/josm/actions/ExpertToggleAction.java b/src/org/openstreetmap/josm/actions/ExpertToggleAction.java
index 7b12bae..bc9f90a 100644
--- a/src/org/openstreetmap/josm/actions/ExpertToggleAction.java
+++ b/src/org/openstreetmap/josm/actions/ExpertToggleAction.java
@@ -5,12 +5,10 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Component;
import java.awt.event.ActionEvent;
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
+import org.openstreetmap.josm.tools.ListenerList;
/**
* This action toggles the Expert mode.
@@ -18,37 +16,29 @@ import org.openstreetmap.josm.Main;
*/
public class ExpertToggleAction extends ToggleAction {
+ /**
+ * This listener is notified whenever the expert mode setting changed.
+ */
@FunctionalInterface
public interface ExpertModeChangeListener {
+ /**
+ * The expert mode changed.
+ * @param isExpert <code>true</code> if expert mode was enabled, false otherwise.
+ */
void expertChanged(boolean isExpert);
}
- private static final List<WeakReference<ExpertModeChangeListener>> listeners = new ArrayList<>();
- private static final List<WeakReference<Component>> visibilityToggleListeners = new ArrayList<>();
+ // TODO: Switch to checked list. We can do this as soon as we do not see any more warnings.
+ private static final ListenerList<ExpertModeChangeListener> listeners = ListenerList.createUnchecked();
+ private static final ListenerList<Component> visibilityToggleListeners = ListenerList.createUnchecked();
+
+ private static final BooleanProperty PREF_EXPERT = new BooleanProperty("expert", false);
private static final ExpertToggleAction INSTANCE = new ExpertToggleAction();
private static synchronized void fireExpertModeChanged(boolean isExpert) {
- Iterator<WeakReference<ExpertModeChangeListener>> it1 = listeners.iterator();
- while (it1.hasNext()) {
- WeakReference<ExpertModeChangeListener> wr = it1.next();
- ExpertModeChangeListener listener = wr.get();
- if (listener == null) {
- it1.remove();
- continue;
- }
- listener.expertChanged(isExpert);
- }
- Iterator<WeakReference<Component>> it2 = visibilityToggleListeners.iterator();
- while (it2.hasNext()) {
- WeakReference<Component> wr = it2.next();
- Component c = wr.get();
- if (c == null) {
- it2.remove();
- continue;
- }
- c.setVisible(isExpert);
- }
+ listeners.fireEvent(listener -> listener.expertChanged(isExpert));
+ visibilityToggleListeners.fireEvent(c -> c.setVisible(isExpert));
}
/**
@@ -62,11 +52,7 @@ public class ExpertToggleAction extends ToggleAction {
public static synchronized void addExpertModeChangeListener(ExpertModeChangeListener listener, boolean fireWhenAdding) {
if (listener == null) return;
- for (WeakReference<ExpertModeChangeListener> wr : listeners) {
- // already registered ? => abort
- if (wr.get() == listener) return;
- }
- listeners.add(new WeakReference<>(listener));
+ listeners.addWeakListener(listener);
if (fireWhenAdding) {
listener.expertChanged(isExpert());
}
@@ -79,38 +65,27 @@ public class ExpertToggleAction extends ToggleAction {
*/
public static synchronized void removeExpertModeChangeListener(ExpertModeChangeListener listener) {
if (listener == null) return;
- Iterator<WeakReference<ExpertModeChangeListener>> it = listeners.iterator();
- while (it.hasNext()) {
- WeakReference<ExpertModeChangeListener> wr = it.next();
- // remove the listener - and any other listener which god garbage
- // collected in the meantime
- if (wr.get() == null || wr.get() == listener) {
- it.remove();
- }
- }
+ listeners.removeListener(listener);
}
+ /**
+ * Marks a component to be only visible when expert mode is enabled. The visibility of the component is changed automatically.
+ * @param c The component.
+ */
public static synchronized void addVisibilitySwitcher(Component c) {
if (c == null) return;
- for (WeakReference<Component> wr : visibilityToggleListeners) {
- // already registered ? => abort
- if (wr.get() == c) return;
- }
- visibilityToggleListeners.add(new WeakReference<>(c));
+ visibilityToggleListeners.addWeakListener(c);
c.setVisible(isExpert());
}
+ /**
+ * Stops tracking visibility changes for the given component.
+ * @param c The component.
+ * @see #addVisibilitySwitcher(Component)
+ */
public static synchronized void removeVisibilitySwitcher(Component c) {
if (c == null) return;
- Iterator<WeakReference<Component>> it = visibilityToggleListeners.iterator();
- while (it.hasNext()) {
- WeakReference<Component> wr = it.next();
- // remove the listener - and any other listener which god garbage
- // collected in the meantime
- if (wr.get() == null || wr.get() == c) {
- it.remove();
- }
- }
+ visibilityToggleListeners.removeListener(c);
}
/**
@@ -127,20 +102,32 @@ public class ExpertToggleAction extends ToggleAction {
if (Main.toolbar != null) {
Main.toolbar.register(this);
}
- setSelected(Main.pref.getBoolean("expert", false));
+ setSelected(PREF_EXPERT.get());
notifySelectedState();
}
@Override
protected final void notifySelectedState() {
super.notifySelectedState();
+ PREF_EXPERT.put(isSelected());
fireExpertModeChanged(isSelected());
}
+ /**
+ * Forces the expert mode state to the given state.
+ * @param isExpert if expert mode should be used.
+ * @since 11224
+ */
+ public void setExpert(boolean isExpert) {
+ if (isSelected() != isExpert) {
+ setSelected(isExpert);
+ notifySelectedState();
+ }
+ }
+
@Override
public void actionPerformed(ActionEvent e) {
toggleSelectedState(e);
- Main.pref.put("expert", isSelected());
notifySelectedState();
}
diff --git a/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java b/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java
index ea8402e..0044285 100644
--- a/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java
+++ b/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java
@@ -43,7 +43,7 @@ public class FullscreenToggleAction extends ToggleAction {
putValue("help", ht("/Action/FullscreenView"));
putValue("toolbar", "fullscreen");
Main.toolbar.register(this);
- gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
+ gd = GraphicsEnvironment.isHeadless() ? null : GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
setSelected(Main.pref.getBoolean("draw.fullscreen", false));
notifySelectedState();
}
@@ -78,12 +78,14 @@ public class FullscreenToggleAction extends ToggleAction {
boolean selected = isSelected();
- frame.dispose();
- frame.setUndecorated(selected);
+ if (frame != null) {
+ frame.dispose();
+ frame.setUndecorated(selected);
- if (selected) {
- prevBounds = frame.getBounds();
- frame.setBounds(new Rectangle(GuiHelper.getScreenSize()));
+ if (selected) {
+ prevBounds = frame.getBounds();
+ frame.setBounds(new Rectangle(GuiHelper.getScreenSize()));
+ }
}
// we cannot use hw-exclusive fullscreen mode in MS-Win, as long
@@ -93,19 +95,23 @@ public class FullscreenToggleAction extends ToggleAction {
// since windows (or java?) draws the undecorated window full-
// screen by default (it's a simulated mode, but should be ok)
String exclusive = Main.pref.get("draw.fullscreen.exclusive-mode", "auto");
- if ("true".equals(exclusive) || ("auto".equals(exclusive) && !Main.isPlatformWindows())) {
+ if (("true".equals(exclusive) || ("auto".equals(exclusive) && !Main.isPlatformWindows())) && gd != null) {
gd.setFullScreenWindow(selected ? frame : null);
}
- if (!selected && prevBounds != null) {
+ if (!selected && prevBounds != null && frame != null) {
frame.setBounds(prevBounds);
}
for (Window wind : visibleWindows) {
- wind.setVisible(true);
+ if (wind != null) {
+ wind.setVisible(true);
+ }
}
// Free F10 key to allow it to be used by plugins, even after full screen (see #7502)
- frame.getJMenuBar().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_F10, 0), "none");
+ if (frame != null) {
+ frame.getJMenuBar().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_F10, 0), "none");
+ }
}
}
diff --git a/src/org/openstreetmap/josm/actions/JoinAreasAction.java b/src/org/openstreetmap/josm/actions/JoinAreasAction.java
index 995a9df..50af06c 100644
--- a/src/org/openstreetmap/josm/actions/JoinAreasAction.java
+++ b/src/org/openstreetmap/josm/actions/JoinAreasAction.java
@@ -42,7 +42,9 @@ import org.openstreetmap.josm.data.osm.TagCollection;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.tools.Geometry;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.Pair;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.UserCancelException;
@@ -64,19 +66,64 @@ public class JoinAreasAction extends JosmAction {
*/
public static class JoinAreasResult {
- public boolean hasChanges;
+ private final boolean hasChanges;
+ private final List<Multipolygon> polygons;
- public List<Multipolygon> polygons;
+ /**
+ * Constructs a new {@code JoinAreasResult}.
+ * @param hasChanges whether the result has changes
+ * @param polygons the result polygons, can be null
+ */
+ public JoinAreasResult(boolean hasChanges, List<Multipolygon> polygons) {
+ this.hasChanges = hasChanges;
+ this.polygons = polygons;
+ }
+
+ /**
+ * Determines if the result has changes.
+ * @return {@code true} if the result has changes
+ */
+ public final boolean hasChanges() {
+ return hasChanges;
+ }
+
+ /**
+ * Returns the result polygons, can be null.
+ * @return the result polygons, can be null
+ */
+ public final List<Multipolygon> getPolygons() {
+ return polygons;
+ }
}
public static class Multipolygon {
- public Way outerWay;
- public List<Way> innerWays;
+ private final Way outerWay;
+ private final List<Way> innerWays;
+ /**
+ * Constructs a new {@code Multipolygon}.
+ * @param way outer way
+ */
public Multipolygon(Way way) {
outerWay = way;
innerWays = new ArrayList<>();
}
+
+ /**
+ * Returns the outer way.
+ * @return the outer way
+ */
+ public final Way getOuterWay() {
+ return outerWay;
+ }
+
+ /**
+ * Returns the inner ways.
+ * @return the inner ways
+ */
+ public final List<Way> getInnerWays() {
+ return innerWays;
+ }
}
// HelperClass
@@ -540,10 +587,9 @@ public class JoinAreasAction extends JosmAction {
* @return new area formed.
* @throws UserCancelException if user cancels the operation
*/
- private JoinAreasResult joinAreas(List<Multipolygon> areas) throws UserCancelException {
+ public JoinAreasResult joinAreas(List<Multipolygon> areas) throws UserCancelException {
- JoinAreasResult result = new JoinAreasResult();
- result.hasChanges = false;
+ boolean hasChanges = false;
List<Way> allStartingWays = new ArrayList<>();
List<Way> innerStartingWays = new ArrayList<>();
@@ -562,7 +608,7 @@ public class JoinAreasAction extends JosmAction {
removedDuplicates |= removeDuplicateNodes(allStartingWays);
if (removedDuplicates) {
- result.hasChanges = true;
+ hasChanges = true;
commitCommands(marktr("Removed duplicate nodes"));
}
@@ -571,7 +617,7 @@ public class JoinAreasAction extends JosmAction {
//no intersections, return.
if (nodes.isEmpty())
- return result;
+ return new JoinAreasResult(hasChanges, null);
commitCommands(marktr("Added node on all intersections"));
List<RelationRole> relations = new ArrayList<>();
@@ -652,9 +698,7 @@ public class JoinAreasAction extends JosmAction {
.show();
}
- result.hasChanges = true;
- result.polygons = polygons;
- return result;
+ return new JoinAreasResult(true, polygons);
}
/**
@@ -758,11 +802,10 @@ public class JoinAreasAction extends JosmAction {
case 0:
return;
case 1:
- Main.main.undoRedo.add(cmds.getFirst());
+ commitCommand(cmds.getFirst());
break;
default:
- Command c = new SequenceCommand(tr(description), cmds);
- Main.main.undoRedo.add(c);
+ commitCommand(new SequenceCommand(tr(description), cmds));
break;
}
@@ -770,6 +813,14 @@ public class JoinAreasAction extends JosmAction {
cmdsCount++;
}
+ private static void commitCommand(Command c) {
+ if (Main.main != null) {
+ Main.main.undoRedo.add(c);
+ } else {
+ c.executeCommand();
+ }
+ }
+
/**
* This method analyzes the way and assigns each part what direction polygon "inside" is.
* @param parts the split parts of the way
@@ -1085,18 +1136,12 @@ public class JoinAreasAction extends JosmAction {
*/
public static List<AssembledPolygon> findBoundaryPolygons(Collection<WayInPolygon> multigonWays,
List<Way> discardedResult) {
- //first find all discardable ways, by getting outer shells.
- //this will produce incorrect boundaries in some cases, but second pass will fix it.
- List<WayInPolygon> discardedWays = new ArrayList<>();
-
// In multigonWays collection, some way are just a point (i.e. way like nodeA-nodeA)
// This seems to appear when is apply over invalid way like #9911 test-case
// Remove all of these way to make the next work.
List<WayInPolygon> cleanMultigonWays = new ArrayList<>();
for (WayInPolygon way: multigonWays) {
- if (way.way.getNodesCount() == 2 && way.way.isClosed())
- discardedWays.add(way);
- else
+ if (way.way.getNodesCount() != 2 || !way.way.isClosed())
cleanMultigonWays.add(way);
}
@@ -1122,7 +1167,7 @@ public class JoinAreasAction extends JosmAction {
}
WayInPolygon nextWay = traverser.walk();
if (nextWay == null)
- throw new RuntimeException("Join areas internal error.");
+ throw new JosmRuntimeException("Join areas internal error.");
if (path.get(0) == nextWay) {
// path is closed -> stop here
AssembledPolygon ring = new AssembledPolygon(path);
@@ -1177,7 +1222,7 @@ public class JoinAreasAction extends JosmAction {
WayInPolygon nextWay;
while ((nextWay = traverser.walk()) != startWay) {
if (nextWay == null)
- throw new RuntimeException("Join areas internal error.");
+ throw new JosmRuntimeException("Join areas internal error.");
simpleRingWays.add(nextWay);
}
traverser.removeWays(simpleRingWays);
@@ -1213,7 +1258,7 @@ public class JoinAreasAction extends JosmAction {
/**
* Joins the lists of ways.
- * @param polygon The list of outer ways that belong to that multigon.
+ * @param polygon The list of outer ways that belong to that multipolygon.
* @return The newly created outer way
* @throws UserCancelException if user cancels the operation
*/
@@ -1251,7 +1296,7 @@ public class JoinAreasAction extends JosmAction {
//should not happen
if (joinedWay == null || !joinedWay.isClosed())
- throw new RuntimeException("Join areas internal error.");
+ throw new JosmRuntimeException("Join areas internal error.");
return joinedWay;
}
@@ -1277,14 +1322,14 @@ public class JoinAreasAction extends JosmAction {
if (!way.insideToTheRight) {
ReverseWayResult res = ReverseWayAction.reverseWay(way.way);
- Main.main.undoRedo.add(res.getReverseCommand());
+ commitCommand(res.getReverseCommand());
cmdsCount++;
}
}
Pair<Way, Command> result = CombineWayAction.combineWaysWorker(actionWays);
- Main.main.undoRedo.add(result.b);
+ commitCommand(result.b);
cmdsCount++;
return result.a;
@@ -1295,7 +1340,7 @@ public class JoinAreasAction extends JosmAction {
* @param selectedWays the selected ways
* @return list of polygons, or null if too complex relation encountered.
*/
- private static List<Multipolygon> collectMultipolygons(Collection<Way> selectedWays) {
+ public static List<Multipolygon> collectMultipolygons(Collection<Way> selectedWays) {
List<Multipolygon> result = new ArrayList<>();
@@ -1403,13 +1448,15 @@ public class JoinAreasAction extends JosmAction {
*/
private RelationRole addOwnMultipolygonRelation(Collection<Way> inner) {
if (inner.isEmpty()) return null;
+ OsmDataLayer layer = Main.getLayerManager().getEditLayer();
// Create new multipolygon relation and add all inner ways to it
Relation newRel = new Relation();
newRel.put("type", "multipolygon");
for (Way w : inner) {
newRel.addMember(new RelationMember("inner", w));
}
- cmds.add(new AddCommand(newRel));
+ cmds.add(layer != null ? new AddCommand(layer, newRel) :
+ new AddCommand(inner.iterator().next().getDataSet(), newRel));
addedRelations.add(newRel);
// We don't add outer to the relation because it will be handed to fixRelations()
@@ -1425,7 +1472,7 @@ public class JoinAreasAction extends JosmAction {
private List<RelationRole> removeFromAllRelations(OsmPrimitive osm) {
List<RelationRole> result = new ArrayList<>();
- for (Relation r : Main.getLayerManager().getEditDataSet().getRelations()) {
+ for (Relation r : osm.getDataSet().getRelations()) {
if (r.isDeleted()) {
continue;
}
@@ -1479,6 +1526,7 @@ public class JoinAreasAction extends JosmAction {
cmds.add(new ChangeCommand(r.rel, newRel));
}
+ OsmDataLayer layer = Main.getLayerManager().getEditLayer();
Relation newRel;
switch (multiouters.size()) {
case 0:
@@ -1507,7 +1555,7 @@ public class JoinAreasAction extends JosmAction {
relationsToDelete.add(r.rel);
}
newRel.addMember(new RelationMember("outer", outer));
- cmds.add(new AddCommand(newRel));
+ cmds.add(layer != null ? new AddCommand(layer, newRel) : new AddCommand(outer.getDataSet(), newRel));
}
}
@@ -1531,15 +1579,17 @@ public class JoinAreasAction extends JosmAction {
* @param message The commit message to display
*/
private void makeCommitsOneAction(String message) {
- UndoRedoHandler ur = Main.main.undoRedo;
cmds.clear();
- int i = Math.max(ur.commands.size() - cmdsCount, 0);
- for (; i < ur.commands.size(); i++) {
- cmds.add(ur.commands.get(i));
- }
+ if (Main.main != null) {
+ UndoRedoHandler ur = Main.main.undoRedo;
+ int i = Math.max(ur.commands.size() - cmdsCount, 0);
+ for (; i < ur.commands.size(); i++) {
+ cmds.add(ur.commands.get(i));
+ }
- for (i = 0; i < cmds.size(); i++) {
- ur.undo();
+ for (i = 0; i < cmds.size(); i++) {
+ ur.undo();
+ }
}
commitCommands(message == null ? marktr("Join Areas Function") : message);
diff --git a/src/org/openstreetmap/josm/actions/JumpToAction.java b/src/org/openstreetmap/josm/actions/JumpToAction.java
index 260ae91..23f588f 100644
--- a/src/org/openstreetmap/josm/actions/JumpToAction.java
+++ b/src/org/openstreetmap/josm/actions/JumpToAction.java
@@ -8,6 +8,7 @@ import java.awt.BorderLayout;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
+import java.util.Optional;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
@@ -18,8 +19,11 @@ import javax.swing.event.DocumentListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.OsmUrlToBounds;
@@ -31,6 +35,11 @@ import org.openstreetmap.josm.tools.Shortcut;
*/
public class JumpToAction extends JosmAction {
+ private final JosmTextField url = new JosmTextField();
+ private final JosmTextField lat = new JosmTextField();
+ private final JosmTextField lon = new JosmTextField();
+ private final JosmTextField zm = new JosmTextField();
+
/**
* Constructs a new {@code JumpToAction}.
*/
@@ -41,10 +50,13 @@ public class JumpToAction extends JosmAction {
putValue("help", ht("/Action/JumpToPosition"));
}
- private final JosmTextField url = new JosmTextField();
- private final JosmTextField lat = new JosmTextField();
- private final JosmTextField lon = new JosmTextField();
- private final JosmTextField zm = new JosmTextField();
+ static class JumpToPositionDialog extends ExtendedDialog {
+ JumpToPositionDialog(String[] buttons, JPanel panel) {
+ super(Main.parent, tr("Jump to Position"), buttons);
+ setContent(panel);
+ setCancelButton(2);
+ }
+ }
class OsmURLListener implements DocumentListener {
@Override
@@ -88,12 +100,15 @@ public class JumpToAction extends JosmAction {
return;
}
MapView mv = Main.map.mapView;
- LatLon curPos = mv.getProjection().eastNorth2latlon(mv.getCenter());
- lat.setText(Double.toString(curPos.lat()));
- lon.setText(Double.toString(curPos.lon()));
- double dist = mv.getDist100Pixel();
- zm.setText(Long.toString(Math.round(dist*100)/100));
+ final Optional<Bounds> boundsFromClipboard = Optional
+ .ofNullable(ClipboardUtils.getClipboardStringContent())
+ .map(OsmUrlToBounds::parse);
+ if (boundsFromClipboard.isPresent()) {
+ setBounds(boundsFromClipboard.get());
+ } else {
+ setBounds(mv.getState().getViewArea().getCornerBounds());
+ }
updateUrl(true);
JPanel panel = new JPanel(new BorderLayout());
@@ -111,6 +126,11 @@ public class JumpToAction extends JosmAction {
zm.getDocument().addDocumentListener(x);
url.getDocument().addDocumentListener(new OsmURLListener());
+ SelectAllOnFocusGainedDecorator.decorate(lat);
+ SelectAllOnFocusGainedDecorator.decorate(lon);
+ SelectAllOnFocusGainedDecorator.decorate(zm);
+ SelectAllOnFocusGainedDecorator.decorate(url);
+
JPanel p = new JPanel(new GridBagLayout());
panel.add(p, BorderLayout.NORTH);
@@ -126,21 +146,13 @@ public class JumpToAction extends JosmAction {
p.add(new JLabel(tr("URL")), GBC.eol());
p.add(url, GBC.eol().fill(GBC.HORIZONTAL));
- Object[] buttons = {tr("Jump there"), tr("Cancel")};
+ String[] buttons = {tr("Jump there"), tr("Cancel")};
LatLon ll = null;
double zoomLvl = 100;
while (ll == null) {
- int option = JOptionPane.showOptionDialog(
- Main.parent,
- panel,
- tr("Jump to Position"),
- JOptionPane.OK_CANCEL_OPTION,
- JOptionPane.PLAIN_MESSAGE,
- null,
- buttons,
- buttons[0]);
-
- if (option != JOptionPane.OK_OPTION) return;
+ final int option = new JumpToPositionDialog(buttons, panel).showDialog().getValue();
+
+ if (option != 1) return;
try {
zoomLvl = Double.parseDouble(zm.getText());
ll = new LatLon(Double.parseDouble(lat.getText()), Double.parseDouble(lon.getText()));
@@ -155,7 +167,7 @@ public class JumpToAction extends JosmAction {
}
}
- double zoomFactor = 1/dist;
+ double zoomFactor = 1/ mv.getDist100Pixel();
mv.zoomToFactor(mv.getProjection().latlon2eastNorth(ll), zoomFactor * zoomLvl);
}
@@ -163,27 +175,15 @@ public class JumpToAction extends JosmAction {
if (!url.hasFocus()) return;
String urlText = url.getText();
Bounds b = OsmUrlToBounds.parse(urlText);
- if (b != null) {
- lat.setText(Double.toString((b.getMinLat() + b.getMaxLat())/2));
- lon.setText(Double.toString((b.getMinLon() + b.getMaxLon())/2));
-
- int zoomLvl = 16;
- int hashIndex = urlText.indexOf("#map");
- if (hashIndex >= 0) {
- zoomLvl = Integer.parseInt(urlText.substring(hashIndex+5, urlText.indexOf('/', hashIndex)));
- } else {
- String[] args = urlText.substring(urlText.indexOf('?')+1).split("&");
- for (String arg : args) {
- int eq = arg.indexOf('=');
- if (eq == -1 || !"zoom".equalsIgnoreCase(arg.substring(0, eq))) continue;
-
- zoomLvl = Integer.parseInt(arg.substring(eq + 1));
- break;
- }
- }
+ setBounds(b);
+ }
- // 10 000 000 = 10 000 * 1000 = World * (km -> m)
- zm.setText(Double.toString(Math.round(10000000d * Math.pow(2d, (-1d) * zoomLvl))));
+ private void setBounds(Bounds b) {
+ if (b != null) {
+ final LatLon center = b.getCenter();
+ lat.setText(Double.toString(center.lat()));
+ lon.setText(Double.toString(center.lon()));
+ zm.setText(Double.toString(OsmUrlToBounds.getZoom(b)));
}
}
@@ -192,14 +192,8 @@ public class JumpToAction extends JosmAction {
try {
double dlat = Double.parseDouble(lat.getText());
double dlon = Double.parseDouble(lon.getText());
- double m = Double.parseDouble(zm.getText());
- // Inverse function to the one above. 18 is the current maximum zoom
- // available on standard renderers, so choose this is in case m should be zero
- int zoomLvl = 18;
- if (m > 0)
- zoomLvl = (int) Math.round((-1) * Math.log(m/10_000_000)/Math.log(2));
-
- url.setText(OsmUrlToBounds.getURL(dlat, dlon, zoomLvl));
+ double zoomLvl = Double.parseDouble(zm.getText());
+ url.setText(OsmUrlToBounds.getURL(dlat, dlon, (int) zoomLvl));
} catch (NumberFormatException x) {
Main.debug(x.getMessage());
}
diff --git a/src/org/openstreetmap/josm/actions/MergeLayerAction.java b/src/org/openstreetmap/josm/actions/MergeLayerAction.java
index 856e192..fe7e6d0 100644
--- a/src/org/openstreetmap/josm/actions/MergeLayerAction.java
+++ b/src/org/openstreetmap/josm/actions/MergeLayerAction.java
@@ -17,6 +17,7 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
/**
* Action that merges two or more OSM data layers.
@@ -40,16 +41,17 @@ public class MergeLayerAction extends AbstractMergeAction {
final Layer targetLayer = askTargetLayer(targetLayers);
if (targetLayer == null)
return;
+ final Object actionName = MergeLayerAction.this.getValue(NAME);
Main.worker.submit(() -> {
+ final long start = System.currentTimeMillis();
boolean layerMerged = false;
for (final Layer sourceLayer: sourceLayers) {
if (sourceLayer != null && !sourceLayer.equals(targetLayer)) {
if (sourceLayer instanceof OsmDataLayer && targetLayer instanceof OsmDataLayer
- && ((OsmDataLayer) sourceLayer).isUploadDiscouraged() != ((OsmDataLayer) targetLayer).isUploadDiscouraged()) {
- if (Boolean.TRUE.equals(GuiHelper.runInEDTAndWaitAndReturn(() ->
+ && ((OsmDataLayer) sourceLayer).isUploadDiscouraged() != ((OsmDataLayer) targetLayer).isUploadDiscouraged()
+ && Boolean.TRUE.equals(GuiHelper.runInEDTAndWaitAndReturn(() ->
warnMergingUploadDiscouragedLayers(sourceLayer, targetLayer)))) {
- break;
- }
+ break;
}
targetLayer.mergeFrom(sourceLayer);
GuiHelper.runInEDTAndWait(() -> Main.getLayerManager().removeLayer(sourceLayer));
@@ -58,6 +60,7 @@ public class MergeLayerAction extends AbstractMergeAction {
}
if (layerMerged) {
Main.getLayerManager().setActiveLayer(targetLayer);
+ Main.info(tr("{0} completed in {1}", actionName, Utils.getDurationString(System.currentTimeMillis() - start)));
}
});
}
diff --git a/src/org/openstreetmap/josm/actions/OpenLocationAction.java b/src/org/openstreetmap/josm/actions/OpenLocationAction.java
index af71769..b503407 100644
--- a/src/org/openstreetmap/josm/actions/OpenLocationAction.java
+++ b/src/org/openstreetmap/josm/actions/OpenLocationAction.java
@@ -4,7 +4,6 @@ package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
import static org.openstreetmap.josm.tools.I18n.tr;
-import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
@@ -14,7 +13,9 @@ import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.Future;
+import java.util.stream.Collectors;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
@@ -23,7 +24,6 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.downloadtasks.DownloadGeoUrlTask;
import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
import org.openstreetmap.josm.actions.downloadtasks.DownloadNotesTask;
import org.openstreetmap.josm.actions.downloadtasks.DownloadNotesUrlBoundsTask;
@@ -37,10 +37,12 @@ import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmUrlTask;
import org.openstreetmap.josm.actions.downloadtasks.DownloadSessionTask;
import org.openstreetmap.josm.actions.downloadtasks.DownloadTask;
import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
+import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.Utils;
@@ -50,9 +52,23 @@ import org.openstreetmap.josm.tools.Utils;
* @author imi
*/
public class OpenLocationAction extends JosmAction {
-
+ /**
+ * true if the URL needs to be opened in a new layer, false otherwise
+ */
+ private static final BooleanProperty USE_NEW_LAYER = new BooleanProperty("download.newlayer", true);
protected final transient List<Class<? extends DownloadTask>> downloadTasks;
+ static class WhichTasksToPerformDialog extends ExtendedDialog {
+ WhichTasksToPerformDialog(JList<DownloadTask> list) {
+ super(Main.parent, tr("Which tasks to perform?"), new String[]{tr("Ok"), tr("Cancel")}, true);
+ setButtonIcons(new String[]{"ok", "cancel"});
+ final JPanel pane = new JPanel(new GridLayout(2, 1));
+ pane.add(new JLabel(tr("Which tasks to perform?")));
+ pane.add(list);
+ setContent(pane);
+ }
+ }
+
/**
* Create an open action. The name is "Open a file".
*/
@@ -68,7 +84,6 @@ public class OpenLocationAction extends JosmAction {
addDownloadTaskClass(DownloadNotesTask.class);
addDownloadTaskClass(DownloadOsmChangeTask.class);
addDownloadTaskClass(DownloadOsmUrlTask.class);
- addDownloadTaskClass(DownloadGeoUrlTask.class);
addDownloadTaskClass(DownloadOsmIdTask.class);
addDownloadTaskClass(DownloadOsmCompressedTask.class);
addDownloadTaskClass(DownloadOsmChangeCompressedTask.class);
@@ -102,25 +117,21 @@ public class OpenLocationAction extends JosmAction {
@Override
public void actionPerformed(ActionEvent e) {
-
- JCheckBox layer = new JCheckBox(tr("Separate Layer"));
- layer.setToolTipText(tr("Select if the data should be downloaded into a new layer"));
- layer.setSelected(Main.pref.getBoolean("download.newlayer"));
JPanel all = new JPanel(new GridBagLayout());
- GridBagConstraints gc = new GridBagConstraints();
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 1.0;
- gc.anchor = GridBagConstraints.FIRST_LINE_START;
- all.add(new JLabel(tr("Enter URL to download:")), gc);
+
+ // download URL selection
+ all.add(new JLabel(tr("Enter URL to download:")), GBC.eol());
HistoryComboBox uploadAddresses = new HistoryComboBox();
uploadAddresses.setToolTipText(tr("Enter an URL from where data should be downloaded"));
restoreUploadAddressHistory(uploadAddresses);
- gc.gridy = 1;
- all.add(uploadAddresses, gc);
- gc.gridy = 2;
- gc.fill = GridBagConstraints.BOTH;
- gc.weighty = 1.0;
- all.add(layer, gc);
+ all.add(uploadAddresses, GBC.eop().fill(GBC.BOTH));
+
+ // use separate layer
+ JCheckBox layer = new JCheckBox(tr("Separate Layer"));
+ layer.setToolTipText(tr("Select if the data should be downloaded into a new layer"));
+ layer.setSelected(USE_NEW_LAYER.get());
+ all.add(layer, GBC.eop().fill(GBC.BOTH));
+
ExtendedDialog dialog = new ExtendedDialog(Main.parent,
tr("Download Location"),
new String[] {tr("Download URL"), tr("Cancel")}
@@ -133,9 +144,11 @@ public class OpenLocationAction extends JosmAction {
});
dialog.configureContextsensitiveHelp("/Action/OpenLocation", true /* show help button */);
dialog.showDialog();
- if (dialog.getValue() != 1) return;
- remindUploadAddressHistory(uploadAddresses);
- openUrl(layer.isSelected(), Utils.strip(uploadAddresses.getText()));
+ if (dialog.getValue() == 1) {
+ USE_NEW_LAYER.put(layer.isSelected());
+ remindUploadAddressHistory(uploadAddresses);
+ openUrl(Utils.strip(uploadAddresses.getText()));
+ }
}
/**
@@ -146,20 +159,19 @@ public class OpenLocationAction extends JosmAction {
* @since 5691
*/
public Collection<DownloadTask> findDownloadTasks(final String url, boolean isRemotecontrol) {
- List<DownloadTask> result = new ArrayList<>();
- for (Class<? extends DownloadTask> taskClass : downloadTasks) {
- if (taskClass != null) {
- try {
- DownloadTask task = taskClass.getConstructor().newInstance();
- if (task.acceptsUrl(url, isRemotecontrol)) {
- result.add(task);
+ return downloadTasks.stream()
+ .filter(Objects::nonNull)
+ .map(taskClass -> {
+ try {
+ return taskClass.getConstructor().newInstance();
+ } catch (ReflectiveOperationException e) {
+ Main.error(e);
+ return null;
}
- } catch (ReflectiveOperationException e) {
- Main.error(e);
- }
- }
- }
- return result;
+ })
+ .filter(Objects::nonNull)
+ .filter(task -> task.acceptsUrl(url, isRemotecontrol))
+ .collect(Collectors.toList());
}
/**
@@ -188,26 +200,43 @@ public class OpenLocationAction extends JosmAction {
* @param newLayer true if the URL needs to be opened in a new layer, false otherwise
* @param url The URL to open
*/
- public void openUrl(boolean newLayer, final String url) {
+ public void openUrl(boolean newLayer, String url) {
+ realOpenUrl(newLayer, url);
+ }
+
+ /**
+ * Open the given URL. This class checks the {@link #USE_NEW_LAYER} preference to check if a new layer should be used.
+ * @param url The URL to open
+ * @return <code>true</code> if at least one task was started successfully.
+ * @since 11279
+ */
+ public boolean openUrl(String url) {
+ return realOpenUrl(USE_NEW_LAYER.get(), url);
+ }
+
+ private boolean realOpenUrl(boolean newLayer, String url) {
Collection<DownloadTask> tasks = findDownloadTasks(url, false);
if (tasks.size() > 1) {
tasks = askWhichTasksToLoad(tasks);
} else if (tasks.isEmpty()) {
warnNoSuitableTasks(url);
- return;
+ return false;
}
PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download Data"));
+ boolean hadAnySuccess = false;
for (final DownloadTask task : tasks) {
try {
Future<?> future = task.loadUrl(newLayer, url, monitor);
Main.worker.submit(new PostDownloadHandler(task, future));
+ hadAnySuccess = true;
} catch (IllegalArgumentException e) {
Main.error(e);
}
}
+ return hadAnySuccess;
}
/**
@@ -218,14 +247,7 @@ public class OpenLocationAction extends JosmAction {
Collection<DownloadTask> askWhichTasksToLoad(final Collection<DownloadTask> tasks) {
final JList<DownloadTask> list = new JList<>(tasks.toArray(new DownloadTask[tasks.size()]));
list.addSelectionInterval(0, tasks.size() - 1);
- final ExtendedDialog dialog = new ExtendedDialog(Main.parent,
- tr("Which tasks to perform?"), new String[]{tr("Ok"), tr("Cancel")}, true) { {
- setButtonIcons(new String[]{"ok", "cancel"});
- final JPanel pane = new JPanel(new GridLayout(2, 1));
- pane.add(new JLabel(tr("Which tasks to perform?")));
- pane.add(list);
- setContent(pane);
- } };
+ final ExtendedDialog dialog = new WhichTasksToPerformDialog(list);
dialog.showDialog();
return dialog.getValue() == 1 ? list.getSelectedValuesList() : Collections.<DownloadTask>emptyList();
}
@@ -234,7 +256,7 @@ public class OpenLocationAction extends JosmAction {
* Displays an error message dialog that no suitable tasks have been found for the given url.
* @param url the given url
*/
- void warnNoSuitableTasks(final String url) {
+ protected void warnNoSuitableTasks(final String url) {
final String details = findSummaryDocumentation(); // Explain what patterns are supported
HelpAwareOptionPane.showMessageDialogInEDT(Main.parent, "<html><p>" + tr(
"Cannot open URL ''{0}''<br>The following download tasks accept the URL patterns shown:<br>{1}",
diff --git a/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java b/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
index 4d6c80e..f4e7d52 100644
--- a/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
+++ b/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
@@ -30,6 +30,7 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
import org.openstreetmap.josm.gui.Notification;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.Shortcut;
/**
@@ -45,6 +46,8 @@ public final class OrthogonalizeAction extends JosmAction {
"(Afterwards, you can undo the movement for certain nodes:<br>"+
"Select them and press the shortcut for Orthogonalize / Undo. The default is Shift-Q.)");
+ private static final double EPSILON = 1E-6;
+
/**
* Constructs a new {@code OrthogonalizeAction}.
*/
@@ -293,7 +296,7 @@ public final class OrthogonalizeAction extends JosmAction {
int directionOffset = angleToDirectionChange(w.heading - refHeading, TOLERANCE2);
w.calcDirections(Direction.RIGHT.changeBy(directionOffset));
if (angleToDirectionChange(refHeading - w.heading, TOLERANCE2) != 0)
- throw new RuntimeException();
+ throw new JosmRuntimeException("orthogonalize error");
totSum = EN.sum(totSum, w.segSum);
}
headingAll = EN.polar(new EastNorth(0., 0.), totSum);
@@ -402,7 +405,7 @@ public final class OrthogonalizeAction extends JosmAction {
nC.put(n, average);
}
}
- if (!s.isEmpty()) throw new RuntimeException();
+ if (!s.isEmpty()) throw new JosmRuntimeException("orthogonalize error");
}
// rotate back and log the change
@@ -413,10 +416,9 @@ public final class OrthogonalizeAction extends JosmAction {
final double dx = tmp.east() - n.getEastNorth().east();
final double dy = tmp.north() - n.getEastNorth().north();
if (headingNodes.contains(n)) { // The heading nodes should not have changed
- final double epsilon = 1E-6;
- if (Math.abs(dx) > Math.abs(epsilon * tmp.east()) ||
- Math.abs(dy) > Math.abs(epsilon * tmp.east()))
- throw new AssertionError();
+ if (Math.abs(dx) > Math.abs(EPSILON * tmp.east()) ||
+ Math.abs(dy) > Math.abs(EPSILON * tmp.east()))
+ throw new AssertionError("heading node has changed");
} else {
OrthogonalizeAction.rememberMovements.put(n, new EastNorth(dx, dy));
commands.add(new MoveCommand(n, dx, dy));
diff --git a/src/org/openstreetmap/josm/actions/PurgeAction.java b/src/org/openstreetmap/josm/actions/PurgeAction.java
index b8506f4..acacb3a 100644
--- a/src/org/openstreetmap/josm/actions/PurgeAction.java
+++ b/src/org/openstreetmap/josm/actions/PurgeAction.java
@@ -57,20 +57,9 @@ import org.openstreetmap.josm.tools.Shortcut;
*/
public class PurgeAction extends JosmAction {
- /**
- * Constructs a new {@code PurgeAction}.
- */
- public PurgeAction() {
- /* translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune" */
- super(tr("Purge..."), "purge", tr("Forget objects but do not delete them on server when uploading."),
- Shortcut.registerShortcut("system:purge", tr("Edit: {0}", tr("Purge")),
- KeyEvent.VK_P, Shortcut.CTRL_SHIFT),
- true);
- putValue("help", HelpUtil.ht("/Action/Purge"));
- }
-
protected transient OsmDataLayer layer;
protected JCheckBox cbClearUndoRedo;
+ protected boolean modified;
protected transient Set<OsmPrimitive> toPurge;
/**
@@ -87,20 +76,67 @@ public class PurgeAction extends JosmAction {
*/
protected transient List<OsmPrimitive> toPurgeAdditionally;
+ /**
+ * Constructs a new {@code PurgeAction}.
+ */
+ public PurgeAction() {
+ /* translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune" */
+ super(tr("Purge..."), "purge", tr("Forget objects but do not delete them on server when uploading."),
+ Shortcut.registerShortcut("system:purge", tr("Edit: {0}", tr("Purge")),
+ KeyEvent.VK_P, Shortcut.CTRL_SHIFT),
+ true);
+ putValue("help", HelpUtil.ht("/Action/Purge"));
+ }
+
+ /** force selection to be active for all entries */
+ static class SelectionForcedOsmPrimitivRenderer extends OsmPrimitivRenderer {
+ @Override
+ public Component getListCellRendererComponent(JList<? extends OsmPrimitive> list,
+ OsmPrimitive value, int index, boolean isSelected, boolean cellHasFocus) {
+ return super.getListCellRendererComponent(list, value, index, true, false);
+ }
+ }
+
@Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
- Collection<OsmPrimitive> sel = getLayerManager().getEditDataSet().getAllSelected();
+ PurgeCommand cmd = getPurgeCommand(getLayerManager().getEditDataSet().getAllSelected());
+ boolean clearUndoRedo = false;
+
+ if (!GraphicsEnvironment.isHeadless()) {
+ final boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
+ "purge", Main.parent, buildPanel(modified), tr("Confirm Purging"),
+ JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_OPTION);
+ if (!answer)
+ return;
+
+ clearUndoRedo = cbClearUndoRedo.isSelected();
+ Main.pref.put("purge.clear_undo_redo", clearUndoRedo);
+ }
+
+ Main.main.undoRedo.add(cmd);
+ if (clearUndoRedo) {
+ Main.main.undoRedo.clean();
+ getLayerManager().getEditDataSet().clearSelectionHistory();
+ }
+ }
+
+ /**
+ * Creates command to purge selected OSM primitives.
+ * @param sel selected OSM primitives
+ * @return command to purge selected OSM primitives
+ * @since 11252
+ */
+ public PurgeCommand getPurgeCommand(Collection<OsmPrimitive> sel) {
layer = Main.getLayerManager().getEditLayer();
toPurge = new HashSet<>(sel);
toPurgeAdditionally = new ArrayList<>();
toPurgeChecked = new HashSet<>();
- // Add referrer, unless the object to purge is not new
- // and the parent is a relation
+ // Add referrer, unless the object to purge is not new and the parent is a relation
Set<OsmPrimitive> toPurgeRecursive = new HashSet<>();
while (!toPurge.isEmpty()) {
@@ -140,8 +176,7 @@ public class PurgeAction extends JosmAction {
}
}
- // Add untagged way nodes. Do not add nodes that have other
- // referrers not yet to-be-purged.
+ // Add untagged way nodes. Do not add nodes that have other referrers not yet to-be-purged.
if (Main.pref.getBoolean("purge.add_untagged_waynodes", true)) {
Set<OsmPrimitive> wayNodes = new HashSet<>();
for (OsmPrimitive osm : toPurgeChecked) {
@@ -177,9 +212,7 @@ public class PurgeAction extends JosmAction {
}
}
- /**
- * Add higher level relations (list gets extended while looping over it)
- */
+ // Add higher level relations (list gets extended while looping over it)
List<Relation> relLst = new ArrayList<>(relSet);
for (int i = 0; i < relLst.size(); ++i) { // foreach loop not applicable since list gets extended while looping over it
for (OsmPrimitive parent : relLst.get(i).getReferrers()) {
@@ -194,7 +227,7 @@ public class PurgeAction extends JosmAction {
toPurgeAdditionally.addAll(relSet);
}
- boolean modified = false;
+ modified = false;
for (OsmPrimitive osm : toPurgeChecked) {
if (osm.isModified()) {
modified = true;
@@ -202,25 +235,8 @@ public class PurgeAction extends JosmAction {
}
}
- boolean clearUndoRedo = false;
-
- if (!GraphicsEnvironment.isHeadless()) {
- final boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
- "purge", Main.parent, buildPanel(modified), tr("Confirm Purging"),
- JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_OPTION);
- if (!answer)
- return;
-
- clearUndoRedo = cbClearUndoRedo.isSelected();
- Main.pref.put("purge.clear_undo_redo", clearUndoRedo);
- }
-
- Main.main.undoRedo.add(new PurgeCommand(Main.getLayerManager().getEditLayer(), toPurgeChecked, makeIncomplete));
-
- if (clearUndoRedo) {
- Main.main.undoRedo.clean();
- getLayerManager().getEditDataSet().clearSelectionHistory();
- }
+ return layer != null ? new PurgeCommand(layer, toPurgeChecked, makeIncomplete) :
+ new PurgeCommand(toPurgeChecked.iterator().next().getDataSet(), toPurgeChecked, makeIncomplete);
}
private JPanel buildPanel(boolean modified) {
@@ -250,16 +266,7 @@ public class PurgeAction extends JosmAction {
});
JList<OsmPrimitive> list = new JList<>(toPurgeAdditionally.toArray(new OsmPrimitive[toPurgeAdditionally.size()]));
/* force selection to be active for all entries */
- list.setCellRenderer(new OsmPrimitivRenderer() {
- @Override
- public Component getListCellRendererComponent(JList<? extends OsmPrimitive> list,
- OsmPrimitive value,
- int index,
- boolean isSelected,
- boolean cellHasFocus) {
- return super.getListCellRendererComponent(list, value, index, true, false);
- }
- });
+ list.setCellRenderer(new SelectionForcedOsmPrimitivRenderer());
JScrollPane scroll = new JScrollPane(list);
scroll.setPreferredSize(new Dimension(250, 300));
scroll.setMinimumSize(new Dimension(250, 300));
diff --git a/src/org/openstreetmap/josm/actions/RenameLayerAction.java b/src/org/openstreetmap/josm/actions/RenameLayerAction.java
index 254cd27..8de5696 100644
--- a/src/org/openstreetmap/josm/actions/RenameLayerAction.java
+++ b/src/org/openstreetmap/josm/actions/RenameLayerAction.java
@@ -43,6 +43,19 @@ public class RenameLayerAction extends AbstractAction {
this.putValue("help", ht("/Action/RenameLayer"));
}
+ static class InitialValueOptionPane extends JOptionPane {
+ InitialValueOptionPane(Box panel, JosmTextField initial) {
+ super(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION, null, null, initial);
+ }
+
+ @Override
+ public void selectInitialValue() {
+ JosmTextField initial = (JosmTextField) getInitialValue();
+ initial.requestFocusInWindow();
+ initial.selectAll();
+ }
+ }
+
@Override
public void actionPerformed(ActionEvent e) {
Box panel = Box.createVerticalBox();
@@ -55,12 +68,7 @@ public class RenameLayerAction extends AbstractAction {
filerename.setSelected(Main.pref.getBoolean("layer.rename-file", true));
}
- final JOptionPane optionPane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION) {
- @Override public void selectInitialValue() {
- name.requestFocusInWindow();
- name.selectAll();
- }
- };
+ final JOptionPane optionPane = new InitialValueOptionPane(panel, name);
final JDialog dlg = optionPane.createDialog(Main.parent, tr("Rename layer"));
dlg.setModalityType(ModalityType.DOCUMENT_MODAL);
dlg.setVisible(true);
diff --git a/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java b/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java
index 5e55145..f66c8c3 100644
--- a/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java
+++ b/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java
@@ -91,7 +91,7 @@ public class SearchNotesDownloadAction extends JosmAction {
}
int noteLimit = Main.pref.getInteger("osm.notes.downloadLimit", 1000);
- int closedLimit = Main.pref.getInteger("osm.notes.daysCloased", 7);
+ int closedLimit = Main.pref.getInteger("osm.notes.daysClosed", 7);
StringBuilder sb = new StringBuilder(128);
sb.append(OsmApi.getOsmApi().getBaseUrl())
diff --git a/src/org/openstreetmap/josm/actions/SelectByInternalPointAction.java b/src/org/openstreetmap/josm/actions/SelectByInternalPointAction.java
index d9d87d0..7d21829 100644
--- a/src/org/openstreetmap/josm/actions/SelectByInternalPointAction.java
+++ b/src/org/openstreetmap/josm/actions/SelectByInternalPointAction.java
@@ -29,15 +29,27 @@ public final class SelectByInternalPointAction {
}
/**
- * Returns the surrounding polygons/multipolygons
- * ordered by their area size (from small to large)
+ * Returns the surrounding polygons/multipolygons ordered by their area size (from small to large)
* which contain the internal point.
*
* @param internalPoint the internal point.
* @return the surrounding polygons/multipolygons
*/
public static Collection<OsmPrimitive> getSurroundingObjects(EastNorth internalPoint) {
- final DataSet ds = Main.getLayerManager().getEditDataSet();
+ return getSurroundingObjects(Main.getLayerManager().getEditDataSet(), internalPoint, false);
+ }
+
+ /**
+ * Returns the surrounding polygons/multipolygons ordered by their area size (from small to large)
+ * which contain the internal point.
+ *
+ * @param ds the data set
+ * @param internalPoint the internal point.
+ * @param includeMultipolygonWays whether to include multipolygon ways in the result (false by default)
+ * @return the surrounding polygons/multipolygons
+ * @since 11247
+ */
+ public static Collection<OsmPrimitive> getSurroundingObjects(DataSet ds, EastNorth internalPoint, boolean includeMultipolygonWays) {
if (ds == null) {
return Collections.emptySet();
}
@@ -50,9 +62,11 @@ public final class SelectByInternalPointAction {
}
for (Relation r : ds.getRelations()) {
if (r.isUsable() && r.isMultipolygon() && r.isSelectable() && Geometry.isNodeInsideMultiPolygon(n, r, null)) {
- for (RelationMember m : r.getMembers()) {
- if (m.isWay() && m.getWay().isClosed()) {
- found.values().remove(m.getWay());
+ if (!includeMultipolygonWays) {
+ for (RelationMember m : r.getMembers()) {
+ if (m.isWay() && m.getWay().isClosed()) {
+ found.values().remove(m.getWay());
+ }
}
}
// estimate multipolygon size by its bounding box area
diff --git a/src/org/openstreetmap/josm/actions/SimplifyWayAction.java b/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
index b7e15d3..6aa90eb 100644
--- a/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
+++ b/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
@@ -193,16 +193,14 @@ public class SimplifyWayAction extends JosmAction {
i++;
}
- if ((newNodes.size() > 3) && (newNodes.get(0) == newNodes.get(newNodes.size() - 1))) {
- // Closed way, check if the first node could also be simplified ...
- if (!isRequiredNode(w, newNodes.get(0))) {
- final List<Node> l1 = Arrays.asList(newNodes.get(newNodes.size() - 2), newNodes.get(0), newNodes.get(1));
- final List<Node> l2 = new ArrayList<>(3);
- buildSimplifiedNodeList(l1, 0, 2, threshold, l2);
- if (!l2.contains(newNodes.get(0))) {
- newNodes.remove(0);
- newNodes.set(newNodes.size() - 1, newNodes.get(0)); // close the way
- }
+ // Closed way, check if the first node could also be simplified ...
+ if (newNodes.size() > 3 && newNodes.get(0) == newNodes.get(newNodes.size() - 1) && !isRequiredNode(w, newNodes.get(0))) {
+ final List<Node> l1 = Arrays.asList(newNodes.get(newNodes.size() - 2), newNodes.get(0), newNodes.get(1));
+ final List<Node> l2 = new ArrayList<>(3);
+ buildSimplifiedNodeList(l1, 0, 2, threshold, l2);
+ if (!l2.contains(newNodes.get(0))) {
+ newNodes.remove(0);
+ newNodes.set(newNodes.size() - 1, newNodes.get(0)); // close the way
}
}
diff --git a/src/org/openstreetmap/josm/actions/SplitWayAction.java b/src/org/openstreetmap/josm/actions/SplitWayAction.java
index 076355a..d4c029a 100644
--- a/src/org/openstreetmap/josm/actions/SplitWayAction.java
+++ b/src/org/openstreetmap/josm/actions/SplitWayAction.java
@@ -263,19 +263,7 @@ public class SplitWayAction extends JosmAction {
setHighlightedWaySegments(segments);
}
});
- list.setCellRenderer(new DefaultListCellRenderer() {
- @Override
- public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
- final Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
- final String name = DefaultNameFormatter.getInstance().format((Way) value);
- // get rid of id from DefaultNameFormatter.decorateNameWithId()
- final String nameWithoutId = name
- .replace(tr(" [id: {0}]", ((Way) value).getId()), "")
- .replace(tr(" [id: {0}]", ((Way) value).getUniqueId()), "");
- ((JLabel) c).setText(tr("Segment {0}: {1}", index + 1, nameWithoutId));
- return c;
- }
- });
+ list.setCellRenderer(new SegmentListCellRenderer());
}
protected void setHighlightedWaySegments(Collection<WaySegment> segments) {
@@ -308,6 +296,20 @@ public class SplitWayAction extends JosmAction {
}
}
+ static class SegmentListCellRenderer extends DefaultListCellRenderer {
+ @Override
+ public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+ final Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+ final String name = DefaultNameFormatter.getInstance().format((Way) value);
+ // get rid of id from DefaultNameFormatter.decorateNameWithId()
+ final String nameWithoutId = name
+ .replace(tr(" [id: {0}]", ((Way) value).getId()), "")
+ .replace(tr(" [id: {0}]", ((Way) value).getUniqueId()), "");
+ ((JLabel) c).setText(tr("Segment {0}: {1}", index + 1, nameWithoutId));
+ return c;
+ }
+ }
+
/**
* Determines which way chunk should reuse the old id and its history
*
@@ -538,7 +540,7 @@ public class SplitWayAction extends JosmAction {
// Change the original way
final Way changedWay = new Way(way);
changedWay.setNodes(wayToKeep.getNodes());
- commandList.add(new ChangeCommand(way, changedWay));
+ commandList.add(layer != null ? new ChangeCommand(layer, way, changedWay) : new ChangeCommand(way.getDataSet(), way, changedWay));
if (!newSelection.contains(way)) {
newSelection.add(way);
}
@@ -547,7 +549,7 @@ public class SplitWayAction extends JosmAction {
newSelection.addAll(newWays);
for (Way wayToAdd : newWays) {
- commandList.add(new AddCommand(layer, wayToAdd));
+ commandList.add(layer != null ? new AddCommand(layer, wayToAdd) : new AddCommand(way.getDataSet(), wayToAdd));
}
boolean warnmerole = false;
@@ -677,7 +679,7 @@ public class SplitWayAction extends JosmAction {
}
if (c != null) {
- commandList.add(new ChangeCommand(layer, r, c));
+ commandList.add(layer != null ? new ChangeCommand(layer, r, c) : new ChangeCommand(r.getDataSet(), r, c));
}
}
if (warnmerole) {
diff --git a/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java b/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java
index 0e52890..49c2757 100644
--- a/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java
+++ b/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java
@@ -9,7 +9,6 @@ import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -155,29 +154,17 @@ public class UnJoinNodeWayAction extends JosmAction {
List<Way> result = new ArrayList<>(OsmPrimitive.getFilteredList(selectedNodes.get(0).getReferrers(), Way.class));
for (int i = 1; i < selectedNodes.size(); i++) {
List<OsmPrimitive> ref = selectedNodes.get(i).getReferrers();
- for (Iterator<Way> it = result.iterator(); it.hasNext();) {
- if (!ref.contains(it.next())) {
- it.remove();
- }
- }
+ result.removeIf(way -> !ref.contains(way));
}
// Remove broken ways
- for (Iterator<Way> it = result.iterator(); it.hasNext();) {
- if (it.next().getNodesCount() <= 2) {
- it.remove();
- }
- }
+ result.removeIf(way -> way.getNodesCount() <= 2);
if (selectedWays.isEmpty())
return result;
else {
// Return only selected ways
- for (Iterator<Way> it = result.iterator(); it.hasNext();) {
- if (!selectedWays.contains(it.next())) {
- it.remove();
- }
- }
+ result.removeIf(way -> !selectedWays.contains(way));
return result;
}
}
diff --git a/src/org/openstreetmap/josm/actions/UploadAction.java b/src/org/openstreetmap/josm/actions/UploadAction.java
index 19d3cc8..4d4cc77 100644
--- a/src/org/openstreetmap/josm/actions/UploadAction.java
+++ b/src/org/openstreetmap/josm/actions/UploadAction.java
@@ -186,10 +186,8 @@ public class UploadAction extends JosmAction {
* @return true, if the preconditions are met; false, otherwise
*/
public static boolean checkPreUploadConditions(AbstractModifiableLayer layer, APIDataSet apiData) {
- if (layer.isUploadDiscouraged()) {
- if (warnUploadDiscouraged(layer)) {
- return false;
- }
+ if (layer.isUploadDiscouraged() && warnUploadDiscouraged(layer)) {
+ return false;
}
if (layer instanceof OsmDataLayer) {
OsmDataLayer osmLayer = (OsmDataLayer) layer;
diff --git a/src/org/openstreetmap/josm/actions/UploadSelectionAction.java b/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
index 0c5ec3f..acf3d85 100644
--- a/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
+++ b/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
@@ -90,10 +90,8 @@ public class UploadSelectionAction extends JosmAction {
OsmDataLayer editLayer = getLayerManager().getEditLayer();
if (!isEnabled())
return;
- if (editLayer.isUploadDiscouraged()) {
- if (UploadAction.warnUploadDiscouraged(editLayer)) {
- return;
- }
+ if (editLayer.isUploadDiscouraged() && UploadAction.warnUploadDiscouraged(editLayer)) {
+ return;
}
Collection<OsmPrimitive> modifiedCandidates = getModifiedPrimitives(editLayer.data.getAllSelected());
Collection<OsmPrimitive> deletedCandidates = getDeletedPrimitives(editLayer.data);
diff --git a/src/org/openstreetmap/josm/actions/ZoomToAction.java b/src/org/openstreetmap/josm/actions/ZoomToAction.java
index 12291b3..4f02448 100644
--- a/src/org/openstreetmap/josm/actions/ZoomToAction.java
+++ b/src/org/openstreetmap/josm/actions/ZoomToAction.java
@@ -69,7 +69,7 @@ public class ZoomToAction extends AbstractAction implements LayerChangeListener,
if (!isEnabled())
return;
int[] rows = this.table.getSelectedRows();
- if (rows == null || rows.length == 0)
+ if (rows.length == 0)
return;
int row = rows[0];
OsmDataLayer layer = this.table.getLayer();
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGeoUrlTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGeoUrlTask.java
deleted file mode 100644
index 36973db..0000000
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGeoUrlTask.java
+++ /dev/null
@@ -1,30 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.actions.downloadtasks;
-
-import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.tools.GeoUrlToBounds;
-
-import java.util.concurrent.Future;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-/**
- * Task allowing to download a Geo URL (as specified in <a href="https://tools.ietf.org/html/rfc5870">RFC 5870</a>).
- */
-public class DownloadGeoUrlTask extends DownloadOsmTask {
-
- @Override
- public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
- return download(newLayer, GeoUrlToBounds.parse(url), null);
- }
-
- @Override
- public String[] getPatterns() {
- return new String[]{GeoUrlToBounds.PATTERN.toString()};
- }
-
- @Override
- public String getTitle() {
- return tr("Download Geo URL");
- }
-}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmUrlTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmUrlTask.java
index 3424a8a..c2bac21 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmUrlTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmUrlTask.java
@@ -6,6 +6,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.concurrent.Future;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.GeoUrlToBounds;
import org.openstreetmap.josm.tools.OsmUrlToBounds;
/**
@@ -23,7 +24,9 @@ public class DownloadOsmUrlTask extends DownloadOsmTask {
public String[] getPatterns() {
return new String[]{
"https?://www\\.(osm|openstreetmap)\\.org/\\?lat=.*&lon=.*",
- "https?://www\\.(osm|openstreetmap)\\.org/(.*)?#map=\\p{Digit}+/.*/.*"};
+ "https?://www\\.(osm|openstreetmap)\\.org/(.*)?#map=\\p{Digit}+/.*/.*",
+ GeoUrlToBounds.PATTERN.toString(),
+ };
}
@Override
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java b/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
index 78e7454..c99c7a8 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
@@ -498,7 +498,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPress
moveCommand2.moveAgainTo(movement2.getX(), movement2.getY());
}
}
- } else {
+ } else if (bestMovement != null) {
if (mode == Mode.extrude || mode == Mode.create_new) {
//nothing here
} else if (mode == Mode.translate_node || mode == Mode.translate) {
@@ -896,18 +896,22 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPress
// set neighboring segments
Node prevNode = getPreviousNode(selectedSegment.lowerIndex);
- EastNorth prevNodeEn = prevNode.getEastNorth();
- dualAlignSegment1 = new ReferenceSegment(new EastNorth(
- initialN1en.getX() - prevNodeEn.getX(),
- initialN1en.getY() - prevNodeEn.getY()
- ), initialN1en, prevNodeEn, false);
+ if (prevNode != null) {
+ EastNorth prevNodeEn = prevNode.getEastNorth();
+ dualAlignSegment1 = new ReferenceSegment(new EastNorth(
+ initialN1en.getX() - prevNodeEn.getX(),
+ initialN1en.getY() - prevNodeEn.getY()
+ ), initialN1en, prevNodeEn, false);
+ }
Node nextNode = getNextNode(selectedSegment.lowerIndex + 1);
- EastNorth nextNodeEn = nextNode.getEastNorth();
- dualAlignSegment2 = new ReferenceSegment(new EastNorth(
- initialN2en.getX() - nextNodeEn.getX(),
- initialN2en.getY() - nextNodeEn.getY()
- ), initialN2en, nextNodeEn, false);
+ if (nextNode != null) {
+ EastNorth nextNodeEn = nextNode.getEastNorth();
+ dualAlignSegment2 = new ReferenceSegment(new EastNorth(
+ initialN2en.getX() - nextNodeEn.getX(),
+ initialN2en.getY() - nextNodeEn.getY()
+ ), initialN2en, nextNodeEn, false);
+ }
}
/**
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
index 9bab5b1..c799705 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
@@ -400,7 +400,7 @@ public class ImproveWayAccuracyAction extends MapMode implements
getLayerManager().getEditDataSet().setSelected(targetWay.getPrimitiveId());
updateStateByCurrentSelection();
}
- } else if (state == State.IMPROVING && mousePos != null) {
+ } else if (state == State.IMPROVING) {
// Checking if the new coordinate is outside of the world
if (mv.getLatLon(mousePos.x, mousePos.y).isOutSideWorld()) {
JOptionPane.showMessageDialog(Main.parent,
diff --git a/src/org/openstreetmap/josm/actions/mapmode/MapMode.java b/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
index f6d774f..85e9c68 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
@@ -54,7 +54,7 @@ public abstract class MapMode extends JosmAction implements MouseListener, Mouse
*/
public MapMode(String name, String iconName, String tooltip, MapFrame mapFrame, Cursor cursor) {
putValue(NAME, name);
- putValue(SMALL_ICON, ImageProvider.get("mapmode", iconName));
+ new ImageProvider("mapmode", iconName).getResource().attachImageIcon(this);
putValue(SHORT_DESCRIPTION, tooltip);
this.cursor = cursor;
}
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java b/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java
index 06875e2..ad47df7 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java
@@ -74,14 +74,12 @@ public class ParallelWays {
sortedNodes = new ArrayList<>();
for (int i = 0; i < sortedNodesPath.size(); i++) {
Node n = sortedNodesPath.get(i);
- if (i < sortedNodesPath.size()-1) {
- if (sortedNodesPath.get(i+1).getCoor().equals(n.getCoor())) {
- removedNodes.add(n);
- for (Way w : ways) {
- w.removeNode(n);
- }
- continue;
+ if (i < sortedNodesPath.size()-1 && sortedNodesPath.get(i+1).getCoor().equals(n.getCoor())) {
+ removedNodes.add(n);
+ for (Way w : ways) {
+ w.removeNode(n);
}
+ continue;
}
if (!removedNodes.contains(n)) {
sortedNodes.add(n);
diff --git a/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java b/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java
index 041675d..867023e 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java
@@ -65,9 +65,8 @@ public class PlayHeadDragMode extends MapMode {
}
@Override public void mouseReleased(MouseEvent ev) {
- Point p = ev.getPoint();
mouseStart = null;
- if (ev.getButton() != MouseEvent.BUTTON1 || p == null || !dragging)
+ if (ev.getButton() != MouseEvent.BUTTON1 || !dragging)
return;
requestFocusInMapView();
diff --git a/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java b/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
index e912a07..2fd2d9c 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
@@ -252,16 +252,14 @@ public class SelectAction extends MapMode implements ModifierListener, KeyPressR
Set<OsmPrimitive> newHighlights = new HashSet<>();
virtualManager.clear();
- if (mode == Mode.MOVE) {
- if (!dragInProgress() && virtualManager.activateVirtualNodeNearPoint(e.getPoint())) {
- DataSet ds = getLayerManager().getEditDataSet();
- if (ds != null && drawTargetHighlight) {
- ds.setHighlightedVirtualNodes(virtualManager.virtualWays);
- }
- mv.setNewCursor(SelectActionCursor.virtual_node.cursor(), this);
- // don't highlight anything else if a virtual node will be
- return repaintIfRequired(newHighlights);
+ if (mode == Mode.MOVE && !dragInProgress() && virtualManager.activateVirtualNodeNearPoint(e.getPoint())) {
+ DataSet ds = getLayerManager().getEditDataSet();
+ if (ds != null && drawTargetHighlight) {
+ ds.setHighlightedVirtualNodes(virtualManager.virtualWays);
}
+ mv.setNewCursor(SelectActionCursor.virtual_node.cursor(), this);
+ // don't highlight anything else if a virtual node will be
+ return repaintIfRequired(newHighlights);
}
mv.setNewCursor(getCursor(c), this);
diff --git a/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java b/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java
index 44af2b8..213faa8 100644
--- a/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java
+++ b/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java
@@ -60,12 +60,7 @@ public class RecentRelationsAction implements ActionListener, CommandQueueListen
KeyEvent.VK_ESCAPE,
Shortcut.SHIFT
);
- Main.registerActionShortcut(new AbstractAction() {
- @Override
- public void actionPerformed(ActionEvent e) {
- EditRelationAction.launchEditor(getLastRelation());
- }
- }, shortcut);
+ Main.registerActionShortcut(new LaunchEditorAction(), shortcut);
}
/**
@@ -147,6 +142,13 @@ public class RecentRelationsAction implements ActionListener, CommandQueueListen
}
}
+ protected static class LaunchEditorAction extends AbstractAction {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ EditRelationAction.launchEditor(getLastRelation());
+ }
+ }
+
protected static class RecentRelationsPopupMenu extends JPopupMenu {
/**
* Constructs a new {@code RecentRelationsPopupMenu}.
diff --git a/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java b/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java
index 2bcf900..6c31c21 100644
--- a/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java
+++ b/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java
@@ -11,6 +11,7 @@ import java.util.List;
import java.util.Objects;
import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
public class PushbackTokenizer {
@@ -52,10 +53,18 @@ public class PushbackTokenizer {
}
public enum Token {
- NOT(marktr("<not>")), OR(marktr("<or>")), XOR(marktr("<xor>")), LEFT_PARENT(marktr("<left parent>")),
- RIGHT_PARENT(marktr("<right parent>")), COLON(marktr("<colon>")), EQUALS(marktr("<equals>")),
- KEY(marktr("<key>")), QUESTION_MARK(marktr("<question mark>")),
- EOF(marktr("<end-of-file>")), LESS_THAN("<less-than>"), GREATER_THAN("<greater-than>");
+ NOT(marktr("<not>")),
+ OR(marktr("<or>")),
+ XOR(marktr("<xor>")),
+ LEFT_PARENT(marktr("<left parent>")),
+ RIGHT_PARENT(marktr("<right parent>")),
+ COLON(marktr("<colon>")),
+ EQUALS(marktr("<equals>")),
+ KEY(marktr("<key>")),
+ QUESTION_MARK(marktr("<question mark>")),
+ EOF(marktr("<end-of-file>")),
+ LESS_THAN("<less-than>"),
+ GREATER_THAN("<greater-than>");
Token(String name) {
this.name = name;
@@ -73,7 +82,7 @@ public class PushbackTokenizer {
try {
c = search.read();
} catch (IOException e) {
- throw new RuntimeException(e.getMessage(), e);
+ throw new JosmRuntimeException(e.getMessage(), e);
}
}
diff --git a/src/org/openstreetmap/josm/actions/search/SearchAction.java b/src/org/openstreetmap/josm/actions/search/SearchAction.java
index 4407a0e..09c3c43 100644
--- a/src/org/openstreetmap/josm/actions/search/SearchAction.java
+++ b/src/org/openstreetmap/josm/actions/search/SearchAction.java
@@ -54,6 +54,7 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.Utils;
@@ -228,7 +229,7 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
JTextComponent tf = hcb.getEditorComponent();
tf.getDocument().insertString(tf.getCaretPosition(), ' ' + insertText, null);
} catch (BadLocationException ex) {
- throw new RuntimeException(ex.getMessage(), ex);
+ throw new JosmRuntimeException(ex.getMessage(), ex);
}
}
});
diff --git a/src/org/openstreetmap/josm/actions/search/SearchCompiler.java b/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
index 3a12ac9..2a12bb3 100644
--- a/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
+++ b/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
@@ -79,9 +79,7 @@ public class SearchCompiler {
this.regexSearch = regexSearch;
this.tokenizer = tokenizer;
- /* register core match factories at first instance, so plugins should
- * never be able to generate a NPE
- */
+ // register core match factories at first instance, so plugins should never be able to generate a NPE
if (simpleMatchFactoryMap.isEmpty()) {
addMatchFactory(new CoreSimpleMatchFactory());
}
@@ -848,12 +846,10 @@ public class SearchCompiler {
return false;
case ANY_VALUE_REGEXP:
case EXACT_REGEXP:
- for (String key: osm.keySet()) {
- if (keyPattern.matcher(key).matches()) {
- if (mode == Mode.ANY_VALUE_REGEXP
- || valuePattern.matcher(osm.get(key)).matches())
- return true;
- }
+ for (String k : osm.keySet()) {
+ if (keyPattern.matcher(k).matches()
+ && (mode == Mode.ANY_VALUE_REGEXP || valuePattern.matcher(osm.get(k)).matches()))
+ return true;
}
return false;
case MISSING_KEY_REGEXP:
@@ -1203,7 +1199,7 @@ public class SearchCompiler {
@Override
protected Long getNumber(OsmPrimitive osm) {
- return osm.getRawTimestamp() * 1000L;
+ return osm.getTimestamp().getTime();
}
@Override
diff --git a/src/org/openstreetmap/josm/command/AddCommand.java b/src/org/openstreetmap/josm/command/AddCommand.java
index 719598c..9f4ee6b 100644
--- a/src/org/openstreetmap/josm/command/AddCommand.java
+++ b/src/org/openstreetmap/josm/command/AddCommand.java
@@ -10,6 +10,7 @@ import java.util.Objects;
import javax.swing.Icon;
+import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.Way;
@@ -49,6 +50,17 @@ public class AddCommand extends Command {
this.osm = Objects.requireNonNull(osm, "osm");
}
+ /**
+ * Creates the command and specify the element to add in the context of the given data set.
+ * @param data The data set. Must not be {@code null}
+ * @param osm The primitive to add
+ * @since 11240
+ */
+ public AddCommand(DataSet data, OsmPrimitive osm) {
+ super(data);
+ this.osm = Objects.requireNonNull(osm, "osm");
+ }
+
protected static final void checkNodeStyles(OsmPrimitive osm) {
if (osm instanceof Way) {
// Fix #10557 - node icon not updated after undoing/redoing addition of a way
diff --git a/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java b/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java
index 02b73dd..fa15fa4 100644
--- a/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java
+++ b/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java
@@ -18,6 +18,7 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.PrimitiveData;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
/**
* Add primitives to a data layer.
@@ -105,12 +106,12 @@ public class AddPrimitivesCommand extends Command {
// When redoing this command, we have to add the same objects, otherwise
// a subsequent command (e.g. MoveCommand) cannot be redone.
for (OsmPrimitive osm : createdPrimitives) {
- getLayer().data.addPrimitive(osm);
+ getAffectedDataSet().addPrimitive(osm);
}
primitivesToSelect = createdPrimitivesToSelect;
}
- getLayer().data.setSelected(primitivesToSelect);
+ getAffectedDataSet().setSelected(primitivesToSelect);
return true;
}
@@ -169,7 +170,7 @@ public class AddPrimitivesCommand extends Command {
for (PrimitiveData d : data) {
OsmPrimitive osm = getAffectedDataSet().getPrimitiveById(d);
if (osm == null)
- throw new RuntimeException();
+ throw new JosmRuntimeException("No primitive found for " + d);
prims.add(osm);
}
return prims;
@@ -187,8 +188,8 @@ public class AddPrimitivesCommand extends Command {
if (!super.equals(obj)) return false;
AddPrimitivesCommand that = (AddPrimitivesCommand) obj;
return Objects.equals(data, that.data) &&
- Objects.equals(toSelect, that.toSelect) &&
- Objects.equals(createdPrimitives, that.createdPrimitives) &&
- Objects.equals(createdPrimitivesToSelect, that.createdPrimitivesToSelect);
+ Objects.equals(toSelect, that.toSelect) &&
+ Objects.equals(createdPrimitives, that.createdPrimitives) &&
+ Objects.equals(createdPrimitivesToSelect, that.createdPrimitivesToSelect);
}
}
diff --git a/src/org/openstreetmap/josm/command/ChangeCommand.java b/src/org/openstreetmap/josm/command/ChangeCommand.java
index ecb5dd8..38bd44a 100644
--- a/src/org/openstreetmap/josm/command/ChangeCommand.java
+++ b/src/org/openstreetmap/josm/command/ChangeCommand.java
@@ -9,6 +9,7 @@ import java.util.Objects;
import javax.swing.Icon;
+import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.Way;
@@ -51,6 +52,20 @@ public class ChangeCommand extends Command {
sanityChecks();
}
+ /**
+ * Constructs a new {@code ChangeCommand} in the context of a given data set.
+ * @param data The data set
+ * @param osm The existing primitive to modify
+ * @param newOsm The new primitive
+ * @since 11240
+ */
+ public ChangeCommand(DataSet data, OsmPrimitive osm, OsmPrimitive newOsm) {
+ super(data);
+ this.osm = osm;
+ this.newOsm = newOsm;
+ sanityChecks();
+ }
+
private void sanityChecks() {
CheckParameterUtil.ensureParameterNotNull(osm, "osm");
CheckParameterUtil.ensureParameterNotNull(newOsm, "newOsm");
diff --git a/src/org/openstreetmap/josm/command/ChangePropertyCommand.java b/src/org/openstreetmap/josm/command/ChangePropertyCommand.java
index d23f1d0..bfe9eee 100644
--- a/src/org/openstreetmap/josm/command/ChangePropertyCommand.java
+++ b/src/org/openstreetmap/josm/command/ChangePropertyCommand.java
@@ -5,7 +5,6 @@ import static org.openstreetmap.josm.tools.I18n.marktr;
import static org.openstreetmap.josm.tools.I18n.tr;
import static org.openstreetmap.josm.tools.I18n.trn;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -14,6 +13,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
import javax.swing.Icon;
@@ -32,6 +32,30 @@ import org.openstreetmap.josm.tools.ImageProvider;
* @since 24
*/
public class ChangePropertyCommand extends Command {
+
+ static final class OsmPseudoCommand implements PseudoCommand {
+ private final OsmPrimitive osm;
+
+ OsmPseudoCommand(OsmPrimitive osm) {
+ this.osm = osm;
+ }
+
+ @Override
+ public String getDescriptionText() {
+ return osm.getDisplayName(DefaultNameFormatter.getInstance());
+ }
+
+ @Override
+ public Icon getDescriptionIcon() {
+ return ImageProvider.get(osm.getDisplayType());
+ }
+
+ @Override
+ public Collection<? extends OsmPrimitive> getParticipatingPrimitives() {
+ return Collections.singleton(osm);
+ }
+ }
+
/**
* All primitives that are affected with this command.
*/
@@ -211,23 +235,7 @@ public class ChangePropertyCommand extends Command {
public Collection<PseudoCommand> getChildren() {
if (objects.size() == 1)
return null;
- List<PseudoCommand> children = new ArrayList<>();
- for (final OsmPrimitive osm : objects) {
- children.add(new PseudoCommand() {
- @Override public String getDescriptionText() {
- return osm.getDisplayName(DefaultNameFormatter.getInstance());
- }
-
- @Override public Icon getDescriptionIcon() {
- return ImageProvider.get(osm.getDisplayType());
- }
-
- @Override public Collection<? extends OsmPrimitive> getParticipatingPrimitives() {
- return Collections.singleton(osm);
- }
- });
- }
- return children;
+ return objects.stream().map(OsmPseudoCommand::new).collect(Collectors.toList());
}
/**
diff --git a/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java b/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java
index f883d76..f0558eb 100644
--- a/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java
+++ b/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java
@@ -19,9 +19,36 @@ import org.openstreetmap.josm.tools.ImageProvider;
/**
* Command that replaces the key of one or several objects
- *
+ * @since 3669
*/
public class ChangePropertyKeyCommand extends Command {
+ static final class SinglePrimitivePseudoCommand implements PseudoCommand {
+ private final String name;
+ private final OsmPrimitive osm;
+ private final Icon icon;
+
+ SinglePrimitivePseudoCommand(String name, OsmPrimitive osm, Icon icon) {
+ this.name = name;
+ this.osm = osm;
+ this.icon = icon;
+ }
+
+ @Override
+ public String getDescriptionText() {
+ return name;
+ }
+
+ @Override
+ public Icon getDescriptionIcon() {
+ return icon;
+ }
+
+ @Override
+ public Collection<? extends OsmPrimitive> getParticipatingPrimitives() {
+ return Collections.singleton(osm);
+ }
+ }
+
/**
* All primitives, that are affected with this command.
*/
@@ -107,24 +134,7 @@ public class ChangePropertyKeyCommand extends Command {
final NameVisitor v = new NameVisitor();
for (final OsmPrimitive osm : objects) {
osm.accept(v);
- final String name = v.name;
- final Icon icon = v.icon;
- children.add(new PseudoCommand() {
- @Override
- public String getDescriptionText() {
- return name;
- }
-
- @Override
- public Icon getDescriptionIcon() {
- return icon;
- }
-
- @Override
- public Collection<? extends OsmPrimitive> getParticipatingPrimitives() {
- return Collections.singleton(osm);
- }
- });
+ children.add(new SinglePrimitivePseudoCommand(v.name, osm, v.icon));
}
return children;
}
diff --git a/src/org/openstreetmap/josm/command/Command.java b/src/org/openstreetmap/josm/command/Command.java
index a2a98c1..ecbe1bb 100644
--- a/src/org/openstreetmap/josm/command/Command.java
+++ b/src/org/openstreetmap/josm/command/Command.java
@@ -136,11 +136,15 @@ public abstract class Command implements PseudoCommand {
/** the layer which this command is applied to */
private final OsmDataLayer layer;
+ /** the dataset which this command is applied to */
+ private final DataSet data;
+
/**
* Creates a new command in the context of the current edit layer, if any
*/
public Command() {
this.layer = Main.getLayerManager().getEditLayer();
+ this.data = layer != null ? layer.data : null;
}
/**
@@ -152,6 +156,20 @@ public abstract class Command implements PseudoCommand {
public Command(OsmDataLayer layer) {
CheckParameterUtil.ensureParameterNotNull(layer, "layer");
this.layer = layer;
+ this.data = layer.data;
+ }
+
+ /**
+ * Creates a new command in the context of a specific data set, without data layer
+ *
+ * @param data the data set. Must not be null.
+ * @throws IllegalArgumentException if data is null
+ * @since 11240
+ */
+ public Command(DataSet data) {
+ CheckParameterUtil.ensureParameterNotNull(data, "data");
+ this.layer = null;
+ this.data = data;
}
/**
@@ -225,7 +243,7 @@ public abstract class Command implements PseudoCommand {
* @since 10467
*/
public DataSet getAffectedDataSet() {
- return layer == null ? null : layer.data;
+ return data;
}
/**
@@ -321,7 +339,7 @@ public abstract class Command implements PseudoCommand {
@Override
public int hashCode() {
- return Objects.hash(cloneMap, layer);
+ return Objects.hash(cloneMap, layer, data);
}
@Override
@@ -330,7 +348,8 @@ public abstract class Command implements PseudoCommand {
if (obj == null || getClass() != obj.getClass()) return false;
Command command = (Command) obj;
return Objects.equals(cloneMap, command.cloneMap) &&
- Objects.equals(layer, command.layer);
+ Objects.equals(layer, command.layer) &&
+ Objects.equals(data, command.data);
}
/**
diff --git a/src/org/openstreetmap/josm/command/DeleteCommand.java b/src/org/openstreetmap/josm/command/DeleteCommand.java
index 1eb5d37..11b4b07 100644
--- a/src/org/openstreetmap/josm/command/DeleteCommand.java
+++ b/src/org/openstreetmap/josm/command/DeleteCommand.java
@@ -13,7 +13,6 @@ import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -28,6 +27,7 @@ import javax.swing.JPanel;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.SplitWayAction;
import org.openstreetmap.josm.actions.SplitWayAction.SplitWayResult;
+import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -135,6 +135,23 @@ public class DeleteCommand extends Command {
checkConsistency();
}
+ /**
+ * Constructor for a collection of data to be deleted in the context of
+ * a specific data set
+ *
+ * @param dataset the dataset context for deleting these primitives. Must not be null.
+ * @param data the primitives to delete. Must neither be null nor empty.
+ * @throws IllegalArgumentException if dataset is null
+ * @throws IllegalArgumentException if data is null or empty
+ * @since 11240
+ */
+ public DeleteCommand(DataSet dataset, Collection<? extends OsmPrimitive> data) {
+ super(dataset);
+ CheckParameterUtil.ensureParameterNotNull(data, "data");
+ this.toDelete = data;
+ checkConsistency();
+ }
+
private void checkConsistency() {
if (toDelete.isEmpty()) {
throw new IllegalArgumentException(tr("At least one object to delete required, got empty collection"));
@@ -420,13 +437,7 @@ public class DeleteCommand extends Command {
//
if (!silent) {
Set<RelationToChildReference> references = RelationToChildReference.getRelationToChildReferences(primitivesToDelete);
- Iterator<RelationToChildReference> it = references.iterator();
- while (it.hasNext()) {
- RelationToChildReference ref = it.next();
- if (ref.getParent().isDeleted()) {
- it.remove();
- }
- }
+ references.removeIf(ref -> ref.getParent().isDeleted());
if (!references.isEmpty()) {
DeleteFromRelationConfirmationDialog dialog = DeleteFromRelationConfirmationDialog.getInstance();
dialog.getModel().populate(references);
@@ -447,7 +458,8 @@ public class DeleteCommand extends Command {
// build the delete command
//
if (!primitivesToDelete.isEmpty()) {
- cmds.add(new DeleteCommand(layer, primitivesToDelete));
+ cmds.add(layer != null ? new DeleteCommand(layer, primitivesToDelete) :
+ new DeleteCommand(primitivesToDelete.iterator().next().getDataSet(), primitivesToDelete));
}
return new SequenceCommand(tr("Delete"), cmds);
diff --git a/src/org/openstreetmap/josm/command/PurgeCommand.java b/src/org/openstreetmap/josm/command/PurgeCommand.java
index d092898..d36b8e3 100644
--- a/src/org/openstreetmap/josm/command/PurgeCommand.java
+++ b/src/org/openstreetmap/josm/command/PurgeCommand.java
@@ -42,22 +42,38 @@ public class PurgeCommand extends Command {
protected final ConflictCollection purgedConflicts = new ConflictCollection();
- protected final DataSet ds;
-
/**
+ * Constructs a new {@code PurgeCommand} (handles conflicts).
* This command relies on a number of consistency conditions:
* - makeIncomplete must be a subset of toPurge.
- * - Each primitive, that is in toPurge but not in makeIncomplete, must
- * have all its referrers in toPurge.
- * - Each element of makeIncomplete must not be new and must have only
- * referrers that are either a relation or included in toPurge.
+ * - Each primitive, that is in toPurge but not in makeIncomplete, must have all its referrers in toPurge.
+ * - Each element of makeIncomplete must not be new and must have only referrers that are either a relation or included in toPurge.
* @param layer OSM data layer
* @param toPurge primitives to purge
* @param makeIncomplete primitives to make incomplete
*/
public PurgeCommand(OsmDataLayer layer, Collection<OsmPrimitive> toPurge, Collection<OsmPrimitive> makeIncomplete) {
super(layer);
- this.ds = layer.data;
+ init(toPurge, makeIncomplete);
+ }
+
+ /**
+ * Constructs a new {@code PurgeCommand} (does not handle conflicts).
+ * This command relies on a number of consistency conditions:
+ * - makeIncomplete must be a subset of toPurge.
+ * - Each primitive, that is in toPurge but not in makeIncomplete, must have all its referrers in toPurge.
+ * - Each element of makeIncomplete must not be new and must have only referrers that are either a relation or included in toPurge.
+ * @param data OSM data set
+ * @param toPurge primitives to purge
+ * @param makeIncomplete primitives to make incomplete
+ * @since 11240
+ */
+ public PurgeCommand(DataSet data, Collection<OsmPrimitive> toPurge, Collection<OsmPrimitive> makeIncomplete) {
+ super(data);
+ init(toPurge, makeIncomplete);
+ }
+
+ private void init(Collection<OsmPrimitive> toPurge, Collection<OsmPrimitive> makeIncomplete) {
/**
* The topological sort is to avoid missing way nodes and missing
* relation members when adding primitives back to the dataset on undo.
@@ -81,7 +97,7 @@ public class PurgeCommand extends Command {
@Override
public boolean executeCommand() {
- ds.beginUpdate();
+ getAffectedDataSet().beginUpdate();
try {
purgedConflicts.get().clear();
/**
@@ -104,36 +120,38 @@ public class PurgeCommand extends Command {
empty.setIncomplete(true);
osm.load(empty);
} else {
- ds.removePrimitive(osm);
- Conflict<?> conflict = getLayer().getConflicts().getConflictForMy(osm);
- if (conflict != null) {
- purgedConflicts.add(conflict);
- getLayer().getConflicts().remove(conflict);
+ getAffectedDataSet().removePrimitive(osm);
+ if (getLayer() != null) {
+ Conflict<?> conflict = getLayer().getConflicts().getConflictForMy(osm);
+ if (conflict != null) {
+ purgedConflicts.add(conflict);
+ getLayer().getConflicts().remove(conflict);
+ }
}
}
}
} finally {
- ds.endUpdate();
+ getAffectedDataSet().endUpdate();
}
return true;
}
@Override
public void undoCommand() {
- if (ds == null)
+ if (getAffectedDataSet() == null)
return;
for (OsmPrimitive osm : toPurge) {
PrimitiveData data = makeIncompleteDataByPrimId.get(osm);
if (data != null) {
- if (ds.getPrimitiveById(osm) != osm)
+ if (getAffectedDataSet().getPrimitiveById(osm) != osm)
throw new AssertionError(
String.format("Primitive %s has been made incomplete when purging, but it cannot be found on undo.", osm));
osm.load(data);
} else {
- if (ds.getPrimitiveById(osm) != null)
+ if (getAffectedDataSet().getPrimitiveById(osm) != null)
throw new AssertionError(String.format("Primitive %s was removed when purging, but is still there on undo", osm));
- ds.addPrimitive(osm);
+ getAffectedDataSet().addPrimitive(osm);
}
}
@@ -278,7 +296,7 @@ public class PurgeCommand extends Command {
@Override
public int hashCode() {
- return Objects.hash(super.hashCode(), toPurge, makeIncompleteData, makeIncompleteDataByPrimId, purgedConflicts, ds);
+ return Objects.hash(super.hashCode(), toPurge, makeIncompleteData, makeIncompleteDataByPrimId, purgedConflicts, getAffectedDataSet());
}
@Override
@@ -290,7 +308,6 @@ public class PurgeCommand extends Command {
return Objects.equals(toPurge, that.toPurge) &&
Objects.equals(makeIncompleteData, that.makeIncompleteData) &&
Objects.equals(makeIncompleteDataByPrimId, that.makeIncompleteDataByPrimId) &&
- Objects.equals(purgedConflicts, that.purgedConflicts) &&
- Objects.equals(ds, that.ds);
+ Objects.equals(purgedConflicts, that.purgedConflicts);
}
}
diff --git a/src/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommand.java b/src/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommand.java
index 56c4e4f..0eac1e1 100644
--- a/src/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommand.java
+++ b/src/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommand.java
@@ -73,7 +73,7 @@ public class DeletedStateConflictResolveCommand extends ConflictResolveCommand {
}
private void deleteMy() {
- Set<OsmPrimitive> referrers = getLayer().data.unlinkReferencesToPrimitive(conflict.getMy());
+ Set<OsmPrimitive> referrers = getAffectedDataSet().unlinkReferencesToPrimitive(conflict.getMy());
for (OsmPrimitive p : referrers) {
if (!p.isNew() && !p.isDeleted()) {
p.setModified(true);
diff --git a/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java b/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java
index c795bb2..5835b78 100644
--- a/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java
+++ b/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java
@@ -10,6 +10,7 @@ import java.util.Objects;
import javax.swing.Icon;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.conflict.Conflict;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
@@ -18,33 +19,28 @@ import org.openstreetmap.josm.tools.ImageProvider;
/**
* Represents the resolution of conflicts in the member list of two {@link Relation}s.
- *
+ * @since 1631
*/
public class RelationMemberConflictResolverCommand extends ConflictResolveCommand {
- /** my relation */
- private final Relation my;
- /** their relation */
- private final Relation their;
- /** the list of merged nodes. This becomes the list of news of my way after the
- * command is executed
- */
+ /** the conflict to resolve */
+ private final Conflict<Relation> conflict;
+ /** the list of merged nodes. This becomes the list of news of my way after the command is executed */
private final List<RelationMember> mergedMembers;
/**
- *
- * @param my my relation
- * @param their their relation
+ * Constructs a new {@code RelationMemberConflictResolverCommand}.
+ * @param conflict the conflict to resolve
* @param mergedMembers the list of merged relation members
*/
- public RelationMemberConflictResolverCommand(Relation my, Relation their, List<RelationMember> mergedMembers) {
- this.my = my;
- this.their = their;
+ @SuppressWarnings("unchecked")
+ public RelationMemberConflictResolverCommand(Conflict<? extends OsmPrimitive> conflict, List<RelationMember> mergedMembers) {
+ this.conflict = (Conflict<Relation>) conflict;
this.mergedMembers = mergedMembers;
}
@Override
public String getDescriptionText() {
- return tr("Resolve conflicts in member list of relation {0}", my.getId());
+ return tr("Resolve conflicts in member list of relation {0}", conflict.getMy().getId());
}
@Override
@@ -60,7 +56,7 @@ public class RelationMemberConflictResolverCommand extends ConflictResolveComman
// replace the list of members of 'my' relation by the list of merged members
//
- my.setMembers(mergedMembers);
+ conflict.getMy().setMembers(mergedMembers);
return true;
}
@@ -68,7 +64,7 @@ public class RelationMemberConflictResolverCommand extends ConflictResolveComman
@Override
public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
Collection<OsmPrimitive> added) {
- modified.add(my);
+ modified.add(conflict.getMy());
}
@Override
@@ -91,14 +87,14 @@ public class RelationMemberConflictResolverCommand extends ConflictResolveComman
// restore a conflict if necessary
//
- if (!editLayer.getConflicts().hasConflictForMy(my)) {
- editLayer.getConflicts().add(my, their);
+ if (!editLayer.getConflicts().hasConflictForMy(conflict.getMy())) {
+ editLayer.getConflicts().add(conflict);
}
}
@Override
public int hashCode() {
- return Objects.hash(super.hashCode(), my, their, mergedMembers);
+ return Objects.hash(super.hashCode(), conflict, mergedMembers);
}
@Override
@@ -107,8 +103,7 @@ public class RelationMemberConflictResolverCommand extends ConflictResolveComman
if (obj == null || getClass() != obj.getClass()) return false;
if (!super.equals(obj)) return false;
RelationMemberConflictResolverCommand that = (RelationMemberConflictResolverCommand) obj;
- return Objects.equals(my, that.my) &&
- Objects.equals(their, that.their) &&
- Objects.equals(mergedMembers, that.mergedMembers);
+ return Objects.equals(conflict, that.conflict) &&
+ Objects.equals(mergedMembers, that.mergedMembers);
}
}
diff --git a/src/org/openstreetmap/josm/data/AutosaveTask.java b/src/org/openstreetmap/josm/data/AutosaveTask.java
index 43502d7..7cb06c4 100644
--- a/src/org/openstreetmap/josm/data/AutosaveTask.java
+++ b/src/org/openstreetmap/josm/data/AutosaveTask.java
@@ -25,6 +25,7 @@ import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
import org.openstreetmap.josm.Main;
@@ -74,7 +75,7 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
public static final BooleanProperty PROP_AUTOSAVE_ENABLED = new BooleanProperty("autosave.enabled", true);
public static final IntegerProperty PROP_FILES_PER_LAYER = new IntegerProperty("autosave.filesPerLayer", 1);
public static final IntegerProperty PROP_DELETED_LAYERS = new IntegerProperty("autosave.deletedLayersBackupCount", 5);
- public static final IntegerProperty PROP_INTERVAL = new IntegerProperty("autosave.interval", 5 * 60);
+ public static final IntegerProperty PROP_INTERVAL = new IntegerProperty("autosave.interval", (int) TimeUnit.MINUTES.toSeconds(5));
public static final IntegerProperty PROP_INDEX_LIMIT = new IntegerProperty("autosave.index-limit", 1000);
/** Defines if a notification should be displayed after each autosave */
public static final BooleanProperty PROP_NOTIFICATION = new BooleanProperty("autosave.notification", false);
@@ -130,7 +131,7 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
}
}
- new Timer(true).schedule(this, 1000L, PROP_INTERVAL.get() * 1000L);
+ new Timer(true).schedule(this, TimeUnit.SECONDS.toMillis(1), TimeUnit.SECONDS.toMillis(PROP_INTERVAL.get()));
Main.getLayerManager().addLayerChangeListener(this, true);
}
}
diff --git a/src/org/openstreetmap/josm/data/Bounds.java b/src/org/openstreetmap/josm/data/Bounds.java
index f469321..ca015f5 100644
--- a/src/org/openstreetmap/josm/data/Bounds.java
+++ b/src/org/openstreetmap/josm/data/Bounds.java
@@ -26,6 +26,10 @@ public class Bounds {
*/
private double minLat, minLon, maxLat, maxLon;
+ /**
+ * Gets the point that has both the minimal lat and lon coordinate
+ * @return The point
+ */
public LatLon getMin() {
return new LatLon(minLat, minLon);
}
@@ -50,6 +54,10 @@ public class Bounds {
return minLon;
}
+ /**
+ * Gets the point that has both the maximum lat and lon coordinate
+ * @return The point
+ */
public LatLon getMax() {
return new LatLon(maxLat, maxLon);
}
diff --git a/src/org/openstreetmap/josm/data/CustomConfigurator.java b/src/org/openstreetmap/josm/data/CustomConfigurator.java
index d015b8c..3b723af 100644
--- a/src/org/openstreetmap/josm/data/CustomConfigurator.java
+++ b/src/org/openstreetmap/josm/data/CustomConfigurator.java
@@ -565,12 +565,8 @@ public final class CustomConfigurator {
if ("delete-keys".equals(oper)) {
String pattern = evalVars(item.getAttribute("pattern"));
String key = evalVars(item.getAttribute("key"));
- if (key != null) {
- PreferencesUtils.deletePreferenceKey(key, mainPrefs);
- }
- if (pattern != null) {
- PreferencesUtils.deletePreferenceKeyByPattern(pattern, mainPrefs);
- }
+ PreferencesUtils.deletePreferenceKey(key, mainPrefs);
+ PreferencesUtils.deletePreferenceKeyByPattern(pattern, mainPrefs);
return;
}
@@ -608,11 +604,6 @@ public final class CustomConfigurator {
}
private void processDownloadElement(Element item) {
- String address = evalVars(item.getAttribute("url"));
- String path = evalVars(item.getAttribute("path"));
- String unzip = evalVars(item.getAttribute("unzip"));
- String mkdir = evalVars(item.getAttribute("mkdir"));
-
String base = evalVars(item.getAttribute("base"));
String dir = getDirectoryByAbbr(base);
if (dir == null) {
@@ -620,13 +611,19 @@ public final class CustomConfigurator {
return;
}
+ String path = evalVars(item.getAttribute("path"));
if (path.contains("..") || path.startsWith("/") || path.contains(":")) {
return; // some basic protection
}
- if (address == null || path == null || address.isEmpty() || path.isEmpty()) {
+
+ String address = evalVars(item.getAttribute("url"));
+ if (address.isEmpty() || path.isEmpty()) {
log("Error: Please specify url=\"where to get file\" and path=\"where to place it\"");
return;
}
+
+ String unzip = evalVars(item.getAttribute("unzip"));
+ String mkdir = evalVars(item.getAttribute("mkdir"));
processDownloadOperation(address, path, dir, "true".equals(mkdir), "true".equals(unzip));
}
@@ -640,7 +637,7 @@ public final class CustomConfigurator {
private void processMsgBoxElement(Element elem) {
String text = evalVars(elem.getAttribute("text"));
String locText = evalVars(elem.getAttribute(LanguageInfo.getJOSMLocaleCode()+".text"));
- if (locText != null && !locText.isEmpty()) text = locText;
+ if (!locText.isEmpty()) text = locText;
String type = evalVars(elem.getAttribute("type"));
messageBox(type, text);
@@ -1087,13 +1084,7 @@ public final class CustomConfigurator {
}
}
}
- Iterator<Map.Entry<String, Setting<?>>> it = tmpPref.settingsMap.entrySet().iterator();
- while (it.hasNext()) {
- Map.Entry<String, Setting<?>> e = it.next();
- if (e.getValue().getValue() == null) {
- it.remove();
- }
- }
+ tmpPref.settingsMap.entrySet().removeIf(e -> e.getValue().getValue() == null);
for (Map.Entry<String, Setting<?>> e: tmpPref.settingsMap.entrySet()) {
Setting<?> setting = e.getValue();
diff --git a/src/org/openstreetmap/josm/data/Preferences.java b/src/org/openstreetmap/josm/data/Preferences.java
index 273602a..2bc37ef 100644
--- a/src/org/openstreetmap/josm/data/Preferences.java
+++ b/src/org/openstreetmap/josm/data/Preferences.java
@@ -35,6 +35,7 @@ import java.util.ResourceBundle;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -66,11 +67,14 @@ import org.openstreetmap.josm.data.preferences.PreferencesReader;
import org.openstreetmap.josm.data.preferences.PreferencesWriter;
import org.openstreetmap.josm.data.preferences.Setting;
import org.openstreetmap.josm.data.preferences.StringSetting;
+import org.openstreetmap.josm.gui.preferences.validator.ValidatorTagCheckerRulesPreference;
+import org.openstreetmap.josm.gui.preferences.validator.ValidatorTagCheckerRulesPreference.RulePrefHelper;
import org.openstreetmap.josm.io.OfflineAccessException;
import org.openstreetmap.josm.io.OnlineResource;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ColorHelper;
import org.openstreetmap.josm.tools.I18n;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.ListenerList;
import org.openstreetmap.josm.tools.MultiMap;
import org.openstreetmap.josm.tools.Utils;
@@ -104,7 +108,7 @@ public class Preferences {
"hdop.factor" /* remove entry after April 2017 */
};
- private static final long MAX_AGE_DEFAULT_PREFERENCES = 60L * 60L * 24L * 50L; // 50 days (in seconds)
+ private static final long MAX_AGE_DEFAULT_PREFERENCES = TimeUnit.DAYS.toSeconds(50);
/**
* Internal storage for the preference directory.
@@ -1325,7 +1329,7 @@ public class Preferences {
}
}
} catch (IllegalAccessException ex) {
- throw new RuntimeException(ex);
+ throw new JosmRuntimeException(ex);
}
}
return hash;
@@ -1385,14 +1389,14 @@ public class Preferences {
} else if (f.getType().isAssignableFrom(MultiMap.class)) {
value = multiMapFromJson(key_value.getValue());
} else
- throw new RuntimeException("unsupported preference primitive type");
+ throw new JosmRuntimeException("unsupported preference primitive type");
try {
f.set(struct, value);
} catch (IllegalArgumentException ex) {
throw new AssertionError(ex);
} catch (IllegalAccessException ex) {
- throw new RuntimeException(ex);
+ throw new JosmRuntimeException(ex);
}
}
return struct;
@@ -1510,36 +1514,7 @@ public class Preferences {
* @param loadedVersion JOSM version when the preferences file was written
*/
private void removeObsolete(int loadedVersion) {
- /* drop in October 2016 */
- if (loadedVersion < 9715) {
- Setting<?> setting = settingsMap.get("imagery.entries");
- if (setting instanceof MapListSetting) {
- List<Map<String, String>> l = new LinkedList<>();
- boolean modified = false;
- for (Map<String, String> map: ((MapListSetting) setting).getValue()) {
- Map<String, String> newMap = new HashMap<>();
- for (Entry<String, String> entry: map.entrySet()) {
- String value = entry.getValue();
- if ("noTileHeaders".equals(entry.getKey())) {
- value = value.replaceFirst("\":(\".*\")\\}", "\":[$1]}");
- if (!value.equals(entry.getValue())) {
- modified = true;
- }
- }
- newMap.put(entry.getKey(), value);
- }
- l.add(newMap);
- }
- if (modified) {
- putListOfStructs("imagery.entries", l);
- }
- }
- }
- // drop in November 2016
- removeUrlFromEntries(loadedVersion, 9965,
- "mappaint.style.entries",
- "josm.openstreetmap.de/josmfile?page=Styles/LegacyStandard");
- // drop in December 2016
+ // drop in March 2017
removeUrlFromEntries(loadedVersion, 10063,
"validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",
"resource://data/validator/power.mapcss");
@@ -1547,6 +1522,12 @@ public class Preferences {
if (loadedVersion < 11058) {
migrateOldColorKeys();
}
+ // drop in September 2017
+ if (loadedVersion < 11424) {
+ addNewerDefaultEntry(
+ "validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",
+ "resource://data/validator/territories.mapcss");
+ }
for (String key : OBSOLETE_PREF_KEYS) {
if (settingsMap.containsKey(key)) {
@@ -1596,6 +1577,18 @@ public class Preferences {
}
}
+ private void addNewerDefaultEntry(String key, final String url) {
+ Setting<?> setting = settingsMap.get(key);
+ if (setting instanceof MapListSetting) {
+ List<Map<String, String>> l = new ArrayList<>(((MapListSetting) setting).getValue());
+ if (l.stream().noneMatch(x -> x.values().contains(url))) {
+ RulePrefHelper helper = ValidatorTagCheckerRulesPreference.RulePrefHelper.INSTANCE;
+ l.add(helper.serialize(helper.getDefault().stream().filter(x -> url.equals(x.url)).findFirst().get()));
+ putListOfStructs(key, l);
+ }
+ }
+ }
+
/**
* Enables or not the preferences file auto-save mechanism (save each time a setting is changed).
* This behaviour is enabled by default.
diff --git a/src/org/openstreetmap/josm/data/UndoRedoHandler.java b/src/org/openstreetmap/josm/data/UndoRedoHandler.java
index 6f77728..0b4eabe 100644
--- a/src/org/openstreetmap/josm/data/UndoRedoHandler.java
+++ b/src/org/openstreetmap/josm/data/UndoRedoHandler.java
@@ -106,8 +106,11 @@ public class UndoRedoHandler implements LayerChangeListener {
if (commands.isEmpty())
return;
DataSet ds = Main.getLayerManager().getEditDataSet();
- Collection<? extends OsmPrimitive> oldSelection = ds.getSelected();
- ds.beginUpdate();
+ Collection<? extends OsmPrimitive> oldSelection = null;
+ if (ds != null) {
+ oldSelection = ds.getSelected();
+ ds.beginUpdate();
+ }
try {
for (int i = 1; i <= num; ++i) {
final Command c = commands.removeLast();
@@ -119,10 +122,14 @@ public class UndoRedoHandler implements LayerChangeListener {
}
}
} finally {
- ds.endUpdate();
+ if (ds != null) {
+ ds.endUpdate();
+ }
}
fireCommandsChanged();
- fireIfSelectionChanged(ds, oldSelection);
+ if (ds != null) {
+ fireIfSelectionChanged(ds, oldSelection);
+ }
}
/**
diff --git a/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java b/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java
index a31c411..3b908d5 100644
--- a/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java
+++ b/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java
@@ -43,7 +43,7 @@ public class BufferedImageCacheEntry extends CacheEntry {
if (imageLoaded)
return img;
byte[] content = getContent();
- if (content != null && content.length > 0) {
+ if (content.length > 0) {
img = ImageIO.read(new ByteArrayInputStream(content));
imageLoaded = true;
}
diff --git a/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java b/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java
index e6cf1b1..3c25ec9 100644
--- a/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java
+++ b/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java
@@ -88,9 +88,7 @@ public class HostLimitQueue extends LinkedBlockingDeque<Runnable> {
return job;
}
job = takeFirst();
- if (job != null) {
- acquireSemaphore(job);
- }
+ acquireSemaphore(job);
return job;
}
@@ -118,11 +116,8 @@ public class HostLimitQueue extends LinkedBlockingDeque<Runnable> {
private void acquireSemaphore(Runnable job) throws InterruptedException {
if (job instanceof JCSCachedTileLoaderJob) {
final JCSCachedTileLoaderJob<?, ?> jcsJob = (JCSCachedTileLoaderJob<?, ?>) job;
- Semaphore limit = getSemaphore(jcsJob);
- if (limit != null) {
- limit.acquire();
- jcsJob.setFinishedTask(() -> releaseSemaphore(jcsJob));
- }
+ getSemaphore(jcsJob).acquire();
+ jcsJob.setFinishedTask(() -> releaseSemaphore(jcsJob));
}
}
diff --git a/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java b/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
index 9cc515c..c543bf7 100644
--- a/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
+++ b/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
@@ -238,9 +238,6 @@ public final class JCSCacheManager {
}
private static void removeStaleFiles(String basePathPart, String suffix) {
- deleteCacheFiles(basePathPart); // TODO: this can be removed around 2016.09
- deleteCacheFiles(basePathPart + "_BLOCK"); // TODO: this can be removed around 2016.09
- deleteCacheFiles(basePathPart + "_INDEX"); // TODO: this can be removed around 2016.09
deleteCacheFiles(basePathPart + suffix);
}
diff --git a/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java b/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
index c844e20..ae4f4fb 100644
--- a/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
+++ b/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
@@ -46,12 +46,12 @@ import org.openstreetmap.josm.tools.Utils;
*/
public abstract class JCSCachedTileLoaderJob<K, V extends CacheEntry> implements ICachedLoaderJob<K> {
private static final Logger LOG = FeatureAdapter.getLogger(JCSCachedTileLoaderJob.class.getCanonicalName());
- protected static final long DEFAULT_EXPIRE_TIME = 1000L * 60 * 60 * 24 * 7; // 7 days
+ protected static final long DEFAULT_EXPIRE_TIME = TimeUnit.DAYS.toMillis(7);
// Limit for the max-age value send by the server.
- protected static final long EXPIRE_TIME_SERVER_LIMIT = 1000L * 60 * 60 * 24 * 28; // 4 weeks
+ protected static final long EXPIRE_TIME_SERVER_LIMIT = TimeUnit.DAYS.toMillis(28);
// Absolute expire time limit. Cached tiles that are older will not be used,
// even if the refresh from the server fails.
- protected static final long ABSOLUTE_EXPIRE_TIME_LIMIT = 1000L * 60 * 60 * 24 * 365; // 1 year
+ protected static final long ABSOLUTE_EXPIRE_TIME_LIMIT = TimeUnit.DAYS.toMillis(365);
/**
* maximum download threads that will be started
@@ -195,8 +195,7 @@ public abstract class JCSCachedTileLoaderJob<K, V extends CacheEntry> implements
if (cacheData == null) {
return false;
}
- byte[] content = cacheData.getContent();
- return content != null && content.length > 0;
+ return cacheData.getContent().length > 0;
}
/**
@@ -213,7 +212,12 @@ public abstract class JCSCachedTileLoaderJob<K, V extends CacheEntry> implements
* @return key under which discovered server settings will be kept
*/
protected String getServerKey() {
- return getUrlNoException().getHost();
+ try {
+ return getUrl().getHost();
+ } catch (IOException e) {
+ Main.trace(e);
+ return null;
+ }
}
@Override
@@ -255,7 +259,12 @@ public abstract class JCSCachedTileLoaderJob<K, V extends CacheEntry> implements
private void finishLoading(LoadResult result) {
Set<ICachedLoaderListener> listeners;
synchronized (inProgress) {
- listeners = inProgress.remove(getUrlNoException().toString());
+ try {
+ listeners = inProgress.remove(getUrl().toString());
+ } catch (IOException e) {
+ listeners = null;
+ Main.trace(e);
+ }
}
if (listeners == null) {
LOG.log(Level.WARNING, "Listener not found for URL: {0}. Listener not notified!", getUrlNoException());
@@ -431,8 +440,7 @@ public abstract class JCSCachedTileLoaderJob<K, V extends CacheEntry> implements
if (str != null) {
for (String token: str.split(",")) {
if (token.startsWith("max-age=")) {
- lng = Long.parseLong(token.substring(8)) * 1000 +
- System.currentTimeMillis();
+ lng = TimeUnit.SECONDS.toMillis(Long.parseLong(token.substring(8))) + System.currentTimeMillis();
}
}
}
diff --git a/src/org/openstreetmap/josm/data/coor/QuadTiling.java b/src/org/openstreetmap/josm/data/coor/QuadTiling.java
index 40475e5..e9d02e9 100644
--- a/src/org/openstreetmap/josm/data/coor/QuadTiling.java
+++ b/src/org/openstreetmap/josm/data/coor/QuadTiling.java
@@ -74,10 +74,10 @@ public final class QuadTiling {
* @return quad tiling index for given coordinates and level.
* @since 6171
*/
- public static int index(final double lat, final double lon, final int level) {
+ public static byte index(final double lat, final double lon, final int level) {
long x = lon2x(lon);
long y = lat2y(lat);
int shift = NR_LEVELS-level-1;
- return (int) ((x >> shift & 1) * 2 + (y >> shift & 1));
+ return (byte) ((x >> shift & 1) * 2 + (y >> shift & 1));
}
}
diff --git a/src/org/openstreetmap/josm/data/gpx/GpxData.java b/src/org/openstreetmap/josm/data/gpx/GpxData.java
index 1d2a4c6..d509c5c 100644
--- a/src/org/openstreetmap/josm/data/gpx/GpxData.java
+++ b/src/org/openstreetmap/josm/data/gpx/GpxData.java
@@ -5,6 +5,7 @@ import java.io.File;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
+import java.util.DoubleSummaryStatistics;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
@@ -17,7 +18,6 @@ import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.Data;
import org.openstreetmap.josm.data.DataSource;
import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.tools.Utils;
/**
* Objects of this class represent a gpx file with tracks, waypoints and routes.
@@ -192,23 +192,13 @@ public class GpxData extends WithAttributes implements Data {
* @return minimum and maximum dates in array of 2 elements
*/
public static Date[] getMinMaxTimeForTrack(GpxTrack trk) {
- WayPoint earliest = null, latest = null;
-
- for (GpxTrackSegment seg : trk.getSegments()) {
- for (WayPoint pnt : seg.getWayPoints()) {
- if (latest == null) {
- latest = earliest = pnt;
- } else {
- if (pnt.compareTo(earliest) < 0) {
- earliest = pnt;
- } else if (pnt.compareTo(latest) > 0) {
- latest = pnt;
- }
- }
- }
- }
- if (earliest == null || latest == null) return null;
- return new Date[]{earliest.getTime(), latest.getTime()};
+ final DoubleSummaryStatistics statistics = trk.getSegments().stream()
+ .flatMap(seg -> seg.getWayPoints().stream())
+ .mapToDouble(pnt -> pnt.time)
+ .summaryStatistics();
+ return statistics.getCount() == 0
+ ? null
+ : new Date[]{new Date((long) (statistics.getMin() * 1000)), new Date((long) (statistics.getMax() * 1000))};
}
/**
@@ -219,22 +209,16 @@ public class GpxData extends WithAttributes implements Data {
* @return minimum and maximum dates in array of 2 elements
*/
public Date[] getMinMaxTimeForAllTracks() {
- double min = 1e100;
- double max = -1e100;
- double now = System.currentTimeMillis()/1000.0;
- for (GpxTrack trk: tracks) {
- for (GpxTrackSegment seg : trk.getSegments()) {
- for (WayPoint pnt : seg.getWayPoints()) {
- double t = pnt.time;
- if (t > 0 && t <= now) {
- if (t > max) max = t;
- if (t < min) min = t;
- }
- }
- }
- }
- if (Utils.equalsEpsilon(min, 1e100) || Utils.equalsEpsilon(max, -1e100)) return new Date[0];
- return new Date[]{new Date((long) (min * 1000)), new Date((long) (max * 1000))};
+ double now = System.currentTimeMillis() / 1000.0;
+ final DoubleSummaryStatistics statistics = tracks.stream()
+ .flatMap(trk -> trk.getSegments().stream())
+ .flatMap(seg -> seg.getWayPoints().stream())
+ .mapToDouble(pnt -> pnt.time)
+ .filter(t -> t > 0 && t <= now)
+ .summaryStatistics();
+ return statistics.getCount() == 0
+ ? new Date[0]
+ : new Date[]{new Date((long) (statistics.getMin() * 1000)), new Date((long) (statistics.getMax() * 1000))};
}
/**
diff --git a/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java b/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java
index 1224ac3..593d6c6 100644
--- a/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java
+++ b/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java
@@ -6,6 +6,7 @@ import java.io.StringReader;
import java.net.URL;
import java.util.List;
import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
import org.openstreetmap.gui.jmapviewer.tilesources.BingAerialTileSource;
import org.openstreetmap.gui.jmapviewer.tilesources.TileSourceInfo;
@@ -74,7 +75,7 @@ public class CachedAttributionBingAerialTileSource extends BingAerialTileSource
return ret;
} catch (IOException ex) {
Main.warn(ex, "Could not connect to Bing API. Will retry in " + waitTimeSec + " seconds.");
- Thread.sleep(waitTimeSec * 1000L);
+ Thread.sleep(TimeUnit.SECONDS.toMillis(waitTimeSec));
waitTimeSec *= 2;
}
}
diff --git a/src/org/openstreetmap/josm/data/imagery/CachedTileLoaderFactory.java b/src/org/openstreetmap/josm/data/imagery/CachedTileLoaderFactory.java
index b1c438b..f75184f 100644
--- a/src/org/openstreetmap/josm/data/imagery/CachedTileLoaderFactory.java
+++ b/src/org/openstreetmap/josm/data/imagery/CachedTileLoaderFactory.java
@@ -5,6 +5,7 @@ import java.io.File;
import java.lang.reflect.Constructor;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
import org.apache.commons.jcs.access.behavior.ICacheAccess;
import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
@@ -69,8 +70,8 @@ public class CachedTileLoaderFactory implements TileLoaderFactory {
headers.putAll(inputHeaders);
return getLoader(listener, cache,
- Main.pref.getInteger("socket.timeout.connect", 15) * 1000,
- Main.pref.getInteger("socket.timeout.read", 30) * 1000,
+ (int) TimeUnit.SECONDS.toMillis(Main.pref.getInteger("socket.timeout.connect", 15)),
+ (int) TimeUnit.SECONDS.toMillis(Main.pref.getInteger("socket.timeout.read", 30)),
headers);
}
diff --git a/src/org/openstreetmap/josm/data/imagery/DefaultLayer.java b/src/org/openstreetmap/josm/data/imagery/DefaultLayer.java
new file mode 100644
index 0000000..1549e81
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/imagery/DefaultLayer.java
@@ -0,0 +1,32 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.imagery;
+
+/**
+ *
+ * Simple class representing default layer that might be set in imagery information
+ *
+ * This simple class is needed - as for WMS there is different information needed to specify layer than for WMTS
+ *
+ * @author Wiktor Niesiobedzki
+ *
+ */
+public class DefaultLayer {
+
+ protected String layerName;
+
+ /**
+ * Constructor
+ * @param layerName that is the DefaultLayer
+ */
+ public DefaultLayer(String layerName) {
+ this.layerName = layerName;
+ }
+
+ /**
+ * @return layer name of the default layer
+ */
+ public String getLayerName() {
+ return layerName;
+ }
+
+}
diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
index 3c277fe..4d1c8a4 100644
--- a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
+++ b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
@@ -194,7 +194,7 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
private boolean isGeoreferenceValid;
private boolean isEpsg4326To3857Supported;
/** which layers should be activated by default on layer addition. **/
- private Collection<String> defaultLayers = Collections.emptyList();
+ private Collection<DefaultLayer> defaultLayers = Collections.emptyList();
// when adding a field, also adapt the ImageryInfo(ImageryInfo)
// and ImageryInfo(ImageryPreferenceEntry) constructor, equals method, and ImageryPreferenceEntry
@@ -399,7 +399,8 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
}
}
}
- if (e.projections != null) {
+ if (e.projections != null && !e.projections.isEmpty()) {
+ // split generates null element on empty string which gives one element Array[null]
serverProjections = Arrays.asList(e.projections.split(","));
}
attributionText = e.attribution_text;
@@ -1155,7 +1156,7 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
* to work on
* @return Collection of the layer names
*/
- public Collection<String> getDefaultLayers() {
+ public Collection<DefaultLayer> getDefaultLayers() {
return defaultLayers;
}
@@ -1163,7 +1164,12 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
* Sets the default layers that user will work with
* @param layers set the list of default layers
*/
- public void setDefaultLayers(Collection<String> layers) {
+ public void setDefaultLayers(Collection<DefaultLayer> layers) {
+ if (ImageryType.WMTS.equals(this.imageryType)) {
+ CheckParameterUtil.ensureThat(layers == null ||
+ layers.isEmpty() ||
+ layers.iterator().next() instanceof WMTSDefaultLayer, "Incorrect default layer");
+ }
this.defaultLayers = layers;
}
}
diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
index a3aedd5..dca8692 100644
--- a/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
+++ b/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
@@ -238,17 +238,15 @@ public class ImageryLayerInfo {
Collection<String> newAddedIds = new TreeSet<>(addedIds);
for (ImageryInfo info : layers) {
for (ImageryInfo def : defaultLayers) {
- if (isSimilar(def, info)) {
- if (def.getId() != null && !addedIds.contains(def.getId())) {
- if (!defaultLayerIds.containsKey(def.getId())) {
- // ignore ids used more than once (have been purged from the map)
- continue;
- }
- newAddedIds.add(def.getId());
- if (info.getId() == null) {
- info.setId(def.getId());
- changed = true;
- }
+ if (isSimilar(def, info) && def.getId() != null && !addedIds.contains(def.getId())) {
+ if (!defaultLayerIds.containsKey(def.getId())) {
+ // ignore ids used more than once (have been purged from the map)
+ continue;
+ }
+ newAddedIds.add(def.getId());
+ if (info.getId() == null) {
+ info.setId(def.getId());
+ changed = true;
}
}
}
diff --git a/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java b/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java
index 092ae1c..2027f99 100644
--- a/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java
+++ b/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java
@@ -14,6 +14,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -41,10 +42,8 @@ import org.openstreetmap.josm.tools.HttpClient;
*/
public class TMSCachedTileLoaderJob extends JCSCachedTileLoaderJob<String, BufferedImageCacheEntry> implements TileJob, ICachedLoaderListener {
private static final Logger LOG = FeatureAdapter.getLogger(TMSCachedTileLoaderJob.class.getCanonicalName());
- private static final LongProperty MAXIMUM_EXPIRES = new LongProperty("imagery.generic.maximum_expires",
- 30 /*days*/ * 24 /*hours*/ * 60 /*minutes*/ * 60 /*seconds*/ *1000L /*milliseconds*/);
- private static final LongProperty MINIMUM_EXPIRES = new LongProperty("imagery.generic.minimum_expires",
- 1 /*hour*/ * 60 /*minutes*/ * 60 /*seconds*/ *1000L /*milliseconds*/);
+ private static final LongProperty MAXIMUM_EXPIRES = new LongProperty("imagery.generic.maximum_expires", TimeUnit.DAYS.toMillis(30));
+ private static final LongProperty MINIMUM_EXPIRES = new LongProperty("imagery.generic.minimum_expires", TimeUnit.HOURS.toMillis(1));
private final Tile tile;
private volatile URL url;
@@ -124,7 +123,7 @@ public class TMSCachedTileLoaderJob extends JCSCachedTileLoaderJob<String, Buffe
if (cacheData != null) {
byte[] content = cacheData.getContent();
try {
- return content != null || cacheData.getImage() != null || isNoTileAtZoom();
+ return content.length > 0 || cacheData.getImage() != null || isNoTileAtZoom();
} catch (IOException e) {
LOG.log(Level.WARNING, "JCS TMS - error loading from cache for tile {0}: {1}", new Object[] {tile.getKey(), e.getMessage()});
Main.warn(e);
@@ -325,7 +324,7 @@ public class TMSCachedTileLoaderJob extends JCSCachedTileLoaderJob<String, Buffe
private boolean tryLoadTileImage(CacheEntry object) throws IOException {
if (object != null) {
byte[] content = object.getContent();
- if (content != null && content.length > 0) {
+ if (content.length > 0) {
tile.loadImage(new ByteArrayInputStream(content));
if (tile.getImage() == null) {
tile.setError(tr("Could not load image from tile server"));
diff --git a/src/org/openstreetmap/josm/data/imagery/WMTSDefaultLayer.java b/src/org/openstreetmap/josm/data/imagery/WMTSDefaultLayer.java
new file mode 100644
index 0000000..715a834
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/imagery/WMTSDefaultLayer.java
@@ -0,0 +1,28 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.imagery;
+
+/**
+ * WMTS default layer.
+ * @since 11257
+ */
+public class WMTSDefaultLayer extends DefaultLayer {
+ private final String tileMatrixSet;
+
+ /**
+ * Constructs a new {@code WMTSDefaultLayer}.
+ * @param layerName layer name
+ * @param tileMatrixSet tile matrix set
+ */
+ public WMTSDefaultLayer(String layerName, String tileMatrixSet) {
+ super(layerName);
+ this.tileMatrixSet = tileMatrixSet;
+ }
+
+ /**
+ * Returns the tile matrix set.
+ * @return the tile matrix set
+ */
+ public String getTileMatrixSet() {
+ return tileMatrixSet;
+ }
+}
diff --git a/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java b/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
index 8cd4ad5..d1670d0 100644
--- a/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
+++ b/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
@@ -173,7 +173,10 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
public Object getValueAt(int rowIndex, int columnIndex) {
switch (columnIndex) {
case 0:
- return SelectLayerDialog.this.layers.get(rowIndex).getKey();
+ return SelectLayerDialog.this.layers.get(rowIndex).getValue()
+ .stream()
+ .map(x -> x.name)
+ .collect(Collectors.joining(", ")); //this should be only one
case 1:
return SelectLayerDialog.this.layers.get(rowIndex).getValue()
.stream()
@@ -183,7 +186,7 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
return SelectLayerDialog.this.layers.get(rowIndex).getValue()
.stream()
.map(x -> x.tileMatrixSet.identifier)
- .collect(Collectors.joining(", "));
+ .collect(Collectors.joining(", ")); //this should be only one
default:
throw new IllegalArgumentException();
}
@@ -223,17 +226,13 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
setContent(panel);
}
- private static List<Entry<String, List<Layer>>> groupLayersByName(Collection<Layer> layers) {
- Map<String, List<Layer>> layerByName = layers.stream().collect(Collectors.groupingBy(x -> x.name));
- return layerByName.entrySet().stream().sorted(Map.Entry.comparingByKey()).collect(Collectors.toList());
- }
-
- public String getSelectedLayer() {
+ public DefaultLayer getSelectedLayer() {
int index = list.getSelectedRow();
if (index < 0) {
return null; //nothing selected
}
- return layers.get(index).getKey();
+ Layer selectedLayer = layers.get(index).getValue().iterator().next();
+ return new WMTSDefaultLayer(selectedLayer.name, selectedLayer.tileMatrixSet.identifier);
}
}
@@ -246,7 +245,8 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
private ScaleList nativeScaleList;
- private final String defaultLayer;
+ private final WMTSDefaultLayer defaultLayer;
+
/**
* Creates a tile source based on imagery info
@@ -260,7 +260,7 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
this.baseUrl = GetCapabilitiesParseHelper.normalizeCapabilitiesUrl(handleTemplate(info.getUrl()));
this.layers = getCapabilities();
- this.defaultLayer = info.getDefaultLayers().isEmpty() ? null : info.getDefaultLayers().iterator().next();
+ this.defaultLayer = info.getDefaultLayers().isEmpty() ? null : (WMTSDefaultLayer) info.getDefaultLayers().iterator().next();
if (this.layers.isEmpty())
throw new IllegalArgumentException(tr("No layers defined by getCapabilities document: {0}", info.getUrl()));
}
@@ -269,12 +269,14 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
* Creates a dialog based on this tile source with all available layers and returns the name of selected layer
* @return Name of selected layer
*/
- public String userSelectLayer() {
- Collection<String> layerNames = layers.stream().map(x -> x.name).collect(Collectors.toSet());
+ public DefaultLayer userSelectLayer() {
+ Collection<Entry<String, List<Layer>>> grouppedLayers = groupLayersByName(layers);
// if there is only one layer name no point in asking
- if (layerNames.size() == 1)
- return layerNames.iterator().next();
+ if (grouppedLayers.size() == 1) {
+ Layer selectedLayer = grouppedLayers.iterator().next().getValue().iterator().next();
+ return new WMTSDefaultLayer(selectedLayer.name, selectedLayer.tileMatrixSet.identifier);
+ }
final SelectLayerDialog layerSelection = new SelectLayerDialog(layers);
if (layerSelection.showDialog().getValue() == 1) {
@@ -295,6 +297,12 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
return output.toString();
}
+ private static List<Entry<String, List<Layer>>> groupLayersByName(Collection<Layer> layers) {
+ Map<String, List<Layer>> layerByName = layers.stream().collect(
+ Collectors.groupingBy(x -> x.name + '\u001c' + x.tileMatrixSet.identifier));
+ return layerByName.entrySet().stream().sorted(Map.Entry.comparingByKey()).collect(Collectors.toList());
+ }
+
/**
* @return capabilities
* @throws IOException in case of any I/O error
@@ -306,7 +314,7 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
setCachingStrategy(CachedFile.CachingStrategy.IfModifiedSince).
getInputStream()) {
byte[] data = Utils.readBytesFromStream(in);
- if (data == null || data.length == 0) {
+ if (data.length == 0) {
cf.clear();
throw new IllegalArgumentException("Could not read data from: " + baseUrl);
}
@@ -554,9 +562,11 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
public void initProjection(Projection proj) {
// getLayers will return only layers matching the name, if the user already choose the layer
// so we will not ask the user again to chose the layer, if he just changes projection
- Collection<Layer> candidates = getLayers(currentLayer != null ? currentLayer.name : defaultLayer, proj.toCode());
- if (candidates.size() == 1) {
+ Collection<Layer> candidates = getLayers(
+ currentLayer != null ? new WMTSDefaultLayer(currentLayer.name, currentLayer.tileMatrixSet.identifier) : defaultLayer,
+ proj.toCode());
+ if (candidates.size() == 1) {
Layer newLayer = candidates.iterator().next();
if (newLayer != null) {
this.currentTileMatrixSet = newLayer.tileMatrixSet;
@@ -579,15 +589,19 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
/**
*
- * @param name of the layer to match
+ * @param searchLayer which layer do we look for
* @param projectionCode projection code to match
* @return Collection of layers matching the name of the layer and projection, or only projection if name is not provided
*/
- private Collection<Layer> getLayers(String name, String projectionCode) {
+ private Collection<Layer> getLayers(WMTSDefaultLayer searchLayer, String projectionCode) {
Collection<Layer> ret = new ArrayList<>();
if (this.layers != null) {
for (Layer layer: this.layers) {
- if ((name == null || name.equals(layer.name)) && (projectionCode == null || projectionCode.equals(layer.tileMatrixSet.crs))) {
+ if ((searchLayer == null || (// if it's null, then accept all layers
+ searchLayer.getLayerName().equals(layer.name) &&
+ searchLayer.getTileMatrixSet().equals(layer.tileMatrixSet.identifier)))
+ && (projectionCode == null || // if it's null, then accept any projection
+ projectionCode.equals(layer.tileMatrixSet.crs))) {
ret.add(layer);
}
}
diff --git a/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java b/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
index e0d0ff8..5f5e28e 100644
--- a/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
+++ b/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
@@ -13,6 +13,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import org.openstreetmap.josm.tools.LanguageInfo;
@@ -55,13 +56,13 @@ public abstract class AbstractPrimitive implements IPrimitive {
* This flag shows, that the properties have been changed by the user
* and on upload the object will be send to the server.
*/
- protected static final int FLAG_MODIFIED = 1 << 0;
+ protected static final short FLAG_MODIFIED = 1 << 0;
/**
* This flag is false, if the object is marked
* as deleted on the server.
*/
- protected static final int FLAG_VISIBLE = 1 << 1;
+ protected static final short FLAG_VISIBLE = 1 << 1;
/**
* An object that was deleted by the user.
@@ -70,14 +71,77 @@ public abstract class AbstractPrimitive implements IPrimitive {
* An object usually cannot be deleted if it has non-deleted
* objects still referring to it.
*/
- protected static final int FLAG_DELETED = 1 << 2;
+ protected static final short FLAG_DELETED = 1 << 2;
/**
* A primitive is incomplete if we know its id and type, but nothing more.
* Typically some members of a relation are incomplete until they are
* fetched from the server.
*/
- protected static final int FLAG_INCOMPLETE = 1 << 3;
+ protected static final short FLAG_INCOMPLETE = 1 << 3;
+
+ /**
+ * An object can be disabled by the filter mechanism.
+ * Then it will show in a shade of gray on the map or it is completely
+ * hidden from the view.
+ * Disabled objects usually cannot be selected or modified
+ * while the filter is active.
+ */
+ protected static final short FLAG_DISABLED = 1 << 4;
+
+ /**
+ * This flag is only relevant if an object is disabled by the
+ * filter mechanism (i.e. FLAG_DISABLED is set).
+ * Then it indicates, whether it is completely hidden or
+ * just shown in gray color.
+ *
+ * When the primitive is not disabled, this flag should be
+ * unset as well (for efficient access).
+ */
+ protected static final short FLAG_HIDE_IF_DISABLED = 1 << 5;
+
+ /**
+ * Flag used internally by the filter mechanism.
+ */
+ protected static final short FLAG_DISABLED_TYPE = 1 << 6;
+
+ /**
+ * Flag used internally by the filter mechanism.
+ */
+ protected static final short FLAG_HIDDEN_TYPE = 1 << 7;
+
+ /**
+ * This flag is set if the primitive is a way and
+ * according to the tags, the direction of the way is important.
+ * (e.g. one way street.)
+ */
+ protected static final short FLAG_HAS_DIRECTIONS = 1 << 8;
+
+ /**
+ * If the primitive is tagged.
+ * Some trivial tags like source=* are ignored here.
+ */
+ protected static final short FLAG_TAGGED = 1 << 9;
+
+ /**
+ * This flag is only relevant if FLAG_HAS_DIRECTIONS is set.
+ * It shows, that direction of the arrows should be reversed.
+ * (E.g. oneway=-1.)
+ */
+ protected static final short FLAG_DIRECTION_REVERSED = 1 << 10;
+
+ /**
+ * When hovering over ways and nodes in add mode, the
+ * "target" objects are visually highlighted. This flag indicates
+ * that the primitive is currently highlighted.
+ */
+ protected static final short FLAG_HIGHLIGHTED = 1 << 11;
+
+ /**
+ * If the primitive is annotated with a tag such as note, fixme, etc.
+ * Match the "work in progress" tags in default map style.
+ */
+ protected static final short FLAG_ANNOTATED = 1 << 12;
/**
* Put several boolean flags to one short int field to save memory.
@@ -248,7 +312,7 @@ public abstract class AbstractPrimitive implements IPrimitive {
@Override
public void setTimestamp(Date timestamp) {
- this.timestamp = (int) (timestamp.getTime() / 1000);
+ this.timestamp = (int) TimeUnit.MILLISECONDS.toSeconds(timestamp.getTime());
}
@Override
@@ -258,7 +322,7 @@ public abstract class AbstractPrimitive implements IPrimitive {
@Override
public Date getTimestamp() {
- return new Date(timestamp * 1000L);
+ return new Date(TimeUnit.SECONDS.toMillis(timestamp));
}
@Override
@@ -275,11 +339,11 @@ public abstract class AbstractPrimitive implements IPrimitive {
/* FLAGS
/* ------*/
- protected void updateFlags(int flag, boolean value) {
+ protected void updateFlags(short flag, boolean value) {
if (value) {
flags |= flag;
} else {
- flags &= ~flag;
+ flags &= (short) ~flag;
}
}
diff --git a/src/org/openstreetmap/josm/data/osm/BBox.java b/src/org/openstreetmap/josm/data/osm/BBox.java
index a5c5d78..39a10f2 100644
--- a/src/org/openstreetmap/josm/data/osm/BBox.java
+++ b/src/org/openstreetmap/josm/data/osm/BBox.java
@@ -5,16 +5,29 @@ import java.awt.geom.Rectangle2D;
import java.util.Arrays;
import java.util.Objects;
+import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.coor.QuadTiling;
import org.openstreetmap.josm.tools.Utils;
+/**
+ * A BBox represents an area in lat/lon space. It is used for the quad tree.
+ *
+ * In contrast to a {@link Bounds} object, a BBox can represent an invalid (empty) area.
+ */
public class BBox {
- private double xmin = Double.POSITIVE_INFINITY;
- private double xmax = Double.NEGATIVE_INFINITY;
- private double ymin = Double.POSITIVE_INFINITY;
- private double ymax = Double.NEGATIVE_INFINITY;
+ protected double xmin = Double.POSITIVE_INFINITY;
+ protected double xmax = Double.NEGATIVE_INFINITY;
+ protected double ymin = Double.POSITIVE_INFINITY;
+ protected double ymax = Double.NEGATIVE_INFINITY;
+
+ /**
+ * Constructs a new (invalid) BBox
+ */
+ public BBox() {
+ // Nothing to do
+ }
/**
* Constructs a new {@code BBox} defined by a single point.
@@ -24,14 +37,12 @@ public class BBox {
* @since 6203
*/
public BBox(final double x, final double y) {
- xmax = xmin = x;
- ymax = ymin = y;
- sanity();
+ add(x, y);
}
/**
* Constructs a new {@code BBox} defined by points <code>a</code> and <code>b</code>.
- * Result is minimal BBox containing both points.
+ * Result is minimal BBox containing both points if they are both valid, else undefined
*
* @param a first point
* @param b second point
@@ -52,64 +63,49 @@ public class BBox {
this.ymax = copy.ymax;
}
+ /**
+ * Create minimal BBox so that {@code this.bounds(ax,ay)} and {@code this.bounds(bx,by)} will both return true
+ * @param ax left or right X value (-180 .. 180)
+ * @param ay top or bottom Y value (-90 .. 90)
+ * @param bx left or right X value (-180 .. 180)
+ * @param by top or bottom Y value (-90 .. 90)
+ */
public BBox(double ax, double ay, double bx, double by) {
-
- if (ax > bx) {
- xmax = ax;
- xmin = bx;
- } else {
- xmax = bx;
- xmin = ax;
- }
-
- if (ay > by) {
- ymax = ay;
- ymin = by;
- } else {
- ymax = by;
- ymin = ay;
+ if (!(Double.isNaN(ax) || Double.isNaN(ay) || Double.isNaN(bx) || Double.isNaN(by))) {
+ add(ax, ay);
+ add(bx, by);
}
-
- sanity();
+ // otherwise use default which is an invalid BBox
}
+ /**
+ * Create BBox for all nodes of the way with known coordinates.
+ * If no node has a known coordinate, an invalid BBox is returned.
+ * @param w the way
+ */
public BBox(Way w) {
- for (Node n : w.getNodes()) {
- LatLon coor = n.getCoor();
- if (coor == null) {
- continue;
- }
- add(coor);
- }
+ w.getNodes().forEach(n -> add(n.getCoor()));
}
+ /**
+ * Create BBox for a node. An invalid BBox is returned if the coordinates are not known.
+ * @param n the node
+ */
public BBox(Node n) {
- LatLon coor = n.getCoor();
- if (coor == null) {
- xmin = xmax = ymin = ymax = 0;
- } else {
- xmin = xmax = coor.lon();
- ymin = ymax = coor.lat();
- }
- }
-
- private void sanity() {
- if (xmin < -180.0) {
- xmin = -180.0;
- }
- if (xmax > 180.0) {
- xmax = 180.0;
- }
- if (ymin < -90.0) {
- ymin = -90.0;
- }
- if (ymax > 90.0) {
- ymax = 90.0;
+ if (n.isLatLonKnown()) {
+ add(n.getCoor());
}
}
+ /**
+ * Add a point to an existing BBox. Extends this bbox if necessary so that this.bounds(c) will return true
+ * if c is a valid LatLon instance.
+ * @param c a LatLon point
+ */
public final void add(LatLon c) {
- add(c.lon(), c.lat());
+ if (c != null && c.isValid()) {
+ add(c.lon(), c.lat());
+ }
}
/**
@@ -118,33 +114,60 @@ public class BBox {
* @param y Y coordinate
*/
public final void add(double x, double y) {
- xmin = Math.min(xmin, x);
- xmax = Math.max(xmax, x);
- ymin = Math.min(ymin, y);
- ymax = Math.max(ymax, y);
- sanity();
+ if (!Double.isNaN(x) && !Double.isNaN(y)) {
+ xmin = Math.min(xmin, x);
+ xmax = Math.max(xmax, x);
+ ymin = Math.min(ymin, y);
+ ymax = Math.max(ymax, y);
+ }
}
- public final void add(BBox box) {
- xmin = Math.min(xmin, box.xmin);
- xmax = Math.max(xmax, box.xmax);
- ymin = Math.min(ymin, box.ymin);
- ymax = Math.max(ymax, box.ymax);
- sanity();
+ /**
+ * Extends this bbox to include the bbox other. Does nothing if other is not valid.
+ * @param other a bbox
+ */
+ public final void add(BBox other) {
+ if (other.isValid()) {
+ xmin = Math.min(xmin, other.xmin);
+ xmax = Math.max(xmax, other.xmax);
+ ymin = Math.min(ymin, other.ymin);
+ ymax = Math.max(ymax, other.ymax);
+ }
}
+ /**
+ * Extends this bbox to include the bbox of the primitive extended by extraSpace.
+ * @param primitive an OSM primitive
+ * @param extraSpace the value to extend the primitives bbox. Unit is in LatLon degrees.
+ */
public void addPrimitive(OsmPrimitive primitive, double extraSpace) {
BBox primBbox = primitive.getBBox();
add(primBbox.xmin - extraSpace, primBbox.ymin - extraSpace);
add(primBbox.xmax + extraSpace, primBbox.ymax + extraSpace);
}
+ /**
+ * Gets the height of the bbox.
+ * @return The difference between ymax and ymin. 0 for invalid bboxes.
+ */
public double height() {
- return ymax-ymin;
+ if (isValid()) {
+ return ymax - ymin;
+ } else {
+ return 0;
+ }
}
+ /**
+ * Gets the width of the bbox.
+ * @return The difference between xmax and xmin. 0 for invalid bboxes.
+ */
public double width() {
- return xmax-xmin;
+ if (isValid()) {
+ return xmax - xmin;
+ } else {
+ return 0;
+ }
}
/**
@@ -174,15 +197,8 @@ public class BBox {
* @return {@code true} if this bbox intersects with the other
*/
public boolean intersects(BBox b) {
- if (xmin > b.xmax)
- return false;
- if (xmax < b.xmin)
- return false;
- if (ymin > b.ymax)
- return false;
- if (ymax < b.ymin)
- return false;
- return true;
+ return xmin <= b.xmax && xmax >= b.xmin
+ && ymin <= b.ymax && ymax >= b.ymin;
}
/**
@@ -237,23 +253,27 @@ public class BBox {
return xmax;
}
+ /**
+ * Gets the center of this BBox.
+ * @return The center.
+ */
public LatLon getCenter() {
return new LatLon(ymin + (ymax-ymin)/2.0, xmin + (xmax-xmin)/2.0);
}
- int getIndex(final int level) {
+ byte getIndex(final int level) {
- int idx1 = QuadTiling.index(ymin, xmin, level);
+ byte idx1 = QuadTiling.index(ymin, xmin, level);
- final int idx2 = QuadTiling.index(ymin, xmax, level);
+ final byte idx2 = QuadTiling.index(ymin, xmax, level);
if (idx1 == -1) idx1 = idx2;
else if (idx1 != idx2) return -1;
- final int idx3 = QuadTiling.index(ymax, xmin, level);
+ final byte idx3 = QuadTiling.index(ymax, xmin, level);
if (idx1 == -1) idx1 = idx3;
else if (idx1 != idx3) return -1;
- final int idx4 = QuadTiling.index(ymax, xmax, level);
+ final byte idx4 = QuadTiling.index(ymax, xmax, level);
if (idx1 == -1) idx1 = idx4;
else if (idx1 != idx4) return -1;
@@ -278,6 +298,23 @@ public class BBox {
&& Double.compare(b.xmin, xmin) == 0 && Double.compare(b.ymin, ymin) == 0;
}
+ /**
+ * @return true if the bbox covers a part of the planets surface
+ * Height and width must be non-negative, but may (both) be 0.
+ * @since 11269
+ */
+ public boolean isValid() {
+ return xmin <= xmax && ymin <= ymax;
+ }
+
+ /**
+ * @return true if the bbox is avalid and covers a part of the planets surface
+ * @since 11269
+ */
+ public boolean isInWorld() {
+ return isValid() && xmin >= -180.0 && xmax <= 180.0 && ymin >= -90.0 && ymax <= 90.0;
+ }
+
@Override
public String toString() {
return "[ x: " + xmin + " -> " + xmax + ", y: " + ymin + " -> " + ymax + " ]";
diff --git a/src/org/openstreetmap/josm/data/osm/Changeset.java b/src/org/openstreetmap/josm/data/osm/Changeset.java
index fd2c044..1d21e03 100644
--- a/src/org/openstreetmap/josm/data/osm/Changeset.java
+++ b/src/org/openstreetmap/josm/data/osm/Changeset.java
@@ -102,85 +102,165 @@ public final class Changeset implements Tagged {
return changeset;
}
+ /**
+ * Visitor pattern.
+ * @param v visitor
+ */
public void visit(Visitor v) {
v.visit(this);
}
+ /**
+ * Compares this changeset to another, based on their identifier.
+ * @param other other changeset
+ * @return the value {@code 0} if {@code getId() == other.getId()};
+ * a value less than {@code 0} if {@code getId() < other.getId()}; and
+ * a value greater than {@code 0} if {@code getId() > other.getId()}
+ */
public int compareTo(Changeset other) {
return Integer.compare(getId(), other.getId());
}
+ /**
+ * Returns the changeset name.
+ * @return the changeset name (untranslated: "changeset <identifier>")
+ */
public String getName() {
// no translation
return "changeset " + getId();
}
+ /**
+ * Returns the changeset display name, as per given name formatter.
+ * @param formatter name formatter
+ * @return the changeset display name, as per given name formatter
+ */
public String getDisplayName(NameFormatter formatter) {
return formatter.format(this);
}
+ /**
+ * Returns the changeset identifier.
+ * @return the changeset identifier
+ */
public int getId() {
return id;
}
+ /**
+ * Sets the changeset identifier.
+ * @param id changeset identifier
+ */
public void setId(int id) {
this.id = id;
}
+ /**
+ * Returns the changeset user.
+ * @return the changeset user
+ */
public User getUser() {
return user;
}
+ /**
+ * Sets the changeset user.
+ * @param user changeset user
+ */
public void setUser(User user) {
this.user = user;
}
+ /**
+ * Returns the changeset creation date.
+ * @return the changeset creation date
+ */
public Date getCreatedAt() {
return createdAt;
}
+ /**
+ * Sets the changeset creation date.
+ * @param createdAt changeset creation date
+ */
public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
}
+ /**
+ * Returns the changeset closure date.
+ * @return the changeset closure date
+ */
public Date getClosedAt() {
return closedAt;
}
+ /**
+ * Sets the changeset closure date.
+ * @param closedAt changeset closure date
+ */
public void setClosedAt(Date closedAt) {
this.closedAt = closedAt;
}
+ /**
+ * Determines if this changeset is open.
+ * @return {@code true} if this changeset is open
+ */
public boolean isOpen() {
return open;
}
+ /**
+ * Sets whether this changeset is open.
+ * @param open {@code true} if this changeset is open
+ */
public void setOpen(boolean open) {
this.open = open;
}
+ /**
+ * Returns the min lat/lon of the changeset bounding box.
+ * @return the min lat/lon of the changeset bounding box
+ */
public LatLon getMin() {
return min;
}
+ /**
+ * Sets the min lat/lon of the changeset bounding box.
+ * @param min min lat/lon of the changeset bounding box
+ */
public void setMin(LatLon min) {
this.min = min;
}
+ /**
+ * Returns the max lat/lon of the changeset bounding box.
+ * @return the max lat/lon of the changeset bounding box
+ */
public LatLon getMax() {
return max;
}
+ /**
+ * Sets the max lat/lon of the changeset bounding box.
+ * @param max min lat/lon of the changeset bounding box
+ */
+ public void setMax(LatLon max) {
+ this.max = max;
+ }
+
+ /**
+ * Returns the changeset bounding box.
+ * @return the changeset bounding box
+ */
public Bounds getBounds() {
if (min != null && max != null)
return new Bounds(min, max);
return null;
}
- public void setMax(LatLon max) {
- this.max = max;
- }
-
/**
* Replies the number of comments for this changeset.
* @return the number of comments for this changeset
@@ -216,10 +296,18 @@ public final class Changeset implements Tagged {
this.tags = keys;
}
+ /**
+ * Determines if this changeset is incomplete.
+ * @return {@code true} if this changeset is incomplete
+ */
public boolean isIncomplete() {
return incomplete;
}
+ /**
+ * Sets whether this changeset is incomplete
+ * @param incomplete {@code true} if this changeset is incomplete
+ */
public void setIncomplete(boolean incomplete) {
this.incomplete = incomplete;
}
@@ -248,6 +336,11 @@ public final class Changeset implements Tagged {
this.tags.clear();
}
+ /**
+ * Determines if this changeset has equals semantic attributes with another one.
+ * @param other other changeset
+ * @return {@code true} if this changeset has equals semantic attributes with other changeset
+ */
public boolean hasEqualSemanticAttributes(Changeset other) {
if (other == null)
return false;
@@ -314,10 +407,18 @@ public final class Changeset implements Tagged {
return tags.keySet();
}
+ /**
+ * Determines if this changeset is new.
+ * @return {@code true} if this changeset is new ({@code id <= 0})
+ */
public boolean isNew() {
return id <= 0;
}
+ /**
+ * Merges changeset metadata from another changeset.
+ * @param other other changeset
+ */
public void mergeFrom(Changeset other) {
if (other == null)
return;
@@ -338,14 +439,26 @@ public final class Changeset implements Tagged {
this.content = other.content;
}
+ /**
+ * Determines if this changeset has contents.
+ * @return {@code true} if this changeset has contents
+ */
public boolean hasContent() {
return content != null;
}
+ /**
+ * Returns the changeset contents.
+ * @return the changeset contents, can be null
+ */
public ChangesetDataSet getContent() {
return content;
}
+ /**
+ * Sets the changeset contents.
+ * @param content changeset contents, can be null
+ */
public void setContent(ChangesetDataSet content) {
this.content = content;
}
diff --git a/src/org/openstreetmap/josm/data/osm/ChangesetCache.java b/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
index a97955a..cb7d7ce 100644
--- a/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
+++ b/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
@@ -38,30 +38,40 @@ public final class ChangesetCache implements PreferenceChangedListener {
/** the unique instance */
private static final ChangesetCache instance = new ChangesetCache();
- /**
- * Replies the unique instance of the cache
- *
- * @return the unique instance of the cache
- */
- public static ChangesetCache getInstance() {
- return instance;
- }
-
/** the cached changesets */
private final Map<Integer, Changeset> cache = new HashMap<>();
private final CopyOnWriteArrayList<ChangesetCacheListener> listeners = new CopyOnWriteArrayList<>();
+ /**
+ * Constructs a new {@code ChangesetCache}.
+ */
private ChangesetCache() {
Main.pref.addPreferenceChangeListener(this);
}
+ /**
+ * Replies the unique instance of the cache
+ * @return the unique instance of the cache
+ */
+ public static ChangesetCache getInstance() {
+ return instance;
+ }
+
+ /**
+ * Add a changeset cache listener.
+ * @param listener changeset cache listener to add
+ */
public void addChangesetCacheListener(ChangesetCacheListener listener) {
if (listener != null) {
listeners.addIfAbsent(listener);
}
}
+ /**
+ * Remove a changeset cache listener.
+ * @param listener changeset cache listener to remove
+ */
public void removeChangesetCacheListener(ChangesetCacheListener listener) {
if (listener != null) {
listeners.remove(listener);
@@ -89,12 +99,20 @@ public final class ChangesetCache implements PreferenceChangedListener {
}
}
+ /**
+ * Update a single changeset.
+ * @param cs changeset to update
+ */
public void update(Changeset cs) {
DefaultChangesetCacheEvent e = new DefaultChangesetCacheEvent(this);
update(cs, e);
fireChangesetCacheEvent(e);
}
+ /**
+ * Update a collection of changesets.
+ * @param changesets changesets to update
+ */
public void update(Collection<Changeset> changesets) {
if (changesets == null || changesets.isEmpty()) return;
DefaultChangesetCacheEvent e = new DefaultChangesetCacheEvent(this);
@@ -104,21 +122,40 @@ public final class ChangesetCache implements PreferenceChangedListener {
fireChangesetCacheEvent(e);
}
+ /**
+ * Determines if the cache contains an entry for given changeset identifier.
+ * @param id changeset id
+ * @return {@code true} if the cache contains an entry for {@code id}
+ */
public boolean contains(int id) {
if (id <= 0) return false;
return cache.get(id) != null;
}
+ /**
+ * Determines if the cache contains an entry for given changeset.
+ * @param cs changeset
+ * @return {@code true} if the cache contains an entry for {@code cs}
+ */
public boolean contains(Changeset cs) {
if (cs == null) return false;
if (cs.isNew()) return false;
return contains(cs.getId());
}
+ /**
+ * Returns the entry for given changeset identifier.
+ * @param id changeset id
+ * @return the entry for given changeset identifier, or null
+ */
public Changeset get(int id) {
return cache.get(id);
}
+ /**
+ * Returns the list of changesets contained in the cache.
+ * @return the list of changesets contained in the cache
+ */
public Set<Changeset> getChangesets() {
return new HashSet<>(cache.values());
}
@@ -131,6 +168,11 @@ public final class ChangesetCache implements PreferenceChangedListener {
e.rememberRemovedChangeset(cs);
}
+ /**
+ * Remove the entry for the given changeset identifier.
+ * A {@link ChangesetCacheEvent} is fired.
+ * @param id changeset id
+ */
public void remove(int id) {
DefaultChangesetCacheEvent e = new DefaultChangesetCacheEvent(this);
remove(id, e);
@@ -139,6 +181,11 @@ public final class ChangesetCache implements PreferenceChangedListener {
}
}
+ /**
+ * Remove the entry for the given changeset.
+ * A {@link ChangesetCacheEvent} is fired.
+ * @param cs changeset
+ */
public void remove(Changeset cs) {
if (cs == null) return;
if (cs.isNew()) return;
@@ -146,8 +193,8 @@ public final class ChangesetCache implements PreferenceChangedListener {
}
/**
- * Removes the changesets in <code>changesets</code> from the cache. A
- * {@link ChangesetCacheEvent} is fired.
+ * Removes the changesets in <code>changesets</code> from the cache.
+ * A {@link ChangesetCacheEvent} is fired.
*
* @param changesets the changesets to remove. Ignored if null.
*/
@@ -165,10 +212,17 @@ public final class ChangesetCache implements PreferenceChangedListener {
}
}
+ /**
+ * Returns the number of changesets contained in the cache.
+ * @return the number of changesets contained in the cache
+ */
public int size() {
return cache.size();
}
+ /**
+ * Clears the cache.
+ */
public void clear() {
DefaultChangesetCacheEvent e = new DefaultChangesetCacheEvent(this);
for (Changeset cs: cache.values()) {
diff --git a/src/org/openstreetmap/josm/data/osm/DataSet.java b/src/org/openstreetmap/josm/data/osm/DataSet.java
index 8c86b12..f5caec5 100644
--- a/src/org/openstreetmap/josm/data/osm/DataSet.java
+++ b/src/org/openstreetmap/josm/data/osm/DataSet.java
@@ -14,6 +14,7 @@ import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.locks.Lock;
@@ -45,6 +46,7 @@ import org.openstreetmap.josm.data.projection.Projection;
import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.SubclassFilteredCollection;
import org.openstreetmap.josm.tools.Utils;
@@ -497,13 +499,16 @@ public final class DataSet implements Data, ProjectionChangeListener {
* @param primitive the primitive.
*/
public void addPrimitive(OsmPrimitive primitive) {
+ Objects.requireNonNull(primitive, "primitive");
beginUpdate();
try {
if (getPrimitiveById(primitive) != null)
throw new DataIntegrityProblemException(
tr("Unable to add primitive {0} to the dataset because it is already included", primitive.toString()));
- primitive.updatePosition(); // Set cached bbox for way and relation (required for reindexWay and reinexRelation to work properly)
+ allPrimitives.add(primitive);
+ primitive.setDataset(this);
+ primitive.updatePosition(); // Set cached bbox for way and relation (required for reindexWay and reindexRelation to work properly)
boolean success = false;
if (primitive instanceof Node) {
success = nodes.add((Node) primitive);
@@ -513,9 +518,7 @@ public final class DataSet implements Data, ProjectionChangeListener {
success = relations.add((Relation) primitive);
}
if (!success)
- throw new RuntimeException("failed to add primitive: "+primitive);
- allPrimitives.add(primitive);
- primitive.setDataset(this);
+ throw new JosmRuntimeException("failed to add primitive: "+primitive);
firePrimitivesAdded(Collections.singletonList(primitive), false);
} finally {
endUpdate();
@@ -546,7 +549,7 @@ public final class DataSet implements Data, ProjectionChangeListener {
success = relations.remove(primitive);
}
if (!success)
- throw new RuntimeException("failed to remove primitive: "+primitive);
+ throw new JosmRuntimeException("failed to remove primitive: "+primitive);
synchronized (selectionLock) {
selectedPrimitives.remove(primitive);
selectionSnapshot = null;
@@ -1062,10 +1065,10 @@ public final class DataSet implements Data, ProjectionChangeListener {
private void reindexNode(Node node, LatLon newCoor, EastNorth eastNorth) {
if (!nodes.remove(node))
- throw new RuntimeException("Reindexing node failed to remove");
+ throw new JosmRuntimeException("Reindexing node failed to remove");
node.setCoorInternal(newCoor, eastNorth);
if (!nodes.add(node))
- throw new RuntimeException("Reindexing node failed to add");
+ throw new JosmRuntimeException("Reindexing node failed to add");
for (OsmPrimitive primitive: node.getReferrers()) {
if (primitive instanceof Way) {
reindexWay((Way) primitive);
@@ -1078,10 +1081,10 @@ public final class DataSet implements Data, ProjectionChangeListener {
private void reindexWay(Way way) {
BBox before = way.getBBox();
if (!ways.remove(way))
- throw new RuntimeException("Reindexing way failed to remove");
+ throw new JosmRuntimeException("Reindexing way failed to remove");
way.updatePosition();
if (!ways.add(way))
- throw new RuntimeException("Reindexing way failed to add");
+ throw new JosmRuntimeException("Reindexing way failed to add");
if (!way.getBBox().equals(before)) {
for (OsmPrimitive primitive: way.getReferrers()) {
reindexRelation((Relation) primitive);
diff --git a/src/org/openstreetmap/josm/data/osm/DataSetMerger.java b/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
index c4d3749..2ec40f4 100644
--- a/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
+++ b/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
@@ -17,6 +17,7 @@ import org.openstreetmap.josm.data.conflict.Conflict;
import org.openstreetmap.josm.data.conflict.ConflictCollection;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
/**
* A dataset merger which takes a target and a source dataset and merges the source data set
@@ -142,7 +143,7 @@ public class DataSetMerger {
protected void fixIncomplete(Way other) {
Way myWay = (Way) getMergeTarget(other);
if (myWay == null)
- throw new RuntimeException(tr("Missing merge target for way with id {0}", other.getUniqueId()));
+ throw new JosmRuntimeException(tr("Missing merge target for way with id {0}", other.getUniqueId()));
}
/**
@@ -177,7 +178,7 @@ public class DataSetMerger {
OsmPrimitive target = it.next();
OsmPrimitive source = sourceDataSet.getPrimitiveById(target.getPrimitiveId());
if (source == null)
- throw new RuntimeException(
+ throw new JosmRuntimeException(
tr("Object of type {0} with id {1} was marked to be deleted, but it''s missing in the source dataset",
target.getType(), target.getUniqueId()));
diff --git a/src/org/openstreetmap/josm/data/osm/FilterMatcher.java b/src/org/openstreetmap/josm/data/osm/FilterMatcher.java
index ae5a979..29dcb42 100644
--- a/src/org/openstreetmap/josm/data/osm/FilterMatcher.java
+++ b/src/org/openstreetmap/josm/data/osm/FilterMatcher.java
@@ -133,11 +133,9 @@ public class FilterMatcher {
hiddenFilters.add(fi);
}
} else {
- if (filter.mode == SearchMode.replace) {
- if (filter.hiding) {
- hiddenFilters.clear();
- disabledFilters.clear();
- }
+ if (filter.mode == SearchMode.replace && filter.hiding) {
+ hiddenFilters.clear();
+ disabledFilters.clear();
}
disabledFilters.add(fi);
diff --git a/src/org/openstreetmap/josm/data/osm/Node.java b/src/org/openstreetmap/josm/data/osm/Node.java
index f18879d..ab14376 100644
--- a/src/org/openstreetmap/josm/data/osm/Node.java
+++ b/src/org/openstreetmap/josm/data/osm/Node.java
@@ -1,6 +1,7 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
+import java.awt.geom.Area;
import java.util.Collection;
import java.util.Objects;
import java.util.Set;
@@ -237,6 +238,8 @@ public final class Node extends OsmPrimitive implements INode {
@Override
public void cloneFrom(OsmPrimitive osm) {
+ if (!(osm instanceof Node))
+ throw new IllegalArgumentException("Not a node: " + osm);
boolean locked = writeLock();
try {
super.cloneFrom(osm);
@@ -259,6 +262,8 @@ public final class Node extends OsmPrimitive implements INode {
*/
@Override
public void mergeFrom(OsmPrimitive other) {
+ if (!(other instanceof Node))
+ throw new IllegalArgumentException("Not a node: " + other);
boolean locked = writeLock();
try {
super.mergeFrom(other);
@@ -270,7 +275,10 @@ public final class Node extends OsmPrimitive implements INode {
}
}
- @Override public void load(PrimitiveData data) {
+ @Override
+ public void load(PrimitiveData data) {
+ if (!(data instanceof NodeData))
+ throw new IllegalArgumentException("Not a node data: " + data);
boolean locked = writeLock();
try {
super.load(data);
@@ -280,7 +288,8 @@ public final class Node extends OsmPrimitive implements INode {
}
}
- @Override public NodeData save() {
+ @Override
+ public NodeData save() {
NodeData data = new NodeData();
saveCommonAttributes(data);
if (!isIncomplete()) {
@@ -297,19 +306,16 @@ public final class Node extends OsmPrimitive implements INode {
@Override
public boolean hasEqualSemanticAttributes(OsmPrimitive other, boolean testInterestingTagsOnly) {
- if (!(other instanceof Node))
- return false;
- if (!super.hasEqualSemanticAttributes(other, testInterestingTagsOnly))
- return false;
- Node n = (Node) other;
- LatLon coor = getCoor();
- LatLon otherCoor = n.getCoor();
- if (coor == null && otherCoor == null)
- return true;
- else if (coor != null && otherCoor != null)
- return coor.equalsEpsilon(otherCoor);
- else
- return false;
+ return (other instanceof Node)
+ && hasEqualSemanticFlags(other)
+ && hasEqualCoordinates((Node) other)
+ && super.hasEqualSemanticAttributes(other, testInterestingTagsOnly);
+ }
+
+ private boolean hasEqualCoordinates(Node other) {
+ final LatLon c1 = getCoor();
+ final LatLon c2 = other.getCoor();
+ return (c1 == null && c2 == null) || (c1 != null && c2 != null && c1.equalsEpsilon(c2));
}
@Override
@@ -329,7 +335,12 @@ public final class Node extends OsmPrimitive implements INode {
@Override
public BBox getBBox() {
- return new BBox(this);
+ return new BBox(lon, lat);
+ }
+
+ @Override
+ protected void addToBBox(BBox box, Set<PrimitiveId> visited) {
+ box.add(lon, lat);
}
@Override
@@ -409,7 +420,12 @@ public final class Node extends OsmPrimitive implements INode {
@Override
public boolean isOutsideDownloadArea() {
- return !isNewOrUndeleted() && getDataSet() != null && getDataSet().getDataSourceArea() != null
- && getCoor() != null && !getCoor().isIn(getDataSet().getDataSourceArea());
+ if (isNewOrUndeleted() || getDataSet() == null)
+ return false;
+ Area area = getDataSet().getDataSourceArea();
+ if (area == null)
+ return false;
+ LatLon coor = getCoor();
+ return coor != null && !coor.isIn(area);
}
}
diff --git a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
index 07eb4e1..2630ff1 100644
--- a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
+++ b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
@@ -45,69 +45,6 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
private static final String SPECIAL_VALUE_LOCAL_NAME = "localname";
/**
- * An object can be disabled by the filter mechanism.
- * Then it will show in a shade of gray on the map or it is completely
- * hidden from the view.
- * Disabled objects usually cannot be selected or modified
- * while the filter is active.
- */
- protected static final int FLAG_DISABLED = 1 << 4;
-
- /**
- * This flag is only relevant if an object is disabled by the
- * filter mechanism (i.e. FLAG_DISABLED is set).
- * Then it indicates, whether it is completely hidden or
- * just shown in gray color.
- *
- * When the primitive is not disabled, this flag should be
- * unset as well (for efficient access).
- */
- protected static final int FLAG_HIDE_IF_DISABLED = 1 << 5;
-
- /**
- * Flag used internally by the filter mechanism.
- */
- protected static final int FLAG_DISABLED_TYPE = 1 << 6;
-
- /**
- * Flag used internally by the filter mechanism.
- */
- protected static final int FLAG_HIDDEN_TYPE = 1 << 7;
-
- /**
- * This flag is set if the primitive is a way and
- * according to the tags, the direction of the way is important.
- * (e.g. one way street.)
- */
- protected static final int FLAG_HAS_DIRECTIONS = 1 << 8;
-
- /**
- * If the primitive is tagged.
- * Some trivial tags like source=* are ignored here.
- */
- protected static final int FLAG_TAGGED = 1 << 9;
-
- /**
- * This flag is only relevant if FLAG_HAS_DIRECTIONS is set.
- * It shows, that direction of the arrows should be reversed.
- * (E.g. oneway=-1.)
- */
- protected static final int FLAG_DIRECTION_REVERSED = 1 << 10;
-
- /**
- * When hovering over ways and nodes in add mode, the
- * "target" objects are visually highlighted. This flag indicates
- * that the primitive is currently highlighted.
- */
- protected static final int FLAG_HIGHLIGHTED = 1 << 11;
-
- /**
- * If the primitive is annotated with a tag such as note, fixme, etc.
- * Match the "work in progress" tags in default map style.
- */
- protected static final int FLAG_ANNOTATED = 1 << 12;
-
- /**
* A tagged way that matches this pattern has a direction.
* @see #FLAG_HAS_DIRECTIONS
*/
@@ -247,7 +184,7 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
* MAPPAINT
*--------*/
public StyleCache mappaintStyle;
- public int mappaintCacheIdx;
+ private short mappaintCacheIdx;
/* This should not be called from outside. Fixing the UI to add relevant
get/set functions calling this implicitely is preferred, so we can have
@@ -255,6 +192,23 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
public void clearCachedStyle() {
mappaintStyle = null;
}
+
+ /**
+ * Returns mappaint cache index.
+ * @return mappaint cache index
+ */
+ public final short getMappaintCacheIdx() {
+ return mappaintCacheIdx;
+ }
+
+ /**
+ * Sets the mappaint cache index.
+ * @param mappaintCacheIdx mappaint cache index
+ */
+ public final void setMappaintCacheIdx(short mappaintCacheIdx) {
+ this.mappaintCacheIdx = mappaintCacheIdx;
+ }
+
/* end of mappaint data */
/*---------
@@ -395,12 +349,12 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
/* FLAGS
/* ------*/
- private void updateFlagsNoLock(int flag, boolean value) {
+ private void updateFlagsNoLock(short flag, boolean value) {
super.updateFlags(flag, value);
}
@Override
- protected final void updateFlags(int flag, boolean value) {
+ protected final void updateFlags(short flag, boolean value) {
boolean locked = writeLock();
try {
updateFlagsNoLock(flag, value);
@@ -439,7 +393,8 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
boolean locked = writeLock();
try {
int oldFlags = flags;
- updateFlagsNoLock(FLAG_DISABLED + FLAG_HIDE_IF_DISABLED, false);
+ updateFlagsNoLock(FLAG_DISABLED, false);
+ updateFlagsNoLock(FLAG_HIDE_IF_DISABLED, false);
return oldFlags != flags;
} finally {
writeUnlock(locked);
@@ -685,7 +640,7 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
"watch", "watch:", "description", "attribution"));
l.addAll(getDiscardableKeys());
l.addAll(getWorkInProgressKeys());
- uninteresting = Main.pref.getCollection("tags.uninteresting", l);
+ uninteresting = new HashSet<>(Main.pref.getCollection("tags.uninteresting", l));
}
return uninteresting;
}
@@ -697,7 +652,7 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
*/
public static Collection<String> getDiscardableKeys() {
if (discardable == null) {
- discardable = Main.pref.getCollection("tags.discardable",
+ discardable = new HashSet<>(Main.pref.getCollection("tags.discardable",
Arrays.asList(
"created_by",
"converted_by",
@@ -742,7 +697,7 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
"yh:TYPE",
"yh:WIDTH",
"yh:WIDTH_RANK"
- ));
+ )));
}
return discardable;
}
@@ -755,8 +710,8 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
*/
public static Collection<String> getWorkInProgressKeys() {
if (workinprogress == null) {
- workinprogress = Main.pref.getCollection("tags.workinprogress",
- Arrays.asList("note", "fixme", "FIXME"));
+ workinprogress = new HashSet<>(Main.pref.getCollection("tags.workinprogress",
+ Arrays.asList("note", "fixme", "FIXME")));
}
return workinprogress;
}
@@ -1094,10 +1049,8 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
else {
int counter = 0;
for (OsmPrimitive o : (OsmPrimitive[]) referrers) {
- if (dataSet == o.dataSet && o instanceof Way) {
- if (++counter >= n)
- return true;
- }
+ if (dataSet == o.dataSet && o instanceof Way && ++counter >= n)
+ return true;
}
return false;
}
@@ -1132,7 +1085,7 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
* Merges the technical and semantical attributes from <code>other</code> onto this.
*
* Both this and other must be new, or both must be assigned an OSM ID. If both this and <code>other</code>
- * have an assigend OSM id, the IDs have to be the same.
+ * have an assigned OSM id, the IDs have to be the same.
*
* @param other the other primitive. Must not be null.
* @throws IllegalArgumentException if other is null.
@@ -1187,12 +1140,17 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
return hasEqualSemanticAttributes(other, true);
}
- boolean hasEqualSemanticAttributes(final OsmPrimitive other, final boolean testInterestingTagsOnly) {
+ boolean hasEqualSemanticFlags(final OsmPrimitive other) {
if (!isNew() && id != other.id)
return false;
if (isIncomplete() ^ other.isIncomplete()) // exclusive or operator for performance (see #7159)
return false;
- return testInterestingTagsOnly ? hasSameInterestingTags(other) : getKeys().equals(other.getKeys());
+ return true;
+ }
+
+ boolean hasEqualSemanticAttributes(final OsmPrimitive other, final boolean testInterestingTagsOnly) {
+ return hasEqualSemanticFlags(other)
+ && (testInterestingTagsOnly ? hasSameInterestingTags(other) : getKeys().equals(other.getKeys()));
}
/**
@@ -1416,4 +1374,12 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
public boolean isMultipolygon() {
return false;
}
+
+ /**
+ * If necessary, extend the bbox to contain this primitive
+ * @param box a bbox instance
+ * @param visited a set of visited members or null
+ * @since 11269
+ */
+ protected abstract void addToBBox(BBox box, Set<PrimitiveId> visited);
}
diff --git a/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java b/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java
index 9a160dc..bb6687d 100644
--- a/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java
+++ b/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java
@@ -8,14 +8,22 @@ import java.text.MessageFormat;
import java.util.Arrays;
import java.util.Collection;
+/**
+ * OSM primitive type.
+ * @since 1670
+ */
public enum OsmPrimitiveType {
+ /** Node type */
NODE(marktr(/* ICON(data/) */"node"), Node.class, NodeData.class),
+ /** Way type */
WAY(marktr(/* ICON(data/) */"way"), Way.class, WayData.class),
+ /** Relation type */
RELATION(marktr(/* ICON(data/) */"relation"), Relation.class, RelationData.class),
- /* only for display, no real type */
+ /** Closed way: only for display, no real type */
CLOSEDWAY(marktr(/* ICON(data/) */"closedway"), null, WayData.class),
+ /** Multipolygon: only for display, no real type */
MULTIPOLYGON(marktr(/* ICON(data/) */"multipolygon"), null, RelationData.class);
private static final Collection<OsmPrimitiveType> DATA_VALUES = Arrays.asList(NODE, WAY, RELATION);
diff --git a/src/org/openstreetmap/josm/data/osm/QuadBuckets.java b/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
index e3f2509..0c6a594 100644
--- a/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
+++ b/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.NoSuchElementException;
@@ -14,7 +15,7 @@ import org.openstreetmap.josm.data.coor.QuadTiling;
/**
* Note: bbox of primitives added to QuadBuckets has to stay the same. In case of coordinate change, primitive must
- * be removed and readded.
+ * be removed and re-added.
*
* This class is (no longer) thread safe.
* @param <T> type of primitives
@@ -22,21 +23,20 @@ import org.openstreetmap.josm.data.coor.QuadTiling;
*/
public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
private static final boolean consistency_testing = false;
- private static final int NW_INDEX = 1;
- private static final int NE_INDEX = 3;
- private static final int SE_INDEX = 2;
- private static final int SW_INDEX = 0;
+ private static final byte NW_INDEX = 1;
+ private static final byte NE_INDEX = 3;
+ private static final byte SE_INDEX = 2;
+ private static final byte SW_INDEX = 0;
static void abort(String s) {
throw new AssertionError(s);
}
- public static final int MAX_OBJECTS_PER_LEVEL = 16;
+ private static final int MAX_OBJECTS_PER_NODE = 48;
- static class QBLevel<T extends OsmPrimitive> {
- private final int level;
- private final int index;
- private final BBox bbox;
+ static class QBLevel<T extends OsmPrimitive> extends BBox {
+ private final byte level;
+ private final byte index;
private final long quad;
private final QBLevel<T> parent;
private boolean isLeaf = true;
@@ -45,28 +45,26 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
// child order by index is sw, nw, se, ne
private QBLevel<T> nw, ne, sw, se;
- private final QuadBuckets<T> buckets;
-
- private QBLevel<T> getChild(int index) {
+ private QBLevel<T> getChild(byte index) {
switch (index) {
case NE_INDEX:
if (ne == null) {
- ne = new QBLevel<>(this, index, buckets);
+ ne = new QBLevel<>(this, index);
}
return ne;
case NW_INDEX:
if (nw == null) {
- nw = new QBLevel<>(this, index, buckets);
+ nw = new QBLevel<>(this, index);
}
return nw;
case SE_INDEX:
if (se == null) {
- se = new QBLevel<>(this, index, buckets);
+ se = new QBLevel<>(this, index);
}
return se;
case SW_INDEX:
if (sw == null) {
- sw = new QBLevel<>(this, index, buckets);
+ sw = new QBLevel<>(this, index);
}
return sw;
default:
@@ -81,55 +79,46 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
@Override
public String toString() {
- return super.toString() + '[' + level + "]: " + bbox();
+ return super.toString() + '[' + level + "]: ";
}
/**
* Constructor for root node
- * @param buckets quadbuckets
*/
- QBLevel(final QuadBuckets<T> buckets) {
+ QBLevel() {
+ super(-180, 90, 180, -90);
level = 0;
index = 0;
quad = 0;
parent = null;
- bbox = new BBox(-180, 90, 180, -90);
- this.buckets = buckets;
}
- QBLevel(QBLevel<T> parent, int parentIndex, final QuadBuckets<T> buckets) {
+ QBLevel(QBLevel<T> parent, byte index) {
this.parent = parent;
- this.level = parent.level + 1;
- this.index = parentIndex;
- this.buckets = buckets;
+ this.level = (byte) (parent.level + 1);
+ this.index = index;
int shift = (QuadTiling.NR_LEVELS - level) * 2;
- long mult = 1;
- // Java blows the big one. It seems to wrap when you shift by > 31
- if (shift >= 30) {
- shift -= 30;
- mult = 1 << 30;
- }
- long quadpart = mult * (parentIndex << shift);
+ long quadpart = (long) index << shift;
this.quad = parent.quad | quadpart;
- this.bbox = calculateBBox(); // calculateBBox reference quad
- }
-
- private BBox calculateBBox() {
- LatLon bottomLeft = this.coor();
- double lat = bottomLeft.lat() + parent.height() / 2;
- double lon = bottomLeft.lon() + parent.width() / 2;
- return new BBox(bottomLeft.lon(), bottomLeft.lat(), lon, lat);
+ LatLon bottomLeft = QuadTiling.tile2LatLon(this.quad);
+ xmin = bottomLeft.lon();
+ ymin = bottomLeft.lat();
+ xmax = xmin + parent.width() / 2;
+ ymax = ymin + parent.height() / 2;
}
QBLevel<T> findBucket(BBox bbox) {
if (!hasChildren())
return this;
else {
- int idx = bbox.getIndex(level);
+ byte idx = bbox.getIndex(level);
if (idx == -1)
return this;
- return getChild(idx).findBucket(bbox);
+ QBLevel<T> child = getChild(idx);
+ if (child == null)
+ return this;
+ return child.findBucket(bbox);
}
}
@@ -153,20 +142,20 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
/*
* There is a race between this and qb.nextContentNode().
- * If nextContentNode() runs into this bucket, it may
- * attempt to null out 'children' because it thinks this
- * is a dead end.
+ * If nextContentNode() runs into this bucket, it may attempt to null out 'children' because it thinks this is a dead end.
*/
void doSplit() {
List<T> tmpcontent = content;
content = null;
for (T o : tmpcontent) {
- int idx = o.getBBox().getIndex(level);
+ byte idx = o.getBBox().getIndex(level);
if (idx == -1) {
doAddContent(o);
} else {
- getChild(idx).doAdd(o);
+ QBLevel<T> child = getChild(idx);
+ if (child != null)
+ child.doAdd(o);
}
}
isLeaf = false; // It's not enough to check children because all items could end up in this level (index == -1)
@@ -181,11 +170,6 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
}
boolean matches(final T o, final BBox searchBbox) {
- if (o instanceof Node) {
- final LatLon latLon = ((Node) o).getCoor();
- // node without coords -> bbox[0,0,0,0]
- return searchBbox.bounds(latLon != null ? latLon : LatLon.ZERO);
- }
return o.getBBox().intersects(searchBbox);
}
@@ -282,14 +266,14 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
void doAdd(T o) {
if (consistency_testing) {
- if (!matches(o, this.bbox())) {
+ if (o instanceof Node && !matches(o, this)) {
o.getBBox().getIndex(level);
o.getBBox().getIndex(level - 1);
- abort("\nobject " + o + " does not belong in node at level: " + level + " bbox: " + this.bbox());
+ abort("\nobject " + o + " does not belong in node at level: " + level + " bbox: " + super.toString());
}
}
doAddContent(o);
- if (isLeaf() && content.size() > MAX_OBJECTS_PER_LEVEL && level < QuadTiling.NR_LEVELS) {
+ if (isLeaf() && content.size() > MAX_OBJECTS_PER_NODE && level < QuadTiling.NR_LEVELS) {
doSplit();
}
}
@@ -298,10 +282,10 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
findBucket(o.getBBox()).doAdd(o);
}
- private void search(BBox searchBbox, List<T> result) {
- if (!this.bbox().intersects(searchBbox))
+ private void search(QuadBuckets<T> buckets, BBox searchBbox, List<T> result) {
+ if (!this.intersects(searchBbox))
return;
- else if (bbox().bounds(searchBbox)) {
+ else if (this.bounds(searchBbox)) {
buckets.searchCache = this;
}
@@ -312,16 +296,16 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
//TODO Coincidence vector should be calculated here and only buckets that match search_bbox should be checked
if (nw != null) {
- nw.search(searchBbox, result);
+ nw.search(buckets, searchBbox, result);
}
if (ne != null) {
- ne.search(searchBbox, result);
+ ne.search(buckets, searchBbox, result);
}
if (se != null) {
- se.search(searchBbox, result);
+ se.search(buckets, searchBbox, result);
}
if (sw != null) {
- sw.search(searchBbox, result);
+ sw.search(buckets, searchBbox, result);
}
}
@@ -332,32 +316,13 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
int indexOf(QBLevel<T> findThis) {
QBLevel<T>[] children = getChildren();
for (int i = 0; i < QuadTiling.TILES_PER_LEVEL; i++) {
- if (children[i] == findThis)
+ if (children[i] == findThis) {
return i;
+ }
}
return -1;
}
- double width() {
- return bbox.width();
- }
-
- double height() {
- return bbox.height();
- }
-
- public BBox bbox() {
- return bbox;
- }
-
- /*
- * This gives the coordinate of the bottom-left
- * corner of the box
- */
- final LatLon coor() {
- return QuadTiling.tile2LatLon(this.quad);
- }
-
void removeFromParent() {
if (parent == null)
return;
@@ -382,17 +347,14 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
}
boolean canRemove() {
- if (content != null && !content.isEmpty())
- return false;
- if (this.hasChildren())
- return false;
- return true;
+ return (content == null || content.isEmpty()) && !this.hasChildren();
}
}
private QBLevel<T> root;
private QBLevel<T> searchCache;
private int size;
+ private Collection<T> invalidBBoxPrimitives;
/**
* Constructs a new {@code QuadBuckets}.
@@ -403,14 +365,19 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
@Override
public final void clear() {
- root = new QBLevel<>(this);
+ root = new QBLevel<>();
+ invalidBBoxPrimitives = new LinkedHashSet<>();
searchCache = null;
size = 0;
}
@Override
public boolean add(T n) {
- root.add(n);
+ if (n.getBBox().isValid()) {
+ root.add(n);
+ } else {
+ invalidBBoxPrimitives.add(n);
+ }
size++;
return true;
}
@@ -421,8 +388,9 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
if (objects.contains(o)) {
continue;
}
- if (!this.remove(o))
+ if (!this.remove(o)) {
return false;
+ }
}
return true;
}
@@ -448,8 +416,9 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
@Override
public boolean containsAll(Collection<?> objects) {
for (Object o : objects) {
- if (!this.contains(o))
+ if (!this.contains(o)) {
return false;
+ }
}
return true;
}
@@ -460,17 +429,23 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
T t = (T) o;
searchCache = null; // Search cache might point to one of removed buckets
QBLevel<T> bucket = root.findBucket(t.getBBox());
- if (bucket.removeContent(t)) {
+ boolean removed = bucket.removeContent(t);
+ if (!removed) {
+ removed = invalidBBoxPrimitives.remove(o);
+ }
+ if (removed) {
size--;
- return true;
- } else
- return false;
+ }
+ return removed;
}
@Override
public boolean contains(Object o) {
@SuppressWarnings("unchecked")
T t = (T) o;
+ if (!t.getBBox().isValid()) {
+ return invalidBBoxPrimitives.contains(o);
+ }
QBLevel<T> bucket = root.findBucket(t.getBBox());
return bucket != null && bucket.content != null && bucket.content.contains(t);
}
@@ -500,6 +475,8 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
class QuadBucketIterator implements Iterator<T> {
private QBLevel<T> currentNode;
private int contentIndex;
+ private final Iterator<T> invalidBBoxIterator = invalidBBoxPrimitives.iterator();
+ boolean fromInvalidBBoxPrimitives;
QuadBuckets<T> qb;
final QBLevel<T> nextContentNode(QBLevel<T> q) {
@@ -525,8 +502,10 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
@Override
public boolean hasNext() {
- if (this.peek() == null)
- return false;
+ if (this.peek() == null) {
+ fromInvalidBBoxPrimitives = true;
+ return invalidBBoxIterator.hasNext();
+ }
return true;
}
@@ -547,6 +526,9 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
@Override
public T next() {
+ if (fromInvalidBBoxPrimitives) {
+ return invalidBBoxIterator.next();
+ }
T ret = peek();
if (ret == null)
throw new NoSuchElementException();
@@ -556,14 +538,20 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
@Override
public void remove() {
- // two uses
- // 1. Back up to the thing we just returned
- // 2. move the index back since we removed
- // an element
- contentIndex--;
- T object = peek();
- if (currentNode.removeContent(object))
+ if (fromInvalidBBoxPrimitives) {
+ invalidBBoxIterator.remove();
qb.size--;
+ } else {
+ // two uses
+ // 1. Back up to the thing we just returned
+ // 2. move the index back since we removed
+ // an element
+ contentIndex--;
+ T object = peek();
+ if (currentNode.removeContent(object))
+ qb.size--;
+
+ }
}
}
@@ -582,14 +570,23 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
return size == 0;
}
+ /**
+ * Search the tree for objects in the bbox (or crossing the bbox if they are ways)
+ * @param searchBbox the bbox
+ * @return List of primitives within the bbox (or crossing the bbox if they are ways). Can be empty, but not null.
+ */
public List<T> search(BBox searchBbox) {
List<T> ret = new ArrayList<>();
+ if (!searchBbox.isValid()) {
+ return ret;
+ }
+
// Doing this cuts down search cost on a real-life data set by about 25%
if (searchCache == null) {
searchCache = root;
}
// Walk back up the tree when the last search spot can not cover the current search
- while (searchCache != null && !searchCache.bbox().bounds(searchBbox)) {
+ while (searchCache != null && !searchCache.bounds(searchBbox)) {
searchCache = searchCache.parent;
}
@@ -601,7 +598,7 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
// Save parent because searchCache might change during search call
QBLevel<T> tmp = searchCache.parent;
- searchCache.search(searchBbox, ret);
+ searchCache.search(this, searchBbox, ret);
// A way that spans this bucket may be stored in one
// of the nodes which is a parent of the search cache
diff --git a/src/org/openstreetmap/josm/data/osm/Relation.java b/src/org/openstreetmap/josm/data/osm/Relation.java
index a86ea07..0f989c3 100644
--- a/src/org/openstreetmap/josm/data/osm/Relation.java
+++ b/src/org/openstreetmap/josm/data/osm/Relation.java
@@ -239,6 +239,8 @@ public final class Relation extends OsmPrimitive implements IRelation {
@Override
public void cloneFrom(OsmPrimitive osm) {
+ if (!(osm instanceof Relation))
+ throw new IllegalArgumentException("Not a relation: " + osm);
boolean locked = writeLock();
try {
super.cloneFrom(osm);
@@ -251,6 +253,8 @@ public final class Relation extends OsmPrimitive implements IRelation {
@Override
public void load(PrimitiveData data) {
+ if (!(data instanceof RelationData))
+ throw new IllegalArgumentException("Not a relation data: " + data);
boolean locked = writeLock();
try {
super.load(data);
@@ -270,7 +274,8 @@ public final class Relation extends OsmPrimitive implements IRelation {
}
}
- @Override public RelationData save() {
+ @Override
+ public RelationData save() {
RelationData data = new RelationData();
saveCommonAttributes(data);
for (RelationMember member:getMembers()) {
@@ -302,12 +307,10 @@ public final class Relation extends OsmPrimitive implements IRelation {
@Override
public boolean hasEqualSemanticAttributes(OsmPrimitive other, boolean testInterestingTagsOnly) {
- if (!(other instanceof Relation))
- return false;
- if (!super.hasEqualSemanticAttributes(other, testInterestingTagsOnly))
- return false;
- Relation r = (Relation) other;
- return Arrays.equals(members, r.members);
+ return (other instanceof Relation)
+ && hasEqualSemanticFlags(other)
+ && Arrays.equals(members, ((Relation) other).members)
+ && super.hasEqualSemanticAttributes(other, testInterestingTagsOnly);
}
@Override
@@ -446,57 +449,39 @@ public final class Relation extends OsmPrimitive implements IRelation {
@Override
public BBox getBBox() {
- RelationMember[] members = this.members;
+ if (getDataSet() != null && bbox != null)
+ return new BBox(bbox); // use cached value
- if (members.length == 0)
- return new BBox(0, 0, 0, 0);
- if (getDataSet() == null)
- return calculateBBox(new HashSet<PrimitiveId>());
- else {
- if (bbox == null) {
- bbox = calculateBBox(new HashSet<PrimitiveId>());
- }
- if (bbox == null)
- return new BBox(0, 0, 0, 0); // No real members
- else
- return new BBox(bbox);
- }
+ BBox box = new BBox();
+ addToBBox(box, new HashSet<PrimitiveId>());
+ if (getDataSet() != null)
+ setBBox(box); // set cache
+ return new BBox(box);
}
- private BBox calculateBBox(Set<PrimitiveId> visitedRelations) {
- if (visitedRelations.contains(this))
- return null;
- visitedRelations.add(this);
+ private void setBBox(BBox bbox) {
+ this.bbox = bbox;
+ }
- RelationMember[] members = this.members;
- if (members.length == 0)
- return null;
- else {
- BBox result = null;
- for (RelationMember rm:members) {
- BBox box = rm.isRelation() ? rm.getRelation().calculateBBox(visitedRelations) : rm.getMember().getBBox();
- if (box != null) {
- if (result == null) {
- result = box;
- } else {
- result.add(box);
- }
- }
- }
- return result;
+ @Override
+ protected void addToBBox(BBox box, Set<PrimitiveId> visited) {
+ for (RelationMember rm : members) {
+ if (visited.add(rm.getMember()))
+ rm.getMember().addToBBox(box, visited);
}
}
@Override
public void updatePosition() {
- bbox = calculateBBox(new HashSet<PrimitiveId>());
+ setBBox(null); // make sure that it is recalculated
+ setBBox(getBBox());
}
@Override
void setDataset(DataSet dataSet) {
super.setDataset(dataSet);
checkMembers();
- bbox = null; // bbox might have changed if relation was in ds, was removed, modified, added back to dataset
+ setBBox(null); // bbox might have changed if relation was in ds, was removed, modified, added back to dataset
}
/**
diff --git a/src/org/openstreetmap/josm/data/osm/Storage.java b/src/org/openstreetmap/josm/data/osm/Storage.java
index 9fe8b42..451bc65 100644
--- a/src/org/openstreetmap/josm/data/osm/Storage.java
+++ b/src/org/openstreetmap/josm/data/osm/Storage.java
@@ -2,6 +2,7 @@
package org.openstreetmap.josm.data.osm;
import java.util.AbstractSet;
+import java.util.Arrays;
import java.util.Collection;
import java.util.ConcurrentModificationException;
import java.util.Iterator;
@@ -71,6 +72,9 @@ import org.openstreetmap.josm.tools.Utils;
*/
public class Storage<T> extends AbstractSet<T> {
+ /**
+ * Hash for {@link PrimitiveId}.
+ */
public static class PrimitiveIdHash implements Hash<PrimitiveId, PrimitiveId> {
@Override
@@ -110,35 +114,62 @@ public class Storage<T> extends AbstractSet<T> {
this(Storage.<T>defaultHash(), capacity, false);
}
+ /**
+ * Constructs a new {@code Storage} with given hash.
+ * @param ha hash
+ */
public Storage(Hash<? super T, ? super T> ha) {
this(ha, DEFAULT_CAPACITY, false);
}
+ /**
+ * Constructs a new {@code Storage}.
+ * @param safeIterator If set to false, you must not modify the Storage while iterating over it.
+ * If set to true, you can safely modify, but the read-only iteration will happen on a copy of the unmodified Storage.
+ * This is similar to CopyOnWriteArrayList.
+ */
public Storage(boolean safeIterator) {
this(Storage.<T>defaultHash(), DEFAULT_CAPACITY, safeIterator);
}
+ /**
+ * Constructs a new {@code Storage} with given capacity.
+ * @param capacity capacity
+ * @param safeIterator If set to false, you must not modify the Storage while iterating over it.
+ * If set to true, you can safely modify, but the read-only iteration will happen on a copy of the unmodified Storage.
+ * This is similar to CopyOnWriteArrayList.
+ */
public Storage(int capacity, boolean safeIterator) {
this(Storage.<T>defaultHash(), capacity, safeIterator);
}
+ /**
+ * Constructs a new {@code Storage} with given hash.
+ * @param ha hash
+ * @param safeIterator If set to false, you must not modify the Storage while iterating over it.
+ * If set to true, you can safely modify, but the read-only iteration will happen on a copy of the unmodified Storage.
+ * This is similar to CopyOnWriteArrayList.
+ */
public Storage(Hash<? super T, ? super T> ha, boolean safeIterator) {
this(ha, DEFAULT_CAPACITY, safeIterator);
}
+ /**
+ * Constructs a new {@code Storage} with given hash and capacity.
+ * @param ha hash
+ * @param capacity capacity
+ */
public Storage(Hash<? super T, ? super T> ha, int capacity) {
this(ha, capacity, false);
}
/**
- * constructor
+ * Constructs a new {@code Storage} with given hash and capacity.
* @param ha hash
* @param capacity capacity
- * @param safeIterator If set to false, you must not modify the Storage
- * while iterating over it. If set to true, you can safely
- * modify, but the read-only iteration will happen on a copy
- * of the unmodified Storage.
- * This is similar to CopyOnWriteArrayList.
+ * @param safeIterator If set to false, you must not modify the Storage while iterating over it.
+ * If set to true, you can safely modify, but the read-only iteration will happen on a copy of the unmodified Storage.
+ * This is similar to CopyOnWriteArrayList.
*/
public Storage(Hash<? super T, ? super T> ha, int capacity, boolean safeIterator) {
this.hash = ha;
@@ -208,12 +239,25 @@ public class Storage<T> extends AbstractSet<T> {
@Override
public synchronized int hashCode() {
int h = 0;
- for (T t : this) {
- h += hash.getHashCode(t);
+ if (hash != null) {
+ for (T t : this) {
+ h += hash.getHashCode(t);
+ }
}
return h;
}
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null || getClass() != obj.getClass())
+ return false;
+ Storage<?> other = (Storage<?>) obj;
+ return Arrays.equals(data, other.data)
+ && hashCode() == obj.hashCode();
+ }
+
// ----------------- Extended API ----------------------------
public synchronized T put(T t) {
@@ -290,7 +334,7 @@ public class Storage<T> extends AbstractSet<T> {
T entry;
int hcode = rehash(ha.getHashCode(key));
int bucket = hcode & mask;
- while ((entry = data[bucket]) != null) {
+ while (bucket < data.length && (entry = data[bucket]) != null) {
if (ha.equals(key, entry))
return bucket;
bucket = (bucket+1) & mask;
@@ -459,9 +503,24 @@ public class Storage<T> extends AbstractSet<T> {
}
}
- private final class SafeReadonlyIter implements Iterator<T> {
+ private abstract class AbstractIter implements Iterator<T> {
+ protected int slot;
+
+ protected final boolean doHasNext(T[] data) {
+ if (data == null) return false;
+ align(data);
+ return slot < data.length;
+ }
+
+ protected void align(T[] data) {
+ while (slot < data.length && data[slot] == null) {
+ slot++;
+ }
+ }
+ }
+
+ private final class SafeReadonlyIter extends AbstractIter {
private final T[] data;
- private int slot;
SafeReadonlyIter(T[] data) {
this.data = data;
@@ -469,8 +528,7 @@ public class Storage<T> extends AbstractSet<T> {
@Override
public boolean hasNext() {
- align();
- return slot < data.length;
+ return doHasNext(data);
}
@Override
@@ -483,17 +541,10 @@ public class Storage<T> extends AbstractSet<T> {
public void remove() {
throw new UnsupportedOperationException();
}
-
- private void align() {
- while (slot < data.length && data[slot] == null) {
- slot++;
- }
- }
}
- private final class Iter implements Iterator<T> {
+ private final class Iter extends AbstractIter {
private final int mods;
- private int slot;
private int removeSlot = -1;
Iter() {
@@ -502,8 +553,7 @@ public class Storage<T> extends AbstractSet<T> {
@Override
public boolean hasNext() {
- align();
- return slot < data.length;
+ return doHasNext(data);
}
@Override
@@ -522,13 +572,11 @@ public class Storage<T> extends AbstractSet<T> {
removeSlot = -1;
}
- private void align() {
+ @Override
+ protected void align(T[] data) {
if (mods != modCount)
throw new ConcurrentModificationException();
- while (slot < data.length && data[slot] == null) {
- slot++;
- }
+ super.align(data);
}
}
-
}
diff --git a/src/org/openstreetmap/josm/data/osm/TagCollection.java b/src/org/openstreetmap/josm/data/osm/TagCollection.java
index 437b75c..441ddce 100644
--- a/src/org/openstreetmap/josm/data/osm/TagCollection.java
+++ b/src/org/openstreetmap/josm/data/osm/TagCollection.java
@@ -290,12 +290,7 @@ public class TagCollection implements Iterable<Tag>, Serializable {
*/
public void removeByKey(String key) {
if (key != null) {
- Iterator<Tag> it = tags.keySet().iterator();
- while (it.hasNext()) {
- if (it.next().matchesKey(key)) {
- it.remove();
- }
- }
+ tags.keySet().removeIf(tag -> tag.matchesKey(key));
}
}
diff --git a/src/org/openstreetmap/josm/data/osm/UserInfo.java b/src/org/openstreetmap/josm/data/osm/UserInfo.java
index 7505691..6e9ee64 100644
--- a/src/org/openstreetmap/josm/data/osm/UserInfo.java
+++ b/src/org/openstreetmap/josm/data/osm/UserInfo.java
@@ -6,6 +6,10 @@ import java.util.List;
import org.openstreetmap.josm.data.coor.LatLon;
+/**
+ * Public user information.
+ * @since 2115
+ */
public class UserInfo {
/** the user id */
private int id;
@@ -31,58 +35,114 @@ public class UserInfo {
id = 0;
}
+ /**
+ * Returns the user identifier.
+ * @return the user identifier
+ */
public int getId() {
return id;
}
+ /**
+ * Sets the user identifier.
+ * @param id the user identifier
+ */
public void setId(int id) {
this.id = id;
}
+ /**
+ * Returns the display name.
+ * @return the display name
+ */
public String getDisplayName() {
return displayName;
}
+ /**
+ * Sets the display name.
+ * @param displayName display name
+ */
public void setDisplayName(String displayName) {
this.displayName = displayName;
}
+ /**
+ * Returns the date at which the account has been created.
+ * @return the user account creation date
+ */
public Date getAccountCreated() {
return accountCreated;
}
+ /**
+ * Sets the date at which the account has been created.
+ * @param accountCreated user account creation date
+ */
public void setAccountCreated(Date accountCreated) {
this.accountCreated = accountCreated;
}
+ /**
+ * Returns the user home coordinates, if set.
+ * @return the user home lat/lon or null
+ */
public LatLon getHome() {
return home;
}
+ /**
+ * Sets the user home coordinates.
+ * @param home user home lat/lon or null
+ */
public void setHome(LatLon home) {
this.home = home;
}
+ /**
+ * Returns the public account description.
+ * @return the public account description
+ */
public String getDescription() {
return description;
}
+ /**
+ * Sets the public account description.
+ * @param description public account description
+ */
public void setDescription(String description) {
this.description = description;
}
+ /**
+ * Returns the list of preferred languages.
+ * @return the list of preferred languages
+ */
public List<String> getLanguages() {
return languages;
}
+ /**
+ * Sets the list of preferred languages.
+ * @param languages list of preferred languages
+ */
public void setLanguages(List<String> languages) {
this.languages = languages;
}
+ /**
+ * Returns the user home zoom level.
+ * @return the user home zoom level
+ */
public int getHomeZoom() {
return homeZoom;
}
+ /**
+ * Sets the user home zoom level.
+ * @param homeZoom user home zoom level
+ */
public void setHomeZoom(int homeZoom) {
this.homeZoom = homeZoom;
}
diff --git a/src/org/openstreetmap/josm/data/osm/Way.java b/src/org/openstreetmap/josm/data/osm/Way.java
index 7f3996d..0b85a9e 100644
--- a/src/org/openstreetmap/josm/data/osm/Way.java
+++ b/src/org/openstreetmap/josm/data/osm/Way.java
@@ -276,6 +276,8 @@ public final class Way extends OsmPrimitive implements IWay {
@Override
public void load(PrimitiveData data) {
+ if (!(data instanceof WayData))
+ throw new IllegalArgumentException("Not a way data: " + data);
boolean locked = writeLock();
try {
super.load(data);
@@ -313,6 +315,8 @@ public final class Way extends OsmPrimitive implements IWay {
@Override
public void cloneFrom(OsmPrimitive osm) {
+ if (!(osm instanceof Way))
+ throw new IllegalArgumentException("Not a way: " + osm);
boolean locked = writeLock();
try {
super.cloneFrom(osm);
@@ -325,7 +329,7 @@ public final class Way extends OsmPrimitive implements IWay {
@Override
public String toString() {
- String nodesDesc = isIncomplete() ? "(incomplete)" : "nodes=" + Arrays.toString(nodes);
+ String nodesDesc = isIncomplete() ? "(incomplete)" : ("nodes=" + Arrays.toString(nodes));
return "{Way id=" + getUniqueId() + " version=" + getVersion()+ ' ' + getFlagsAsString() + ' ' + nodesDesc + '}';
}
@@ -333,10 +337,10 @@ public final class Way extends OsmPrimitive implements IWay {
public boolean hasEqualSemanticAttributes(OsmPrimitive other, boolean testInterestingTagsOnly) {
if (!(other instanceof Way))
return false;
- if (!super.hasEqualSemanticAttributes(other, testInterestingTagsOnly))
- return false;
Way w = (Way) other;
if (getNodesCount() != w.getNodesCount()) return false;
+ if (!super.hasEqualSemanticAttributes(other, testInterestingTagsOnly))
+ return false;
for (int i = 0; i < getNodesCount(); i++) {
if (!getNode(i).hasEqualSemanticAttributes(w.getNode(i)))
return false;
@@ -633,6 +637,11 @@ public final class Way extends OsmPrimitive implements IWay {
}
@Override
+ protected void addToBBox(BBox box, Set<PrimitiveId> visited) {
+ box.add(getBBox());
+ }
+
+ @Override
public void updatePosition() {
bbox = new BBox(this);
}
diff --git a/src/org/openstreetmap/josm/data/osm/WaySegment.java b/src/org/openstreetmap/josm/data/osm/WaySegment.java
index 8723bb1..ae00be0 100644
--- a/src/org/openstreetmap/josm/data/osm/WaySegment.java
+++ b/src/org/openstreetmap/josm/data/osm/WaySegment.java
@@ -93,7 +93,7 @@ public final class WaySegment implements Comparable<WaySegment> {
@Override
public int compareTo(WaySegment o) {
- return equals(o) ? 0 : toWay().compareTo(o.toWay());
+ return o == null ? -1 : (equals(o) ? 0 : toWay().compareTo(o.toWay()));
}
/**
@@ -114,6 +114,19 @@ public final class WaySegment implements Comparable<WaySegment> {
s2.getSecondNode().getEastNorth().east(), s2.getSecondNode().getEastNorth().north());
}
+ /**
+ * Checks whether this segment and another way segment share the same points
+ * @param s2 The other segment
+ * @return true if other way segment is the same or reverse
+ */
+ public boolean isSimilar(WaySegment s2) {
+ if (getFirstNode().equals(s2.getFirstNode()) && getSecondNode().equals(s2.getSecondNode()))
+ return true;
+ if (getFirstNode().equals(s2.getSecondNode()) && getSecondNode().equals(s2.getFirstNode()))
+ return true;
+ return false;
+ }
+
@Override
public String toString() {
return "WaySegment [way=" + way.getUniqueId() + ", lowerIndex=" + lowerIndex + ']';
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java
index 12b1532..83e90bb 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java
@@ -22,14 +22,14 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
/**
* <p>Abstract common superclass for {@link Rendering} implementations.</p>
- *
+ * @since 4087
*/
public abstract class AbstractMapRenderer implements Rendering {
/** the graphics context to which the visitor renders OSM objects */
- protected Graphics2D g;
+ protected final Graphics2D g;
/** the map viewport - provides projection and hit detection functionality */
- protected NavigatableComponent nc;
+ protected final NavigatableComponent nc;
/**
* The {@link MapViewState} to use to convert between coordinates.
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 7514754..d8cbb26 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
@@ -755,6 +755,11 @@ public class StyledMapRenderer extends AbstractMapRenderer {
return ap.getPerimeter() * extent * scale < threshold * ap.getArea();
}
+ /**
+ * Draw a text onto a node
+ * @param n The node to draw the text on
+ * @param bs The text and it's alignment.
+ */
public void drawBoxText(Node n, BoxTextElement bs) {
if (!isShowNames() || bs == null)
return;
@@ -800,13 +805,13 @@ public class StyledMapRenderer extends AbstractMapRenderer {
FontRenderContext frc = g.getFontRenderContext();
LineMetrics metrics = text.font.getLineMetrics(s, frc);
if (bs.vAlign == VerticalTextAlignment.ABOVE) {
- y -= -box.y + metrics.getDescent();
+ y -= -box.y + (int) metrics.getDescent();
} else if (bs.vAlign == VerticalTextAlignment.TOP) {
- y -= -box.y - metrics.getAscent();
+ y -= -box.y - (int) metrics.getAscent();
} else if (bs.vAlign == VerticalTextAlignment.CENTER) {
- y += (metrics.getAscent() - metrics.getDescent()) / 2;
+ y += (int) ((metrics.getAscent() - metrics.getDescent()) / 2);
} else if (bs.vAlign == VerticalTextAlignment.BELOW) {
- y += box.y + box.height + metrics.getAscent() + 2;
+ y += box.y + box.height + (int) metrics.getAscent() + 2;
} else throw new AssertionError();
}
displayText(null, s, x, y, n.isDisabled(), text);
@@ -1789,27 +1794,37 @@ public class StyledMapRenderer extends AbstractMapRenderer {
}
}
- private class ComputeStyleListWorker extends RecursiveTask<List<StyleRecord>> implements Visitor {
+ private static class ComputeStyleListWorker extends RecursiveTask<List<StyleRecord>> implements Visitor {
private final transient List<? extends OsmPrimitive> input;
private final transient List<StyleRecord> output;
private final transient ElemStyles styles = MapPaintStyles.getStyles();
private final int directExecutionTaskSize;
+ private final double circum;
+ private final NavigatableComponent nc;
- private final boolean drawArea = circum <= Main.pref.getInteger("mappaint.fillareas", 10_000_000);
- private final boolean drawMultipolygon = drawArea && Main.pref.getBoolean("mappaint.multipolygon", true);
- private final boolean drawRestriction = Main.pref.getBoolean("mappaint.restriction", true);
+ private final boolean drawArea;
+ private final boolean drawMultipolygon;
+ private final boolean drawRestriction;
/**
* Constructs a new {@code ComputeStyleListWorker}.
+ * @param circum distance on the map in meters that 100 screen pixels represent
+ * @param nc navigatable component
* @param input the primitives to process
* @param output the list of styles to which styles will be added
* @param directExecutionTaskSize the threshold deciding whether to subdivide the tasks
*/
- ComputeStyleListWorker(final List<? extends OsmPrimitive> input, List<StyleRecord> output, int directExecutionTaskSize) {
+ ComputeStyleListWorker(double circum, NavigatableComponent nc,
+ final List<? extends OsmPrimitive> input, List<StyleRecord> output, int directExecutionTaskSize) {
+ this.circum = circum;
+ this.nc = nc;
this.input = input;
this.output = output;
this.directExecutionTaskSize = directExecutionTaskSize;
+ this.drawArea = circum <= Main.pref.getInteger("mappaint.fillareas", 10_000_000);
+ this.drawMultipolygon = drawArea && Main.pref.getBoolean("mappaint.multipolygon", true);
+ this.drawRestriction = Main.pref.getBoolean("mappaint.restriction", true);
this.styles.setDrawMultipolygon(drawMultipolygon);
}
@@ -1822,7 +1837,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
for (int fromIndex = 0; fromIndex < input.size(); fromIndex += directExecutionTaskSize) {
final int toIndex = Math.min(fromIndex + directExecutionTaskSize, input.size());
final List<StyleRecord> output = new ArrayList<>(directExecutionTaskSize);
- tasks.add(new ComputeStyleListWorker(input.subList(fromIndex, toIndex), output, directExecutionTaskSize).fork());
+ tasks.add(new ComputeStyleListWorker(circum, nc, input.subList(fromIndex, toIndex), output, directExecutionTaskSize).fork());
}
for (ForkJoinTask<List<StyleRecord>> task : tasks) {
output.addAll(task.join());
@@ -1932,13 +1947,11 @@ public class StyledMapRenderer extends AbstractMapRenderer {
final List<StyleRecord> allStyleElems = new ArrayList<>(nodes.size()+ways.size()+relations.size());
// Need to process all relations first.
- // Reason: Make sure, ElemStyles.getStyleCacheWithRange is
- // not called for the same primitive in parallel threads.
- // (Could be synchronized, but try to avoid this for
- // performance reasons.)
- THREAD_POOL.invoke(new ComputeStyleListWorker(relations, allStyleElems,
+ // Reason: Make sure, ElemStyles.getStyleCacheWithRange is not called for the same primitive in parallel threads.
+ // (Could be synchronized, but try to avoid this for performance reasons.)
+ THREAD_POOL.invoke(new ComputeStyleListWorker(circum, nc, relations, allStyleElems,
Math.max(20, relations.size() / THREAD_POOL.getParallelism() / 3)));
- THREAD_POOL.invoke(new ComputeStyleListWorker(new CompositeList<>(nodes, ways), allStyleElems,
+ THREAD_POOL.invoke(new ComputeStyleListWorker(circum, nc, new CompositeList<>(nodes, ways), allStyleElems,
Math.max(100, (nodes.size() + ways.size()) / THREAD_POOL.getParallelism() / 3)));
if (!benchmark.renderSort()) {
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
index d387a34..0e946fc 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
@@ -162,6 +162,12 @@ public class Multipolygon {
return roleMatcher;
}
+ /**
+ * Class representing a string of ways.
+ *
+ * The last node of one way is the first way of the next one.
+ * The string may or may not be closed.
+ */
public static class JoinedWay {
protected final List<Node> nodes;
protected final Collection<Long> wayIds;
@@ -169,8 +175,8 @@ public class Multipolygon {
/**
* Constructs a new {@code JoinedWay}.
- * @param nodes list of nodes
- * @param wayIds list of way IDs
+ * @param nodes list of nodes - must not be null
+ * @param wayIds list of way IDs - must not be null
* @param selected whether joined way is selected or not
*/
public JoinedWay(List<Node> nodes, Collection<Long> wayIds, boolean selected) {
@@ -605,7 +611,9 @@ public class Multipolygon {
wayIds.add(w.getUniqueId());
}
- result.add(new JoinedWay(nodes, wayIds, selected));
+ if (nodes != null) {
+ result.add(new JoinedWay(nodes, wayIds, selected));
+ }
}
return result;
@@ -636,10 +644,9 @@ public class Multipolygon {
PolyData result = null;
for (PolyData combined : outerPolygons) {
- if (combined.contains(inner.poly) != Intersection.OUTSIDE) {
- if (result == null || result.contains(combined.poly) == Intersection.INSIDE) {
- result = combined;
- }
+ if (combined.contains(inner.poly) != Intersection.OUTSIDE
+ && (result == null || result.contains(combined.poly) == Intersection.INSIDE)) {
+ result = combined;
}
}
return result;
diff --git a/src/org/openstreetmap/josm/data/preferences/ListListSetting.java b/src/org/openstreetmap/josm/data/preferences/ListListSetting.java
index 3a47d02..c4edd75 100644
--- a/src/org/openstreetmap/josm/data/preferences/ListListSetting.java
+++ b/src/org/openstreetmap/josm/data/preferences/ListListSetting.java
@@ -4,11 +4,8 @@ package org.openstreetmap.josm.data.preferences;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
-import org.openstreetmap.josm.tools.Utils;
-
/**
* Setting containing a {@link List} of {@code List}s of {@link String} values.
* @since 9759
@@ -41,23 +38,6 @@ public class ListListSetting extends AbstractSetting<List<List<String>>> {
}
@Override
- public boolean equalVal(List<List<String>> otherVal) {
- if (value == null)
- return otherVal == null;
- if (otherVal == null)
- return false;
- if (value.size() != otherVal.size())
- return false;
- Iterator<List<String>> itA = value.iterator();
- Iterator<List<String>> itB = otherVal.iterator();
- while (itA.hasNext()) {
- if (!Utils.equalCollection(itA.next(), itB.next()))
- return false;
- }
- return true;
- }
-
- @Override
public ListListSetting copy() {
if (value == null)
return new ListListSetting(null);
@@ -91,11 +71,4 @@ public class ListListSetting extends AbstractSetting<List<List<String>>> {
public ListListSetting getNullInstance() {
return new ListListSetting(null);
}
-
- @Override
- public boolean equals(Object other) {
- if (!(other instanceof ListListSetting))
- return false;
- return equalVal(((ListListSetting) other).getValue());
- }
}
diff --git a/src/org/openstreetmap/josm/data/preferences/ListSetting.java b/src/org/openstreetmap/josm/data/preferences/ListSetting.java
index 888bc31..7e66803 100644
--- a/src/org/openstreetmap/josm/data/preferences/ListSetting.java
+++ b/src/org/openstreetmap/josm/data/preferences/ListSetting.java
@@ -6,8 +6,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.openstreetmap.josm.tools.Utils;
-
/**
* Setting containing a {@link List} of {@link String} values.
* @since 9759
@@ -32,11 +30,6 @@ public class ListSetting extends AbstractSetting<List<String>> {
}
@Override
- public boolean equalVal(List<String> otherVal) {
- return Utils.equalCollection(value, otherVal);
- }
-
- @Override
public ListSetting copy() {
return ListSetting.create(value);
}
@@ -55,11 +48,4 @@ public class ListSetting extends AbstractSetting<List<String>> {
public ListSetting getNullInstance() {
return new ListSetting(null);
}
-
- @Override
- public boolean equals(Object other) {
- if (!(other instanceof ListSetting))
- return false;
- return equalVal(((ListSetting) other).getValue());
- }
}
diff --git a/src/org/openstreetmap/josm/data/preferences/MapListSetting.java b/src/org/openstreetmap/josm/data/preferences/MapListSetting.java
index 2f92e3b..9b1a6bf 100644
--- a/src/org/openstreetmap/josm/data/preferences/MapListSetting.java
+++ b/src/org/openstreetmap/josm/data/preferences/MapListSetting.java
@@ -3,12 +3,9 @@ package org.openstreetmap.josm.data.preferences;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Objects;
/**
* Setting containing a {@link List} of {@link Map}s of {@link String} values.
@@ -26,37 +23,6 @@ public class MapListSetting extends AbstractSetting<List<Map<String, String>>> {
}
@Override
- public boolean equalVal(List<Map<String, String>> otherVal) {
- if (value == null)
- return otherVal == null;
- if (otherVal == null)
- return false;
- if (value.size() != otherVal.size())
- return false;
- Iterator<Map<String, String>> itA = value.iterator();
- Iterator<Map<String, String>> itB = otherVal.iterator();
- while (itA.hasNext()) {
- if (!equalMap(itA.next(), itB.next()))
- return false;
- }
- return true;
- }
-
- private static boolean equalMap(Map<String, String> a, Map<String, String> b) {
- if (a == null)
- return b == null;
- if (b == null)
- return false;
- if (a.size() != b.size())
- return false;
- for (Entry<String, String> e : a.entrySet()) {
- if (!Objects.equals(e.getValue(), b.get(e.getKey())))
- return false;
- }
- return true;
- }
-
- @Override
public MapListSetting copy() {
if (value == null)
return new MapListSetting(null);
@@ -90,11 +56,4 @@ public class MapListSetting extends AbstractSetting<List<Map<String, String>>> {
public MapListSetting getNullInstance() {
return new MapListSetting(null);
}
-
- @Override
- public boolean equals(Object other) {
- if (!(other instanceof MapListSetting))
- return false;
- return equalVal(((MapListSetting) other).getValue());
- }
}
diff --git a/src/org/openstreetmap/josm/data/preferences/Setting.java b/src/org/openstreetmap/josm/data/preferences/Setting.java
index 6f1e6d7..24a632f 100644
--- a/src/org/openstreetmap/josm/data/preferences/Setting.java
+++ b/src/org/openstreetmap/josm/data/preferences/Setting.java
@@ -24,7 +24,9 @@ public interface Setting<T> {
* @param otherVal the other value
* @return true if the values are equal
*/
- boolean equalVal(T otherVal);
+ default boolean equalVal(T otherVal) {
+ return getValue() == null ? (otherVal == null) : getValue().equals(otherVal);
+ }
/**
* Clone the current object.
diff --git a/src/org/openstreetmap/josm/data/preferences/StringSetting.java b/src/org/openstreetmap/josm/data/preferences/StringSetting.java
index abe71bc..ad71f13 100644
--- a/src/org/openstreetmap/josm/data/preferences/StringSetting.java
+++ b/src/org/openstreetmap/josm/data/preferences/StringSetting.java
@@ -15,13 +15,6 @@ public class StringSetting extends AbstractSetting<String> {
}
@Override
- public boolean equalVal(String otherVal) {
- if (value == null)
- return otherVal == null;
- return value.equals(otherVal);
- }
-
- @Override
public StringSetting copy() {
return new StringSetting(value);
}
@@ -35,11 +28,4 @@ public class StringSetting extends AbstractSetting<String> {
public StringSetting getNullInstance() {
return new StringSetting(null);
}
-
- @Override
- public boolean equals(Object other) {
- if (!(other instanceof StringSetting))
- return false;
- return equalVal(((StringSetting) other).getValue());
- }
}
diff --git a/src/org/openstreetmap/josm/data/projection/Projections.java b/src/org/openstreetmap/josm/data/projection/Projections.java
index 6f6dd99..5ff8014 100644
--- a/src/org/openstreetmap/josm/data/projection/Projections.java
+++ b/src/org/openstreetmap/josm/data/projection/Projections.java
@@ -43,6 +43,7 @@ import org.openstreetmap.josm.data.projection.proj.TransverseMercator;
import org.openstreetmap.josm.gui.preferences.projection.ProjectionChoice;
import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
import org.openstreetmap.josm.io.CachedFile;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.Utils;
/**
@@ -146,7 +147,7 @@ public final class Projections {
try {
pds = loadProjectionDefinitions("resource://data/projection/custom-epsg");
} catch (IOException ex) {
- throw new RuntimeException(ex);
+ throw new JosmRuntimeException(ex);
}
inits = new LinkedHashMap<>();
for (ProjectionDefinition pd : pds) {
diff --git a/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java b/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java
index 7cef6bf..f427ba5 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java
@@ -5,6 +5,7 @@ import java.io.IOException;
import java.io.InputStream;
import org.openstreetmap.josm.io.CachedFile;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
/**
* Wrapper for {@link NTV2GridShiftFile}.
@@ -56,7 +57,7 @@ public class NTV2GridShiftFileWrapper {
instance = new NTV2GridShiftFile();
instance.loadGridShiftFile(is, false);
} catch (IOException e) {
- throw new RuntimeException(e);
+ throw new JosmRuntimeException(e);
}
}
return instance;
diff --git a/src/org/openstreetmap/josm/data/projection/proj/ClassProjFactory.java b/src/org/openstreetmap/josm/data/projection/proj/ClassProjFactory.java
index 926a0c1..7bc8676 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/ClassProjFactory.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/ClassProjFactory.java
@@ -1,6 +1,8 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.projection.proj;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
+
/**
* Proj Factory that creates instances from a given class.
*/
@@ -22,7 +24,7 @@ public class ClassProjFactory implements ProjFactory {
try {
proj = projClass.getConstructor().newInstance();
} catch (ReflectiveOperationException e) {
- throw new RuntimeException(e);
+ throw new JosmRuntimeException(e);
}
return proj;
}
diff --git a/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java b/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java
index 5567f52..2d20afd 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java
@@ -19,6 +19,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.projection.Ellipsoid;
import org.openstreetmap.josm.data.projection.ProjectionConfigurationException;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
// CHECKSTYLE.OFF: LineLength
@@ -107,7 +108,7 @@ public class SwissObliqueMercator extends AbstractProj {
// iteration to finds S and phi
while (abs(phi - prevPhi) > EPSILON) {
if (++iteration > 30)
- throw new RuntimeException("Two many iterations");
+ throw new JosmRuntimeException("Two many iterations");
prevPhi = phi;
double s = 1 / alpha * (log(tan(PI / 4 + b / 2)) - k) + ellps.e
* log(tan(PI / 4 + asin(ellps.e * sin(phi)) / 2));
diff --git a/src/org/openstreetmap/josm/data/validation/TestError.java b/src/org/openstreetmap/josm/data/validation/TestError.java
index 903df26..f3e603c 100644
--- a/src/org/openstreetmap/josm/data/validation/TestError.java
+++ b/src/org/openstreetmap/josm/data/validation/TestError.java
@@ -2,7 +2,6 @@
package org.openstreetmap.josm.data.validation;
import java.text.MessageFormat;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -11,22 +10,12 @@ import java.util.Locale;
import java.util.TreeSet;
import java.util.function.Supplier;
-import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.osm.WaySegment;
-import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
-import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
-import org.openstreetmap.josm.data.osm.event.DataSetListener;
-import org.openstreetmap.josm.data.osm.event.NodeMovedEvent;
-import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent;
-import org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent;
-import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent;
-import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
-import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
import org.openstreetmap.josm.data.validation.util.MultipleNameVisitor;
import org.openstreetmap.josm.tools.AlphanumComparator;
import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -36,22 +25,22 @@ import org.openstreetmap.josm.tools.I18n;
* Validation error
* @since 3669
*/
-public class TestError implements Comparable<TestError>, DataSetListener {
+public class TestError implements Comparable<TestError> {
/** is this error on the ignore list */
private boolean ignored;
/** Severity */
- private Severity severity;
+ private final Severity severity;
/** The error message */
- private String message;
+ private final String message;
/** Deeper error description */
private final String description;
private final String descriptionEn;
/** The affected primitives */
- private Collection<? extends OsmPrimitive> primitives;
+ private final Collection<? extends OsmPrimitive> primitives;
/** The primitives or way segments to be highlighted */
private final Collection<?> highlighted;
/** The tester that raised this error */
- private Test tester;
+ private final Test tester;
/** Internal code used by testers to classify errors */
private final int code;
/** If this error is selected */
@@ -251,111 +240,6 @@ public class TestError implements Comparable<TestError>, DataSetListener {
}
/**
- * Constructs a new {@code TestError}.
- * @param tester The tester
- * @param severity The severity of this error
- * @param message The error message
- * @param description The translated description
- * @param descriptionEn The English description
- * @param code The test error reference code
- * @param primitives The affected primitives
- * @param highlighted OSM primitives to highlight
- * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
- */
- @Deprecated
- public TestError(Test tester, Severity severity, String message, String description, String descriptionEn,
- int code, Collection<? extends OsmPrimitive> primitives, Collection<?> highlighted) {
- this.tester = tester;
- this.severity = severity;
- this.message = message;
- this.description = description;
- this.descriptionEn = descriptionEn;
- this.primitives = primitives;
- this.highlighted = highlighted;
- this.code = code;
- this.fixingCommand = null;
- }
-
- /**
- * Constructs a new {@code TestError} without description.
- * @param tester The tester
- * @param severity The severity of this error
- * @param message The error message
- * @param code The test error reference code
- * @param primitives The affected primitives
- * @param highlighted OSM primitives to highlight
- * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
- */
- @Deprecated
- public TestError(Test tester, Severity severity, String message, int code, Collection<? extends OsmPrimitive> primitives,
- Collection<?> highlighted) {
- this(tester, severity, message, null, null, code, primitives, highlighted);
- }
-
- /**
- * Constructs a new {@code TestError}.
- * @param tester The tester
- * @param severity The severity of this error
- * @param message The error message
- * @param description The translated description
- * @param descriptionEn The English description
- * @param code The test error reference code
- * @param primitives The affected primitives
- * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
- */
- @Deprecated
- public TestError(Test tester, Severity severity, String message, String description, String descriptionEn,
- int code, Collection<? extends OsmPrimitive> primitives) {
- this(tester, severity, message, description, descriptionEn, code, primitives, primitives);
- }
-
- /**
- * Constructs a new {@code TestError} without description.
- * @param tester The tester
- * @param severity The severity of this error
- * @param message The error message
- * @param code The test error reference code
- * @param primitives The affected primitives
- * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
- */
- @Deprecated
- public TestError(Test tester, Severity severity, String message, int code, Collection<? extends OsmPrimitive> primitives) {
- this(tester, severity, message, null, null, code, primitives, primitives);
- }
-
- /**
- * Constructs a new {@code TestError} without description, for a single primitive.
- * @param tester The tester
- * @param severity The severity of this error
- * @param message The error message
- * @param code The test error reference code
- * @param primitive The affected primitive
- * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
- */
- @Deprecated
- public TestError(Test tester, Severity severity, String message, int code, OsmPrimitive primitive) {
- this(tester, severity, message, null, null, code, Collections.singletonList(primitive), Collections
- .singletonList(primitive));
- }
-
- /**
- * Constructs a new {@code TestError} for a single primitive.
- * @param tester The tester
- * @param severity The severity of this error
- * @param message The error message
- * @param description The translated description
- * @param descriptionEn The English description
- * @param code The test error reference code
- * @param primitive The affected primitive
- * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
- */
- @Deprecated
- public TestError(Test tester, Severity severity, String message, String description, String descriptionEn,
- int code, OsmPrimitive primitive) {
- this(tester, severity, message, description, descriptionEn, code, Collections.singletonList(primitive));
- }
-
- /**
* Gets the error message
* @return the error message
*/
@@ -372,45 +256,11 @@ public class TestError implements Comparable<TestError>, DataSetListener {
}
/**
- * Sets the error message
- * @param message The error message
- * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
- */
- @Deprecated
- public void setMessage(String message) {
- this.message = message;
- }
-
- /**
* Gets the list of primitives affected by this error
* @return the list of primitives affected by this error
*/
public Collection<? extends OsmPrimitive> getPrimitives() {
- return primitives;
- }
-
- /**
- * Gets the list of primitives affected by this error and are selectable
- * @return the list of selectable primitives affected by this error
- */
- public Collection<? extends OsmPrimitive> getSelectablePrimitives() {
- List<OsmPrimitive> selectablePrimitives = new ArrayList<>(primitives.size());
- for (OsmPrimitive o : primitives) {
- if (o.isSelectable()) {
- selectablePrimitives.add(o);
- }
- }
- return selectablePrimitives;
- }
-
- /**
- * Sets the list of primitives affected by this error
- * @param primitives the list of primitives affected by this error*
- * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
- */
- @Deprecated
- public void setPrimitives(List<? extends OsmPrimitive> primitives) {
- this.primitives = primitives;
+ return Collections.unmodifiableCollection(primitives);
}
/**
@@ -422,16 +272,6 @@ public class TestError implements Comparable<TestError>, DataSetListener {
}
/**
- * Sets the severity of this error
- * @param severity the severity of this error
- * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
- */
- @Deprecated
- public void setSeverity(Severity severity) {
- this.severity = severity;
- }
-
- /**
* Returns the ignore state for this error.
* @return the ignore state for this error
*/
@@ -487,16 +327,6 @@ public class TestError implements Comparable<TestError>, DataSetListener {
}
/**
- * Set the tester that raised the error.
- * @param tester te tester
- * @deprecated Use {@link #builder} instead. Will be removed in 2016-12.
- */
- @Deprecated
- public void setTester(Test tester) {
- this.tester = tester;
- }
-
- /**
* Gets the code
* @return the code
*/
@@ -568,7 +398,7 @@ public class TestError implements Comparable<TestError>, DataSetListener {
* @since 5671
*/
public Collection<?> getHighlighted() {
- return highlighted;
+ return Collections.unmodifiableCollection(highlighted);
}
@Override
@@ -583,47 +413,6 @@ public class TestError implements Comparable<TestError>, DataSetListener {
return AlphanumComparator.getInstance().compare(v1.toString(), v2.toString());
}
- @Override public void primitivesRemoved(PrimitivesRemovedEvent event) {
- // Remove purged primitives (fix #8639)
- try {
- primitives.removeAll(event.getPrimitives());
- } catch (UnsupportedOperationException e) {
- if (event.getPrimitives().containsAll(primitives)) {
- primitives = Collections.emptyList();
- } else {
- Main.warn(e, "Unable to remove primitives from "+this+'.');
- }
- }
- }
-
- @Override public void primitivesAdded(PrimitivesAddedEvent event) {
- // Do nothing
- }
-
- @Override public void tagsChanged(TagsChangedEvent event) {
- // Do nothing
- }
-
- @Override public void nodeMoved(NodeMovedEvent event) {
- // Do nothing
- }
-
- @Override public void wayNodesChanged(WayNodesChangedEvent event) {
- // Do nothing
- }
-
- @Override public void relationMembersChanged(RelationMembersChangedEvent event) {
- // Do nothing
- }
-
- @Override public void otherDatasetChange(AbstractDatasetChangedEvent event) {
- // Do nothing
- }
-
- @Override public void dataChanged(DataChangedEvent event) {
- // Do nothing
- }
-
@Override
public String toString() {
return "TestError [tester=" + tester + ", code=" + code + ", message=" + message + ']';
diff --git a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
index 5ee9a6e..3bbacc3 100644
--- a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
@@ -220,6 +220,7 @@ public final class DomainValidator extends AbstractValidator {
* @return true if the parameter is an infrastructure TLD
*/
public boolean isValidInfrastructureTld(String iTld) {
+ if (iTld == null) return false;
final String key = chompLeadingDot(unicodeToASCII(iTld).toLowerCase(Locale.ENGLISH));
return arrayContains(INFRASTRUCTURE_TLDS, key);
}
@@ -232,6 +233,7 @@ public final class DomainValidator extends AbstractValidator {
* @return true if the parameter is a generic TLD
*/
public boolean isValidGenericTld(String gTld) {
+ if (gTld == null) return false;
final String key = chompLeadingDot(unicodeToASCII(gTld).toLowerCase(Locale.ENGLISH));
return (arrayContains(GENERIC_TLDS, key) || arrayContains(genericTLDsPlus, key))
&& !arrayContains(genericTLDsMinus, key);
@@ -245,6 +247,7 @@ public final class DomainValidator extends AbstractValidator {
* @return true if the parameter is a country code TLD
*/
public boolean isValidCountryCodeTld(String ccTld) {
+ if (ccTld == null) return false;
final String key = chompLeadingDot(unicodeToASCII(ccTld).toLowerCase(Locale.ENGLISH));
return (arrayContains(COUNTRY_CODE_TLDS, key) || arrayContains(countryCodeTLDsPlus, key))
&& !arrayContains(countryCodeTLDsMinus, key);
@@ -258,6 +261,7 @@ public final class DomainValidator extends AbstractValidator {
* @return true if the parameter is an local TLD
*/
public boolean isValidLocalTld(String lTld) {
+ if (lTld == null) return false;
final String key = chompLeadingDot(unicodeToASCII(lTld).toLowerCase(Locale.ENGLISH));
return arrayContains(LOCAL_TLDS, key);
}
@@ -291,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 2016110401, Last Updated Sat Nov 5 07:07:01 2016 UTC
+ // Taken from Version 2016122201, Last Updated Fri Dec 23 07:07:01 2016 UTC
"aaa", // aaa American Automobile Association, Inc.
"aarp", // aarp AARP
"abarth", // abarth Fiat Chrysler Automobiles N.V.
@@ -429,8 +433,10 @@ public final class DomainValidator extends AbstractValidator {
"boots", // boots THE BOOTS COMPANY PLC
"bosch", // bosch Robert Bosch GMBH
"bostik", // bostik Bostik SA
+ "boston", // boston Boston TLD Management, LLC
"bot", // bot Amazon Registry Services, Inc.
"boutique", // boutique Over Galley, LLC
+ "box", // box NS1 Limited
"bradesco", // bradesco Banco Bradesco S.A.
"bridgestone", // bridgestone Bridgestone Corporation
"broadway", // broadway Celebrate Broadway, Inc.
@@ -473,6 +479,7 @@ public final class DomainValidator extends AbstractValidator {
"casino", // casino Binky Sky, LLC
"cat", // cat Fundacio puntCAT
"catering", // catering New Falls. LLC
+ "catholic", // catholic Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
"cba", // cba COMMONWEALTH BANK OF AUSTRALIA
"cbn", // cbn The Christian Broadcasting Network, Inc.
"cbre", // cbre CBRE, Inc.
@@ -544,6 +551,7 @@ public final class DomainValidator extends AbstractValidator {
"cricket", // cricket dot Cricket Limited
"crown", // crown Crown Equipment Corporation
"crs", // crs Federated Co-operatives Limited
+ "cruise", // cruise Viking River Cruises (Bermuda) Ltd.
"cruises", // cruises Spring Way, LLC
"csc", // csc Alliance-One Services, Inc.
"cuisinella", // cuisinella SALM S.A.S.
@@ -552,6 +560,7 @@ public final class DomainValidator extends AbstractValidator {
"dabur", // dabur Dabur India Limited
"dad", // dad Charleston Road Registry Inc.
"dance", // dance United TLD Holdco Ltd.
+ "data", // data Dish DBS Corporation
"date", // date dot Date Limited
"dating", // dating Pine Fest, LLC
"datsun", // datsun NISSAN MOTOR CO., LTD.
@@ -666,6 +675,7 @@ public final class DomainValidator extends AbstractValidator {
"flowers", // flowers Uniregistry, Corp.
"fly", // fly Charleston Road Registry Inc.
"foo", // foo Charleston Road Registry Inc.
+ "food", // food Lifestyle Domain Holdings, Inc.
"foodnetwork", // foodnetwork Lifestyle Domain Holdings, Inc.
"football", // football Foggy Farms, LLC
"ford", // ford Ford Motor Company
@@ -674,6 +684,7 @@ public final class DomainValidator extends AbstractValidator {
"forum", // forum Fegistry, LLC
"foundation", // foundation John Dale, LLC
"fox", // fox FOX Registry, LLC
+ "free", // free Amazon Registry Services, Inc.
"fresenius", // fresenius Fresenius Immobilien-Verwaltungs-GmbH
"frl", // frl FRLregistry B.V.
"frogans", // frogans OP3FT
@@ -682,6 +693,7 @@ public final class DomainValidator extends AbstractValidator {
"ftr", // ftr Frontier Communications Corporation
"fujitsu", // fujitsu Fujitsu Limited
"fujixerox", // fujixerox Xerox DNHC LLC
+ "fun", // fun DotSpace, Inc.
"fund", // fund John Castle, LLC
"furniture", // furniture Lone Fields, LLC
"futbol", // futbol United TLD Holdco, Ltd.
@@ -738,6 +750,7 @@ public final class DomainValidator extends AbstractValidator {
"guide", // guide Snow Moon, LLC
"guitars", // guitars Uniregistry, Corp.
"guru", // guru Pioneer Cypress, LLC
+ "hair", // hair L'Oreal
"hamburg", // hamburg Hamburg Top-Level-Domain GmbH
"hangout", // hangout Charleston Road Registry Inc.
"haus", // haus United TLD Holdco, LTD.
@@ -766,6 +779,7 @@ public final class DomainValidator extends AbstractValidator {
"honda", // honda Honda Motor Co., Ltd.
"honeywell", // honeywell Honeywell GTLD LLC
"horse", // horse Top Level Domain Holdings Limited
+ "hospital", // hospital Ruby Pike, LLC
"host", // host DotHost Inc.
"hosting", // hosting Uniregistry, Corp.
"hot", // hot Amazon Registry Services, Inc.
@@ -784,7 +798,6 @@ public final class DomainValidator extends AbstractValidator {
"icu", // icu One.com A/S
"ieee", // ieee IEEE Global LLC
"ifm", // ifm ifm electronic gmbh
- "iinet", // iinet Connect West Pty. Ltd.
"ikano", // ikano Ikano S.A.
"imamat", // imamat Fondation Aga Khan (Aga Khan Foundation)
"imdb", // imdb Amazon Registry Service, Inc.
@@ -820,6 +833,7 @@ public final class DomainValidator extends AbstractValidator {
"jeep", // jeep FCA US LLC.
"jetzt", // jetzt New TLD Company AB
"jewelry", // jewelry Wild Bloom, LLC
+ "jio", // jio Affinity Names, Inc.
"jlc", // jlc Richemont DNS Inc.
"jll", // jll Jones Lang LaSalle Incorporated
"jmp", // jmp Matrix IP LLC
@@ -952,6 +966,7 @@ public final class DomainValidator extends AbstractValidator {
"mls", // mls The Canadian Real Estate Association
"mma", // mma MMA IARD
"mobi", // mobi Afilias Technologies Limited dba dotMobi
+ "mobile", // mobile Dish DBS Corporation
"mobily", // mobily GreenTech Consultancy Company W.L.L.
"moda", // moda United TLD Holdco Ltd.
"moe", // moe Interlink Co., Ltd.
@@ -965,6 +980,7 @@ public final class DomainValidator extends AbstractValidator {
"mormon", // mormon IRI Domain Management, LLC ("Applicant")
"mortgage", // mortgage United TLD Holdco, Ltd
"moscow", // moscow Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID)
+ "moto", // moto Motorola Trademark Holdings, LLC
"motorcycles", // motorcycles DERMotorcycles, LLC
"mov", // mov Charleston Road Registry Inc.
"movie", // movie New Frostbite, LLC
@@ -975,7 +991,6 @@ public final class DomainValidator extends AbstractValidator {
"mtr", // mtr MTR Corporation Limited
"museum", // museum Museum Domain Management Association
"mutual", // mutual Northwestern Mutual MU TLD Registry, LLC
- "mutuelle", // mutuelle Fédération Nationale de la Mutualité Française
"nab", // nab National Australia Bank Limited
"nadex", // nadex Nadex Domains, Inc
"nagoya", // nagoya GMO Registry, Inc.
@@ -1058,6 +1073,7 @@ public final class DomainValidator extends AbstractValidator {
"pfizer", // pfizer Pfizer Inc.
"pharmacy", // pharmacy National Association of Boards of Pharmacy
"philips", // philips Koninklijke Philips N.V.
+ "phone", // phone Dish DBS Corporation
"photo", // photo Uniregistry, Corp.
"photography", // photography Sugar Glen, LLC
"photos", // photos Sea Corner, LLC
@@ -1119,6 +1135,7 @@ public final class DomainValidator extends AbstractValidator {
"reise", // reise Foggy Way, LLC
"reisen", // reisen New Cypress, LLC
"reit", // reit National Association of Real Estate Investment Trusts, Inc.
+ "reliance", // reliance Reliance Industries Limited
"ren", // ren Beijing Qianxiang Wangjing Technology Development Co., Ltd.
"rent", // rent XYZ.COM LLC
"rentals", // rentals Big Hollow,LLC
@@ -1134,8 +1151,10 @@ public final class DomainValidator extends AbstractValidator {
"richardli", // richardli Pacific Century Asset Management (HK) Limited
"ricoh", // ricoh Ricoh Company, Ltd.
"rightathome", // rightathome Johnson Shareholdings, Inc.
+ "ril", // ril Reliance Industries Limited
"rio", // rio Empresa Municipal de Informática SA - IPLANRIO
"rip", // rip United TLD Holdco Ltd.
+ "rmit", // rmit Royal Melbourne Institute of Technology
"rocher", // rocher Ferrero Trading Lux S.A.
"rocks", // rocks United TLD Holdco, LTD.
"rodeo", // rodeo Top Level Domain Holdings Limited
@@ -1417,6 +1436,7 @@ public final class DomainValidator extends AbstractValidator {
"xn--6frz82g", // 移动 Afilias Limited
"xn--6qq986b3xl", // 我爱你 Tycoon Treasure Limited
"xn--80adxhks", // москва Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID)
+ "xn--80aqecdr1a", // католик Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
"xn--80asehdb", // онлайн CORE Association
"xn--80aswg", // сайт CORE Association
"xn--8y0a063a", // 联通 China United Network Communications Corporation Limited
@@ -1462,6 +1482,7 @@ public final class DomainValidator extends AbstractValidator {
"xn--mgbab2bd", // بازار CORE Association
"xn--mgbb9fbpob", // موبايلي GreenTech Consultancy Company W.L.L.
"xn--mgbca7dzdo", // ابوظبي Abu Dhabi Systems and Information Centre
+ "xn--mgbi4ecexp", // كاثوليك Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
"xn--mgbt3dhd", // همراه Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
"xn--mk1bu44c", // 닷컴 VeriSign Sarl
"xn--mxtq1m", // 政府 Net-Chinese Co., Ltd.
@@ -1480,6 +1501,7 @@ public final class DomainValidator extends AbstractValidator {
"xn--ses554g", // 网址 KNET Co., Ltd
"xn--t60b56a", // 닷넷 VeriSign Sarl
"xn--tckwe", // コム VeriSign Sarl
+ "xn--tiq49xqyj", // 天主教 Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
"xn--unup4y", // 游戏 Spring Fields, LLC
"xn--vermgensberater-ctb", // VERMöGENSBERATER Deutsche Vermögensberatung Aktiengesellschaft DVAG
"xn--vermgensberatung-pwb", // VERMöGENSBERATUNG Deutsche Vermögensberatung Aktiengesellschaft DVAG
diff --git a/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java b/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java
index ffc4b0a..36fff38 100644
--- a/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java
@@ -313,11 +313,9 @@ public class UrlValidator extends AbstractValidator {
String authority = urlMatcher.group(PARSE_URL_AUTHORITY);
if ("file".equals(scheme)) { // Special case - file: allows an empty authority
- if (!"".equals(authority)) {
- if (authority.contains(":")) { // but cannot allow trailing :
- setErrorMessage(tr("URL contains an invalid authority: {0}", authority));
- return false;
- }
+ if (!"".equals(authority) && authority.contains(":")) { // but cannot allow trailing :
+ setErrorMessage(tr("URL contains an invalid authority: {0}", authority));
+ return false;
}
// drop through to continue validation
} else { // not file:
diff --git a/src/org/openstreetmap/josm/data/validation/tests/Addresses.java b/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
index 64c7611..f52295e 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
@@ -8,7 +8,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -58,12 +57,7 @@ public class Addresses extends Test {
protected List<Relation> getAndCheckAssociatedStreets(OsmPrimitive p) {
List<Relation> list = OsmPrimitive.getFilteredList(p.getReferrers(), Relation.class);
- for (Iterator<Relation> it = list.iterator(); it.hasNext();) {
- Relation r = it.next();
- if (!r.hasTag("type", ASSOCIATED_STREET)) {
- it.remove();
- }
- }
+ list.removeIf(r -> !r.hasTag("type", ASSOCIATED_STREET));
if (list.size() > 1) {
Severity level;
// warning level only if several relations have different names, see #10945
diff --git a/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java b/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
index ef0add1..a8a3b83 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
@@ -1,7 +1,6 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.validation.tests;
-import static org.openstreetmap.josm.tools.I18n.marktr;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.ArrayList;
@@ -21,6 +20,7 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.MergeNodesAction;
import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.AbstractPrimitive;
import org.openstreetmap.josm.data.osm.Hash;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -206,52 +206,52 @@ public class DuplicateNode extends Test {
if (nbType > 1) {
errors.add(TestError.builder(parentTest, Severity.WARNING, DUPLICATE_NODE_MIXED)
- .message(marktr("Mixed type duplicated nodes"))
+ .message(tr("Mixed type duplicated nodes"))
.primitives(primitives)
.build());
} else if (typeMap.get("highway")) {
errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_HIGHWAY)
- .message(marktr("Highway duplicated nodes"))
+ .message(tr("Highway duplicated nodes"))
.primitives(primitives)
.build());
} else if (typeMap.get("railway")) {
errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_RAILWAY)
- .message(marktr("Railway duplicated nodes"))
+ .message(tr("Railway duplicated nodes"))
.primitives(primitives)
.build());
} else if (typeMap.get("waterway")) {
errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_WATERWAY)
- .message(marktr("Waterway duplicated nodes"))
+ .message(tr("Waterway duplicated nodes"))
.primitives(primitives)
.build());
} else if (typeMap.get("boundary")) {
errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_BOUNDARY)
- .message(marktr("Boundary duplicated nodes"))
+ .message(tr("Boundary duplicated nodes"))
.primitives(primitives)
.build());
} else if (typeMap.get("power")) {
errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_POWER)
- .message(marktr("Power duplicated nodes"))
+ .message(tr("Power duplicated nodes"))
.primitives(primitives)
.build());
} else if (typeMap.get("natural")) {
errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_NATURAL)
- .message(marktr("Natural duplicated nodes"))
+ .message(tr("Natural duplicated nodes"))
.primitives(primitives)
.build());
} else if (typeMap.get("building")) {
errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_BUILDING)
- .message(marktr("Building duplicated nodes"))
+ .message(tr("Building duplicated nodes"))
.primitives(primitives)
.build());
} else if (typeMap.get("landuse")) {
errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_LANDUSE)
- .message(marktr("Landuse duplicated nodes"))
+ .message(tr("Landuse duplicated nodes"))
.primitives(primitives)
.build());
} else {
errors.add(TestError.builder(parentTest, Severity.WARNING, DUPLICATE_NODE_OTHER)
- .message(marktr("Other duplicated nodes"))
+ .message(tr("Other duplicated nodes"))
.primitives(primitives)
.build());
}
@@ -315,11 +315,7 @@ public class DuplicateNode extends Test {
Set<Node> nodes = new LinkedHashSet<>(OsmPrimitive.getFilteredList(sel, Node.class));
// Filter nodes that have already been deleted (see #5764 and #5773)
- for (Iterator<Node> it = nodes.iterator(); it.hasNext();) {
- if (it.next().isDeleted()) {
- it.remove();
- }
- }
+ nodes.removeIf(AbstractPrimitive::isDeleted);
// Merge only if at least 2 nodes remain
if (nodes.size() >= 2) {
diff --git a/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
index 22ba028..9c73f94 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
@@ -718,8 +718,9 @@ public class MapCSSTagChecker extends Test.TagTest {
ParseResult result;
try (CachedFile cache = new CachedFile(url);
InputStream zip = cache.findZipEntryInputStream("validator.mapcss", "");
- InputStream s = zip != null ? zip : cache.getInputStream()) {
- result = TagCheck.readMapCSS(new BufferedReader(UTFInputStreamReader.create(s)));
+ InputStream s = zip != null ? zip : cache.getInputStream();
+ Reader reader = new BufferedReader(UTFInputStreamReader.create(s))) {
+ result = TagCheck.readMapCSS(reader);
checks.remove(url);
checks.putAll(url, result.parseChecks);
// Check assertions, useful for development of local files
diff --git a/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java b/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
index 19bee23..b19fc1d 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
@@ -5,11 +5,11 @@ import static org.openstreetmap.josm.tools.I18n.marktr;
import static org.openstreetmap.josm.tools.I18n.tr;
import static org.openstreetmap.josm.tools.I18n.trn;
-import java.awt.geom.GeneralPath;
+import java.awt.geom.Area;
+import java.awt.geom.Point2D;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -17,17 +17,18 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import org.openstreetmap.josm.actions.CreateMultipolygonAction;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.command.ChangeCommand;
import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.WaySegment;
import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.PolyData;
-import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.PolyData.Intersection;
import org.openstreetmap.josm.data.validation.OsmValidator;
import org.openstreetmap.josm.data.validation.Severity;
import org.openstreetmap.josm.data.validation.Test;
@@ -37,7 +38,8 @@ import org.openstreetmap.josm.gui.mappaint.ElemStyles;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
import org.openstreetmap.josm.gui.mappaint.styleelement.AreaElement;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.tools.Pair;
+import org.openstreetmap.josm.tools.Geometry;
+import org.openstreetmap.josm.tools.Geometry.PolygonIntersection;
/**
* Checks if multipolygons are valid
@@ -73,8 +75,13 @@ public class MultipolygonTest extends Test {
public static final int REPEATED_MEMBER_SAME_ROLE = 1614;
/** Multipolygon member repeated (same primitive, different role) */
public static final int REPEATED_MEMBER_DIFF_ROLE = 1615;
+ /** Multipolygon ring is equal to another ring */
+ public static final int EQUAL_RINGS = 1616;
+ /** Multipolygon rings share nodes */
+ public static final int RINGS_SHARE_NODES = 1617;
- private static volatile ElemStyles styles;
+ private static final int FOUND_INSIDE = 1;
+ private static final int FOUND_OUTSIDE = 2;
private final Set<String> keysCheckedByAnotherTest = new HashSet<>();
@@ -87,11 +94,6 @@ public class MultipolygonTest extends Test {
}
@Override
- public void initialize() {
- styles = MapPaintStyles.getStyles();
- }
-
- @Override
public void startTest(ProgressMonitor progressMonitor) {
super.startTest(progressMonitor);
keysCheckedByAnotherTest.clear();
@@ -109,40 +111,6 @@ public class MultipolygonTest extends Test {
super.endTest();
}
- private static GeneralPath createPath(List<Node> nodes) {
- GeneralPath result = new GeneralPath();
- result.moveTo((float) nodes.get(0).getCoor().lat(), (float) nodes.get(0).getCoor().lon());
- for (int i = 1; i < nodes.size(); i++) {
- Node n = nodes.get(i);
- result.lineTo((float) n.getCoor().lat(), (float) n.getCoor().lon());
- }
- return result;
- }
-
- private static List<GeneralPath> createPolygons(List<Multipolygon.PolyData> joinedWays) {
- List<GeneralPath> result = new ArrayList<>();
- for (Multipolygon.PolyData way : joinedWays) {
- result.add(createPath(way.getNodes()));
- }
- return result;
- }
-
- private static Intersection getPolygonIntersection(GeneralPath outer, List<Node> inner) {
- boolean inside = false;
- boolean outside = false;
-
- for (Node n : inner) {
- boolean contains = outer.contains(n.getCoor().lat(), n.getCoor().lon());
- inside = inside | contains;
- outside = outside | !contains;
- if (inside & outside) {
- return Intersection.CROSSING;
- }
- }
-
- return inside ? Intersection.INSIDE : Intersection.OUTSIDE;
- }
-
@Override
public void visit(Way w) {
if (!w.isArea() && ElemStyles.hasOnlyAreaElemStyle(w)) {
@@ -163,19 +131,15 @@ public class MultipolygonTest extends Test {
@Override
public void visit(Relation r) {
- if (r.isMultipolygon()) {
+ if (r.isMultipolygon() && r.getMembersCount() > 0) {
checkMembersAndRoles(r);
checkOuterWay(r);
- checkRepeatedWayMembers(r);
-
- // Rest of checks is only for complete multipolygons
- if (!r.hasIncompleteMembers()) {
+ boolean hasRepeatedMembers = checkRepeatedWayMembers(r);
+ // Rest of checks is only for complete multipolygon
+ if (!hasRepeatedMembers && !r.hasIncompleteMembers()) {
Multipolygon polygon = new Multipolygon(r);
-
- // Create new multipolygon using the logics from CreateMultipolygonAction and see if roles match.
- checkMemberRoleCorrectness(r);
checkStyleConsistency(r, polygon);
- checkGeometry(r, polygon);
+ checkGeometryAndRoles(r, polygon);
}
}
}
@@ -187,46 +151,15 @@ public class MultipolygonTest extends Test {
* @param r relation
*/
private void checkOuterWay(Relation r) {
- boolean hasOuterWay = false;
for (RelationMember m : r.getMembers()) {
- if ("outer".equals(m.getRole())) {
- hasOuterWay = true;
- break;
- }
- }
- if (!hasOuterWay) {
- errors.add(TestError.builder(this, Severity.WARNING, MISSING_OUTER_WAY)
- .message(tr("No outer way for multipolygon"))
- .primitives(r)
- .build());
- }
- }
-
- /**
- * Create new multipolygon using the logics from CreateMultipolygonAction and see if roles match:<ul>
- * <li>{@link #WRONG_MEMBER_ROLE}: Role for ''{0}'' should be ''{1}''</li>
- * </ul>
- * @param r relation
- */
- private void checkMemberRoleCorrectness(Relation r) {
- final Pair<Relation, Relation> newMP = CreateMultipolygonAction.createMultipolygonRelation(r.getMemberPrimitives(Way.class), false);
- if (newMP != null) {
- for (RelationMember member : r.getMembers()) {
- final Collection<RelationMember> memberInNewMP = newMP.b.getMembersFor(Collections.singleton(member.getMember()));
- if (memberInNewMP != null && !memberInNewMP.isEmpty()) {
- final String roleInNewMP = memberInNewMP.iterator().next().getRole();
- if (!member.getRole().equals(roleInNewMP)) {
- errors.add(TestError.builder(this, Severity.WARNING, WRONG_MEMBER_ROLE)
- .message(RelationChecker.ROLE_VERIF_PROBLEM_MSG,
- marktr("Role for ''{0}'' should be ''{1}''"),
- member.getMember().getDisplayName(DefaultNameFormatter.getInstance()), roleInNewMP)
- .primitives(addRelationIfNeeded(r, member.getMember()))
- .highlight(member.getMember())
- .build());
- }
- }
+ if (m.isWay() && "outer".equals(m.getRole())) {
+ return;
}
}
+ errors.add(TestError.builder(this, Severity.WARNING, MISSING_OUTER_WAY)
+ .message(tr("No outer way for multipolygon"))
+ .primitives(r)
+ .build());
}
/**
@@ -240,6 +173,7 @@ public class MultipolygonTest extends Test {
* @param polygon multipolygon
*/
private void checkStyleConsistency(Relation r, Multipolygon polygon) {
+ ElemStyles styles = MapPaintStyles.getStyles();
if (styles != null && !"boundary".equals(r.get("type"))) {
AreaElement area = ElemStyles.getAreaElemStyle(r, false);
boolean areaStyle = area != null;
@@ -274,7 +208,7 @@ public class MultipolygonTest extends Test {
if (areaInner != null && area.equals(areaInner)) {
errors.add(TestError.builder(this, Severity.OTHER, INNER_STYLE_MISMATCH)
.message(tr("With the currently used mappaint style the style for inner way equals the multipolygon style"))
- .primitives(addRelationIfNeeded(r, wInner))
+ .primitives(Arrays.asList(r, wInner))
.highlight(wInner)
.build());
}
@@ -287,13 +221,13 @@ public class MultipolygonTest extends Test {
: tr("With the currently used mappaint style(s) the style for outer way mismatches the area style");
errors.add(TestError.builder(this, Severity.OTHER, OUTER_STYLE_MISMATCH)
.message(message)
- .primitives(addRelationIfNeeded(r, wOuter))
+ .primitives(Arrays.asList(r, wOuter))
.highlight(wOuter)
.build());
} else if (areaStyle) { /* style on outer way of multipolygon, but equal to polygon */
errors.add(TestError.builder(this, Severity.WARNING, OUTER_STYLE)
.message(tr("Area style on outer way"))
- .primitives(addRelationIfNeeded(r, wOuter))
+ .primitives(Arrays.asList(r, wOuter))
.highlight(wOuter)
.build());
}
@@ -312,62 +246,396 @@ public class MultipolygonTest extends Test {
* @param r relation
* @param polygon multipolygon
*/
- private void checkGeometry(Relation r, Multipolygon polygon) {
+ private void checkGeometryAndRoles(Relation r, Multipolygon polygon) {
+ int oldErrorsSize = errors.size();
+
List<Node> openNodes = polygon.getOpenEnds();
if (!openNodes.isEmpty()) {
errors.add(TestError.builder(this, Severity.WARNING, NON_CLOSED_WAY)
.message(tr("Multipolygon is not closed"))
- .primitives(addRelationIfNeeded(r, openNodes))
+ .primitives(combineRelAndPrimitives(r, openNodes))
.highlight(openNodes)
.build());
}
+ Map<Long, RelationMember> wayMap = new HashMap<>();
+ for (int i = 0; i < r.getMembersCount(); i++) {
+ RelationMember mem = r.getMember(i);
+ if (!mem.isWay())
+ continue;
+ wayMap.put(mem.getWay().getUniqueId(), mem); // duplicate members were checked before
+ }
+ if (wayMap.isEmpty())
+ return;
- // For painting is used Polygon class which works with ints only. For validation we need more precision
+ Set<Node> sharedNodes = findIntersectionNodes(r);
List<PolyData> innerPolygons = polygon.getInnerPolygons();
List<PolyData> outerPolygons = polygon.getOuterPolygons();
- List<GeneralPath> innerPolygonsPaths = innerPolygons.isEmpty() ? Collections.<GeneralPath>emptyList() : createPolygons(innerPolygons);
- List<GeneralPath> outerPolygonsPaths = createPolygons(outerPolygons);
- for (int i = 0; i < outerPolygons.size(); i++) {
- PolyData pdOuter = outerPolygons.get(i);
- // Check for intersection between outer members
- for (int j = i+1; j < outerPolygons.size(); j++) {
- checkCrossingWays(r, outerPolygons, outerPolygonsPaths, pdOuter, j);
+ List<PolyData> allPolygons = new ArrayList<>();
+ allPolygons.addAll(outerPolygons);
+ allPolygons.addAll(innerPolygons);
+ Map<PolyData, List<PolyData>> crossingPolyMap = findIntersectingWays(r, innerPolygons, outerPolygons);
+
+ if (!sharedNodes.isEmpty()) {
+ for (int i = 0; i < allPolygons.size(); i++) {
+ PolyData pd1 = allPolygons.get(i);
+ for (int j = i + 1; j < allPolygons.size(); j++) {
+ PolyData pd2 = allPolygons.get(j);
+ if (!checkProblemMap(crossingPolyMap, pd1, pd2)) {
+ checkPolygonsForSharedNodes(r, pd1, pd2, sharedNodes);
+ }
+ }
+ }
+ }
+ boolean checkRoles = true;
+ for (int i = oldErrorsSize; i < errors.size(); i++) {
+ if (errors.get(i).getSeverity() != Severity.OTHER) {
+ checkRoles = false;
+ break;
}
}
- for (int i = 0; i < innerPolygons.size(); i++) {
- PolyData pdInner = innerPolygons.get(i);
- // Check for intersection between inner members
- for (int j = i+1; j < innerPolygons.size(); j++) {
- checkCrossingWays(r, innerPolygons, innerPolygonsPaths, pdInner, j);
+ if (checkRoles) {
+ // we found no intersection or crossing between the polygons and they are closed
+ // now we can calculate the nesting level to verify the roles with some simple node checks
+ checkRoles(r, allPolygons, wayMap, sharedNodes);
+ }
+ }
+
+ /**
+ * Detect intersections of multipolygon ways at nodes. If any way node is used by more than two ways
+ * or two times in one way and at least once in another way we found an intersection.
+ * @param r the relation
+ * @return List of nodes were ways intersect
+ */
+ private static Set<Node> findIntersectionNodes(Relation r) {
+ Set<Node> intersectionNodes = new HashSet<>();
+ Map<Node, List<Way>> nodeMap = new HashMap<>();
+ for (RelationMember rm : r.getMembers()) {
+ if (!rm.isWay())
+ continue;
+ int numNodes = rm.getWay().getNodesCount();
+ for (int i = 0; i < numNodes; i++) {
+ Node n = rm.getWay().getNode(i);
+ if (n.getReferrers().size() <= 1) {
+ continue; // cannot be a problem node
+ }
+ List<Way> ways = nodeMap.get(n);
+ if (ways == null) {
+ ways = new ArrayList<>();
+ nodeMap.put(n, ways);
+ }
+ ways.add(rm.getWay());
+ if (ways.size() > 2 || (ways.size() == 2 && i != 0 && i + 1 != numNodes)) {
+ intersectionNodes.add(n);
+ }
}
- // Check for intersection between inner and outer members
- boolean outside = true;
- for (int o = 0; o < outerPolygons.size(); o++) {
- outside &= checkCrossingWays(r, outerPolygons, outerPolygonsPaths, pdInner, o) == Intersection.OUTSIDE;
+ }
+ return intersectionNodes;
+ }
+
+ private enum ExtPolygonIntersection {
+ EQUAL,
+ FIRST_INSIDE_SECOND,
+ SECOND_INSIDE_FIRST,
+ OUTSIDE,
+ CROSSING
+ }
+
+ private void checkPolygonsForSharedNodes(Relation r, PolyData pd1, PolyData pd2, Set<Node> allSharedNodes) {
+ Set<Node> sharedByPolygons = new HashSet<>(allSharedNodes);
+ sharedByPolygons.retainAll(pd1.getNodes());
+ sharedByPolygons.retainAll(pd2.getNodes());
+ if (sharedByPolygons.isEmpty())
+ return;
+
+ // the two polygons share one or more nodes
+ // 1st might be equal to 2nd (same nodes, same or different direction) --> error shared way segments
+ // they overlap --> error
+ // 1st and 2nd share segments
+ // 1st fully inside 2nd --> okay
+ // 2nd fully inside 1st --> okay
+ int errorCode = RINGS_SHARE_NODES;
+ ExtPolygonIntersection res = checkOverlapAtSharedNodes(sharedByPolygons, pd1, pd2);
+ if (res == ExtPolygonIntersection.CROSSING) {
+ errorCode = CROSSING_WAYS;
+ } else if (res == ExtPolygonIntersection.EQUAL) {
+ errorCode = EQUAL_RINGS;
+ }
+ if (errorCode != 0) {
+ Set<OsmPrimitive> prims = new HashSet<>();
+ prims.add(r);
+ for (Node n : sharedByPolygons) {
+ for (OsmPrimitive p : n.getReferrers()) {
+ if (p instanceof Way && (pd1.getWayIds().contains(p.getUniqueId()) || pd2.getWayIds().contains(p.getUniqueId()))) {
+ prims.add(p);
+ }
+ }
}
- if (outside) {
- errors.add(TestError.builder(this, Severity.WARNING, INNER_WAY_OUTSIDE)
- .message(tr("Multipolygon inner way is outside"))
- .primitives(r)
- .highlightNodePairs(Collections.singletonList(pdInner.getNodes()))
+ if (errorCode == RINGS_SHARE_NODES) {
+ errors.add(TestError.builder(this, Severity.OTHER, errorCode)
+ .message(tr("Multipolygon rings share node(s)"))
+ .primitives(prims)
+ .highlight(sharedByPolygons)
+ .build());
+ } else {
+ errors.add(TestError.builder(this, Severity.WARNING, errorCode)
+ .message(errorCode == CROSSING_WAYS ? tr("Intersection between multipolygon ways") : tr("Multipolygon rings are equal"))
+ .primitives(prims)
+ .highlight(sharedByPolygons)
.build());
}
}
}
- private Intersection checkCrossingWays(Relation r, List<PolyData> polygons, List<GeneralPath> polygonsPaths, PolyData pd, int idx) {
- Intersection intersection = getPolygonIntersection(polygonsPaths.get(idx), pd.getNodes());
- if (intersection == Intersection.CROSSING) {
- PolyData pdOther = polygons.get(idx);
- if (pdOther != null) {
- errors.add(TestError.builder(this, Severity.WARNING, CROSSING_WAYS)
- .message(tr("Intersection between multipolygon ways"))
- .primitives(r)
- .highlightNodePairs(Arrays.asList(pd.getNodes(), pdOther.getNodes()))
- .build());
+ private static ExtPolygonIntersection checkOverlapAtSharedNodes(Set<Node> shared, PolyData pd1, PolyData pd2) {
+ // Idea: if two polygons share one or more nodes they can either just touch or share segments or intersect.
+ // The insideness test is complex, so we try to reduce the number of these tests.
+ // There is no need to check all nodes, we only have to check the node following a shared node.
+
+ int[] flags = new int[2];
+ for (int loop = 0; loop < flags.length; loop++) {
+ List<Node> nodes2Test = loop == 0 ? pd1.getNodes() : pd2.getNodes();
+ int num = nodes2Test.size() - 1; // ignore closing duplicate node
+
+
+ int lenShared = 0;
+ for (int i = 0; i < num; i++) {
+ Node n = nodes2Test.get(i);
+ if (shared.contains(n)) {
+ ++lenShared;
+ } else {
+ if (i == 0 || lenShared > 0) {
+ // do we have to treat lenShared > 1 special ?
+ lenShared = 0;
+ boolean inside = checkIfNodeIsInsidePolygon(n, loop == 0 ? pd2 : pd1);
+ flags[loop] |= inside ? FOUND_INSIDE : FOUND_OUTSIDE;
+ if (flags[loop] == (FOUND_INSIDE | FOUND_OUTSIDE)) {
+ return ExtPolygonIntersection.CROSSING;
+ }
+ }
+ }
+ }
+ }
+
+ if ((flags[0] & FOUND_INSIDE) != 0)
+ return ExtPolygonIntersection.FIRST_INSIDE_SECOND;
+ if ((flags[1] & FOUND_INSIDE) != 0)
+ return ExtPolygonIntersection.SECOND_INSIDE_FIRST;
+ if ((flags[0] & FOUND_OUTSIDE) != (flags[1] & FOUND_OUTSIDE)) {
+ return (flags[0] & FOUND_OUTSIDE) != 0 ?
+ ExtPolygonIntersection.SECOND_INSIDE_FIRST : ExtPolygonIntersection.FIRST_INSIDE_SECOND;
+ }
+ if ((flags[0] & FOUND_OUTSIDE) != 0 && (flags[1] & FOUND_OUTSIDE) != 0) {
+ // the two polygons may only share one or more segments but they may also intersect
+ Area a1 = new Area(pd1.get());
+ Area a2 = new Area(pd2.get());
+ PolygonIntersection areaRes = Geometry.polygonIntersection(a1, a2, 1e-6);
+ if (areaRes == PolygonIntersection.OUTSIDE)
+ return ExtPolygonIntersection.OUTSIDE;
+ return ExtPolygonIntersection.CROSSING;
+ }
+ return ExtPolygonIntersection.EQUAL;
+ }
+
+ /**
+ * Helper class for calculation of nesting levels
+ */
+ private static class PolygonLevel {
+ final int level; // nesting level, even for outer, odd for inner polygons.
+ final PolyData outerWay;
+
+ PolygonLevel(PolyData pd, int level) {
+ this.outerWay = pd;
+ this.level = level;
+ }
+ }
+
+ /**
+ * Calculate the nesting levels of the polygon rings and check if calculated role matches
+ * @param r relation (for error reporting)
+ * @param allPolygons list of polygon rings
+ * @param wayMap maps way ids to relation members
+ * @param sharedNodes all nodes shared by multiple ways of this multipolygon
+ */
+ private void checkRoles(Relation r, List<PolyData> allPolygons, Map<Long, RelationMember> wayMap, Set<Node> sharedNodes) {
+ PolygonLevelFinder levelFinder = new PolygonLevelFinder(sharedNodes);
+ List<PolygonLevel> list = levelFinder.findOuterWays(allPolygons);
+ if (list == null || list.isEmpty()) {
+ return;
+ }
+
+ for (PolygonLevel pol : list) {
+ String calculatedRole = (pol.level % 2 == 0) ? "outer" : "inner";
+ for (long wayId : pol.outerWay.getWayIds()) {
+ RelationMember member = wayMap.get(wayId);
+ if (!member.getRole().equals(calculatedRole)) {
+ errors.add(TestError.builder(this, Severity.WARNING, WRONG_MEMBER_ROLE)
+ .message(RelationChecker.ROLE_VERIF_PROBLEM_MSG,
+ marktr("Role for ''{0}'' should be ''{1}''"),
+ member.getMember().getDisplayName(DefaultNameFormatter.getInstance()),
+ calculatedRole)
+ .primitives(Arrays.asList(r, member.getMember()))
+ .highlight(member.getMember())
+ .build());
+ if (pol.level == 0 && "inner".equals(member.getRole())) {
+ // maybe only add this error if we found an outer ring with correct role(s) ?
+ errors.add(TestError.builder(this, Severity.WARNING, INNER_WAY_OUTSIDE)
+ .message(tr("Multipolygon inner way is outside"))
+ .primitives(Arrays.asList(r, member.getMember()))
+ .highlight(member.getMember())
+ .build());
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Check if a node is inside the polygon according to the insideness rules of Shape.
+ * @param n the node
+ * @param p the polygon
+ * @return true if the node is inside the polygon
+ */
+ private static boolean checkIfNodeIsInsidePolygon(Node n, PolyData p) {
+ EastNorth en = n.getEastNorth();
+ return en != null && p.get().contains(en.getX(), en.getY());
+ }
+
+ /**
+ * Determine multipolygon ways which are intersecting (crossing without a common node) or sharing one or more way segments.
+ * See also {@link CrossingWays}
+ * @param r the relation (for error reporting)
+ * @param innerPolygons list of inner polygons
+ * @param outerPolygons list of outer polygons
+ * @return map with crossing polygons
+ */
+ private Map<PolyData, List<PolyData>> findIntersectingWays(Relation r, List<PolyData> innerPolygons,
+ List<PolyData> outerPolygons) {
+ HashMap<PolyData, List<PolyData>> crossingPolygonsMap = new HashMap<>();
+ HashMap<PolyData, List<PolyData>> sharedWaySegmentsPolygonsMap = new HashMap<>();
+
+ for (int loop = 0; loop < 2; loop++) {
+ /** All way segments, grouped by cells */
+ final Map<Point2D, List<WaySegment>> cellSegments = new HashMap<>(1000);
+ /** The already detected ways in error */
+ final Map<List<Way>, List<WaySegment>> problemWays = new HashMap<>(50);
+
+ Map<PolyData, List<PolyData>> problemPolygonMap = (loop == 0) ? crossingPolygonsMap
+ : sharedWaySegmentsPolygonsMap;
+
+ for (Way w : r.getMemberPrimitives(Way.class)) {
+ findIntersectingWay(w, cellSegments, problemWays, loop == 1);
+ }
+
+ if (!problemWays.isEmpty()) {
+ List<PolyData> allPolygons = new ArrayList<>(innerPolygons.size() + outerPolygons.size());
+ allPolygons.addAll(innerPolygons);
+ allPolygons.addAll(outerPolygons);
+
+ for (Entry<List<Way>, List<WaySegment>> entry : problemWays.entrySet()) {
+ List<Way> ways = entry.getKey();
+ if (ways.size() != 2)
+ continue;
+ PolyData[] crossingPolys = new PolyData[2];
+ boolean allInner = true;
+ for (int i = 0; i < 2; i++) {
+ Way w = ways.get(i);
+ for (int j = 0; j < allPolygons.size(); j++) {
+ PolyData pd = allPolygons.get(j);
+ if (pd.getWayIds().contains(w.getUniqueId())) {
+ crossingPolys[i] = pd;
+ if (j >= innerPolygons.size())
+ allInner = false;
+ break;
+ }
+ }
+ }
+ boolean samePoly = false;
+ if (crossingPolys[0] != null && crossingPolys[1] != null) {
+ List<PolyData> crossingPolygons = problemPolygonMap.get(crossingPolys[0]);
+ if (crossingPolygons == null) {
+ crossingPolygons = new ArrayList<>();
+ problemPolygonMap.put(crossingPolys[0], crossingPolygons);
+ }
+ crossingPolygons.add(crossingPolys[1]);
+ if (crossingPolys[0] == crossingPolys[1]) {
+ samePoly = true;
+ }
+ }
+ if (loop == 0 || samePoly || (loop == 1 && !allInner)) {
+ String msg = loop == 0 ? tr("Intersection between multipolygon ways")
+ : samePoly ? tr("Multipolygon ring contains segments twice")
+ : tr("Multipolygon outer way shares segment(s) with other ring");
+ errors.add(TestError.builder(this, Severity.WARNING, CROSSING_WAYS)
+ .message(msg)
+ .primitives(Arrays.asList(r, ways.get(0), ways.get(1)))
+ .highlightWaySegments(entry.getValue())
+ .build());
+ }
+ }
+ }
+ }
+ return crossingPolygonsMap;
+ }
+
+ /**
+ * Find ways which are crossing without sharing a node.
+ * @param w way that is member of the relation
+ * @param cellSegments map with already collected way segments
+ * @param crossingWays list to collect crossing ways
+ * @param findSharedWaySegments true: find shared way segments instead of crossings
+ */
+ private static void findIntersectingWay(Way w, Map<Point2D, List<WaySegment>> cellSegments,
+ Map<List<Way>, List<WaySegment>> crossingWays, boolean findSharedWaySegments) {
+ int nodesSize = w.getNodesCount();
+ for (int i = 0; i < nodesSize - 1; i++) {
+ final WaySegment es1 = new WaySegment(w, i);
+ final EastNorth en1 = es1.getFirstNode().getEastNorth();
+ final EastNorth en2 = es1.getSecondNode().getEastNorth();
+ if (en1 == null || en2 == null) {
+ Main.warn("Crossing ways test (MP) skipped " + es1);
+ continue;
}
+ for (List<WaySegment> segments : CrossingWays.getSegments(cellSegments, en1, en2)) {
+ for (WaySegment es2 : segments) {
+
+ List<WaySegment> highlight;
+ if (es2.way == w)
+ continue; // reported by CrossingWays.SelfIntersection
+ if (findSharedWaySegments && !es1.isSimilar(es2))
+ continue;
+ if (!findSharedWaySegments && !es1.intersects(es2))
+ continue;
+
+ List<Way> prims = Arrays.asList(es1.way, es2.way);
+ if ((highlight = crossingWays.get(prims)) == null) {
+ highlight = new ArrayList<>();
+ highlight.add(es1);
+ highlight.add(es2);
+ crossingWays.put(prims, highlight);
+ } else {
+ highlight.add(es1);
+ highlight.add(es2);
+ }
+ }
+ segments.add(es1);
+ }
+ }
+ }
+
+ /**
+ * Check if map contains combination of two given polygons.
+ * @param problemPolyMap the map
+ * @param pd1 1st polygon
+ * @param pd2 2nd polygon
+ * @return true if the combination of polygons is found in the map
+ */
+ private static boolean checkProblemMap(Map<PolyData, List<PolyData>> problemPolyMap, PolyData pd1, PolyData pd2) {
+ List<PolyData> crossingWithFirst = problemPolyMap.get(pd1);
+ if (crossingWithFirst != null && crossingWithFirst.contains(pd2)) {
+ return true;
}
- return intersection;
+ List<PolyData> crossingWith2nd = problemPolyMap.get(pd2);
+ return crossingWith2nd != null && crossingWith2nd.contains(pd1);
}
/**
@@ -383,25 +651,21 @@ public class MultipolygonTest extends Test {
if (!(rm.hasRole("inner", "outer") || !rm.hasRole())) {
errors.add(TestError.builder(this, Severity.WARNING, WRONG_MEMBER_ROLE)
.message(tr("No useful role for multipolygon member"))
- .primitives(addRelationIfNeeded(r, rm.getMember()))
+ .primitives(Arrays.asList(r, rm.getMember()))
.build());
}
} else {
if (!rm.hasRole("admin_centre", "label", "subarea", "land_area")) {
errors.add(TestError.builder(this, Severity.WARNING, WRONG_MEMBER_TYPE)
.message(tr("Non-Way in multipolygon"))
- .primitives(addRelationIfNeeded(r, rm.getMember()))
+ .primitives(Arrays.asList(r, rm.getMember()))
.build());
}
}
}
}
- private static Collection<? extends OsmPrimitive> addRelationIfNeeded(Relation r, OsmPrimitive primitive) {
- return addRelationIfNeeded(r, Collections.singleton(primitive));
- }
-
- private static Collection<? extends OsmPrimitive> addRelationIfNeeded(Relation r, Collection<? extends OsmPrimitive> primitives) {
+ private static Collection<? extends OsmPrimitive> combineRelAndPrimitives(Relation r, Collection<? extends OsmPrimitive> primitives) {
// add multipolygon in order to let user select something and fix the error
if (!primitives.contains(r)) {
// Diamond operator does not work with Java 9 here
@@ -467,12 +731,9 @@ public class MultipolygonTest extends Test {
private void addRepeatedMemberError(Relation r, List<OsmPrimitive> repeatedMembers, int errorCode, String msg) {
if (!repeatedMembers.isEmpty()) {
- List<OsmPrimitive> prims = new ArrayList<>(1 + repeatedMembers.size());
- prims.add(r);
- prims.addAll(repeatedMembers);
- errors.add(TestError.builder(this, Severity.WARNING, errorCode)
+ errors.add(TestError.builder(this, Severity.ERROR, errorCode)
.message(msg)
- .primitives(prims)
+ .primitives(combineRelAndPrimitives(r, repeatedMembers))
.highlight(repeatedMembers)
.build());
}
@@ -514,4 +775,108 @@ public class MultipolygonTest extends Test {
return true;
return false;
}
+
+ /**
+ * Find nesting levels of polygons. Logic taken from class MultipolygonBuilder, uses different structures.
+ */
+ private static class PolygonLevelFinder {
+ private final Set<Node> sharedNodes;
+
+ PolygonLevelFinder(Set<Node> sharedNodes) {
+ this.sharedNodes = sharedNodes;
+ }
+
+ List<PolygonLevel> findOuterWays(List<PolyData> allPolygons) {
+ return findOuterWaysRecursive(0, allPolygons);
+ }
+
+ private List<PolygonLevel> findOuterWaysRecursive(int level, List<PolyData> polygons) {
+ final List<PolygonLevel> result = new ArrayList<>();
+
+ for (PolyData pd : polygons) {
+ if (processOuterWay(level, polygons, result, pd) == null) {
+ return null;
+ }
+ }
+
+ return result;
+ }
+
+ private Object processOuterWay(int level, List<PolyData> polygons, List<PolygonLevel> result, PolyData pd) {
+ List<PolyData> inners = findInnerWaysCandidates(pd, polygons);
+
+ if (inners != null) {
+ //add new outer polygon
+ PolygonLevel pol = new PolygonLevel(pd, level);
+
+ //process inner ways
+ if (!inners.isEmpty()) {
+ List<PolygonLevel> innerList = findOuterWaysRecursive(level + 1, inners);
+ result.addAll(innerList);
+ }
+
+ result.add(pol);
+ }
+ return result;
+ }
+
+ /**
+ * Check if polygon is an out-most ring, if so, collect the inners
+ * @param outerCandidate polygon which is checked
+ * @param polygons all polygons
+ * @return null if outerCandidate is inside any other polygon, else a list of inner polygons (which might be empty)
+ */
+ private List<PolyData> findInnerWaysCandidates(PolyData outerCandidate, List<PolyData> polygons) {
+ List<PolyData> innerCandidates = new ArrayList<>();
+
+ for (PolyData inner : polygons) {
+ if (inner == outerCandidate) {
+ continue;
+ }
+ if (!outerCandidate.getBounds().intersects(inner.getBounds())) {
+ continue;
+ }
+
+ Node unsharedNode = getNonIntersectingNode(outerCandidate, inner);
+ if (unsharedNode != null) {
+ if (checkIfNodeIsInsidePolygon(unsharedNode, outerCandidate)) {
+ innerCandidates.add(inner);
+ } else {
+ // inner is not inside outerCandidate, check if it contains outerCandidate
+ unsharedNode = getNonIntersectingNode(inner, outerCandidate);
+ if (unsharedNode != null) {
+ if (checkIfNodeIsInsidePolygon(unsharedNode, inner)) {
+ return null;
+ }
+ } else {
+ return null; // polygons have only common nodes
+ }
+ }
+ } else {
+ // all nodes of inner are also nodes of outerCandidate
+ unsharedNode = getNonIntersectingNode(inner, outerCandidate);
+ if (unsharedNode == null) {
+ return null;
+ } else {
+ innerCandidates.add(inner);
+ }
+ }
+ }
+ return innerCandidates;
+ }
+
+ /**
+ * Find node of pd2 which is not an intersection node with pd1.
+ * @param pd1 1st polygon
+ * @param pd2 2nd polygon
+ * @return node of pd2 which is not an intersection node with pd1 or null if none is found
+ */
+ private Node getNonIntersectingNode(PolyData pd1, PolyData pd2) {
+ for (Node n : pd2.getNodes()) {
+ if (!sharedNodes.contains(n) || !pd1.getNodes().contains(n))
+ return n;
+ }
+ return null;
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java b/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java
index eafda68..6d2aa6a 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java
@@ -32,15 +32,15 @@ public class PowerLines extends Test {
protected static final int POWER_LINES = 2501;
/** Values for {@code power} key interpreted as power lines */
- protected static final Collection<String> POWER_LINE_TAGS = Arrays.asList("line", "minor_line");
+ static final Collection<String> POWER_LINE_TAGS = Arrays.asList("line", "minor_line");
/** Values for {@code power} key interpreted as power towers */
- protected static final Collection<String> POWER_TOWER_TAGS = Arrays.asList("tower", "pole");
+ static final Collection<String> POWER_TOWER_TAGS = Arrays.asList("tower", "pole");
/** Values for {@code power} key interpreted as power stations */
- protected static final Collection<String> POWER_STATION_TAGS = Arrays.asList("station", "sub_station", "substation", "plant", "generator");
+ static final Collection<String> POWER_STATION_TAGS = Arrays.asList("station", "sub_station", "substation", "plant", "generator");
/** Values for {@code building} key interpreted as power stations */
- protected static final Collection<String> BUILDING_STATION_TAGS = Arrays.asList("transformer_tower");
+ static final Collection<String> BUILDING_STATION_TAGS = Arrays.asList("transformer_tower");
/** Values for {@code power} key interpreted as allowed power items */
- protected static final Collection<String> POWER_ALLOWED_TAGS = Arrays.asList("switch", "transformer", "busbar", "generator", "switchgear",
+ static final Collection<String> POWER_ALLOWED_TAGS = Arrays.asList("switch", "transformer", "busbar", "generator", "switchgear",
"portal", "terminal", "insulator");
private final List<TestError> potentialErrors = new ArrayList<>();
@@ -64,13 +64,11 @@ public class PowerLines extends Test {
boolean canFix = false;
for (Node n : w.getNodes()) {
if (!isPowerTower(n)) {
- if (!isPowerAllowed(n) && IN_DOWNLOADED_AREA.test(n)) {
- if (!w.isFirstLastNode(n) || !isPowerStation(n)) {
- error = TestError.builder(this, Severity.WARNING, POWER_LINES)
- .message(tr("Missing power tower/pole within power line"))
- .primitives(n);
- errorNode = n;
- }
+ if (!isPowerAllowed(n) && IN_DOWNLOADED_AREA.test(n) && (!w.isFirstLastNode(n) || !isPowerStation(n))) {
+ error = TestError.builder(this, Severity.WARNING, POWER_LINES)
+ .message(tr("Missing power tower/pole within power line"))
+ .primitives(n);
+ errorNode = n;
}
} else if (fixValue == null) {
// First tower/pole tag found, remember it
diff --git a/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
index b6bc6e9..c350a49 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
@@ -465,70 +465,68 @@ public class TagChecker extends TagTest {
.build());
withErrors.put(p, "HTML");
}
- if (checkValues && key != null && value != null && !value.isEmpty() && presetsValueData != null) {
- if (!isTagIgnored(key, value)) {
- if (!isKeyInPresets(key)) {
- String prettifiedKey = harmonizeKey(key);
- String fixedKey = harmonizedKeys.get(prettifiedKey);
- if (fixedKey != null && !"".equals(fixedKey) && !fixedKey.equals(key)) {
- // misspelled preset key
- final TestError.Builder error = TestError.builder(this, Severity.WARNING, MISSPELLED_KEY)
- .message(tr("Misspelled property key"), marktr("Key ''{0}'' looks like ''{1}''."), key, fixedKey)
- .primitives(p);
- if (p.hasKey(fixedKey)) {
- errors.add(error.build());
- } else {
- errors.add(error.fix(() -> new ChangePropertyKeyCommand(p, key, fixedKey)).build());
- }
- withErrors.put(p, "WPK");
- } else {
- errors.add(TestError.builder(this, Severity.OTHER, INVALID_VALUE)
- .message(tr("Presets do not contain property key"), marktr("Key ''{0}'' not in presets."), key)
- .primitives(p)
- .build());
- withErrors.put(p, "UPK");
- }
- } else if (!isTagInPresets(key, value)) {
- // try to fix common typos and check again if value is still unknown
- String fixedValue = harmonizeValue(prop.getValue());
- Map<String, String> possibleValues = getPossibleValues(presetsValueData.get(key));
- if (possibleValues.containsKey(fixedValue)) {
- final String newKey = possibleValues.get(fixedValue);
- // misspelled preset value
- errors.add(TestError.builder(this, Severity.WARNING, MISSPELLED_VALUE)
- .message(tr("Misspelled property value"),
- marktr("Value ''{0}'' for key ''{1}'' looks like ''{2}''."), prop.getValue(), key, fixedValue)
- .primitives(p)
- .fix(() -> new ChangePropertyCommand(p, key, newKey))
- .build());
- withErrors.put(p, "WPV");
+ if (checkValues && key != null && value != null && !value.isEmpty() && presetsValueData != null && !isTagIgnored(key, value)) {
+ if (!isKeyInPresets(key)) {
+ String prettifiedKey = harmonizeKey(key);
+ String fixedKey = harmonizedKeys.get(prettifiedKey);
+ if (fixedKey != null && !"".equals(fixedKey) && !fixedKey.equals(key)) {
+ // misspelled preset key
+ final TestError.Builder error = TestError.builder(this, Severity.WARNING, MISSPELLED_KEY)
+ .message(tr("Misspelled property key"), marktr("Key ''{0}'' looks like ''{1}''."), key, fixedKey)
+ .primitives(p);
+ if (p.hasKey(fixedKey)) {
+ errors.add(error.build());
} else {
- // unknown preset value
- errors.add(TestError.builder(this, Severity.OTHER, INVALID_VALUE)
- .message(tr("Presets do not contain property value"),
- marktr("Value ''{0}'' for key ''{1}'' not in presets."), prop.getValue(), key)
- .primitives(p)
- .build());
- withErrors.put(p, "UPV");
+ errors.add(error.fix(() -> new ChangePropertyKeyCommand(p, key, fixedKey)).build());
}
+ withErrors.put(p, "WPK");
+ } else {
+ errors.add(TestError.builder(this, Severity.OTHER, INVALID_VALUE)
+ .message(tr("Presets do not contain property key"), marktr("Key ''{0}'' not in presets."), key)
+ .primitives(p)
+ .build());
+ withErrors.put(p, "UPK");
+ }
+ } else if (!isTagInPresets(key, value)) {
+ // try to fix common typos and check again if value is still unknown
+ String fixedValue = harmonizeValue(prop.getValue());
+ Map<String, String> possibleValues = getPossibleValues(presetsValueData.get(key));
+ if (possibleValues.containsKey(fixedValue)) {
+ final String newKey = possibleValues.get(fixedValue);
+ // misspelled preset value
+ errors.add(TestError.builder(this, Severity.WARNING, MISSPELLED_VALUE)
+ .message(tr("Misspelled property value"),
+ marktr("Value ''{0}'' for key ''{1}'' looks like ''{2}''."), prop.getValue(), key, fixedValue)
+ .primitives(p)
+ .fix(() -> new ChangePropertyCommand(p, key, newKey))
+ .build());
+ withErrors.put(p, "WPV");
+ } else {
+ // unknown preset value
+ errors.add(TestError.builder(this, Severity.OTHER, INVALID_VALUE)
+ .message(tr("Presets do not contain property value"),
+ marktr("Value ''{0}'' for key ''{1}'' not in presets."), prop.getValue(), key)
+ .primitives(p)
+ .build());
+ withErrors.put(p, "UPV");
}
}
}
- if (checkFixmes && key != null && value != null && !value.isEmpty()) {
- if ((value.toLowerCase(Locale.ENGLISH).contains("fixme")
- || value.contains("check and delete")
- || key.contains("todo") || key.toLowerCase(Locale.ENGLISH).contains("fixme"))
- && !withErrors.contains(p, "FIXME")) {
- errors.add(TestError.builder(this, Severity.OTHER, FIXME)
- .message(tr("FIXMES"))
- .primitives(p)
- .build());
- withErrors.put(p, "FIXME");
- }
+ if (checkFixmes && key != null && value != null && !value.isEmpty() && isFixme(key, value) && !withErrors.contains(p, "FIXME")) {
+ errors.add(TestError.builder(this, Severity.OTHER, FIXME)
+ .message(tr("FIXMES"))
+ .primitives(p)
+ .build());
+ withErrors.put(p, "FIXME");
}
}
}
+ private static boolean isFixme(String key, String value) {
+ return key.toLowerCase(Locale.ENGLISH).contains("fixme") || key.contains("todo")
+ || value.toLowerCase(Locale.ENGLISH).contains("fixme") || value.contains("check and delete");
+ }
+
private static Map<String, String> getPossibleValues(Set<String> values) {
// generate a map with common typos
Map<String, String> map = new HashMap<>();
@@ -668,7 +666,7 @@ public class TagChecker extends TagTest {
Collection<? extends OsmPrimitive> primitives = testError.getPrimitives();
for (OsmPrimitive p : primitives) {
Map<String, String> tags = p.getKeys();
- if (tags == null || tags.isEmpty()) {
+ if (tags.isEmpty()) {
continue;
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java b/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java
index cfb76dc..4a4dc48 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java
@@ -53,13 +53,17 @@ public class UntaggedNode extends Test implements AbstractPrimitive.KeyValueVisi
}
}
+ private static OsmPrimitive[] castPrim(AbstractPrimitive n) {
+ return n instanceof OsmPrimitive ? (new OsmPrimitive[]{(OsmPrimitive) n}) : (new OsmPrimitive[0]);
+ }
+
@Override
public void visitKeyValue(AbstractPrimitive n, String key, String value) {
if (key.toLowerCase(Locale.ENGLISH).contains("fixme") || value.toLowerCase(Locale.ENGLISH).contains("fixme")) {
/* translation note: don't translate quoted words */
errors.add(TestError.builder(this, Severity.WARNING, UNTAGGED_NODE_FIXME)
.message(ERROR_MESSAGE, marktr("Has tag containing ''fixme'' or ''FIXME''"))
- .primitives((OsmPrimitive) n)
+ .primitives(castPrim(n))
.build());
return;
}
@@ -86,14 +90,14 @@ public class UntaggedNode extends Test implements AbstractPrimitive.KeyValueVisi
if (msg != null) {
errors.add(TestError.builder(this, Severity.WARNING, code)
.message(ERROR_MESSAGE, msg)
- .primitives((OsmPrimitive) n)
+ .primitives(castPrim(n))
.build());
return;
}
// Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future.
errors.add(TestError.builder(this, Severity.WARNING, UNTAGGED_NODE_OTHER)
.message(ERROR_MESSAGE, marktr("Other"))
- .primitives((OsmPrimitive) n)
+ .primitives(castPrim(n))
.build());
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java b/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java
index 830b49a..293189f 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java
@@ -44,7 +44,7 @@ public class UntaggedWay extends Test {
private Set<Way> waysUsedInRelations;
/** Ways that must have a name */
- protected static final Set<String> NAMED_WAYS = new HashSet<>();
+ static final Set<String> NAMED_WAYS = new HashSet<>();
static {
NAMED_WAYS.add("motorway");
NAMED_WAYS.add("trunk");
@@ -56,7 +56,7 @@ public class UntaggedWay extends Test {
}
/** Whitelist of roles allowed to reference an untagged way */
- protected static final Set<String> WHITELIST = new HashSet<>();
+ static final Set<String> WHITELIST = new HashSet<>();
static {
WHITELIST.add("outer");
WHITELIST.add("inner");
diff --git a/src/org/openstreetmap/josm/gui/IconToggleButton.java b/src/org/openstreetmap/josm/gui/IconToggleButton.java
index 4d81363..69e79d2 100644
--- a/src/org/openstreetmap/josm/gui/IconToggleButton.java
+++ b/src/org/openstreetmap/josm/gui/IconToggleButton.java
@@ -78,13 +78,10 @@ public class IconToggleButton extends JToggleButton implements HideableButton, P
String getPreferenceKey() {
String s = (String) getSafeActionValue("toolbar");
- if (s == null) {
- if (getAction() != null) {
- s = getAction().getClass().getName();
- }
+ if (s == null && getAction() != null) {
+ s = getAction().getClass().getName();
}
return "sidetoolbar.hidden."+s;
-
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/ImageryMenu.java b/src/org/openstreetmap/josm/gui/ImageryMenu.java
index 557abad..7433a80 100644
--- a/src/org/openstreetmap/josm/gui/ImageryMenu.java
+++ b/src/org/openstreetmap/josm/gui/ImageryMenu.java
@@ -41,23 +41,15 @@ import org.openstreetmap.josm.tools.ImageProvider;
/**
* Imagery menu, holding entries for imagery preferences, offset actions and dynamic imagery entries
- * depending on current maview coordinates.
+ * depending on current mapview coordinates.
* @since 3737
*/
public class ImageryMenu extends JMenu implements LayerChangeListener {
- /**
- * Compare ImageryInfo objects alphabetically by name.
- *
- * ImageryInfo objects are normally sorted by country code first
- * (for the preferences). We don't want this in the imagery menu.
- */
- public static final Comparator<ImageryInfo> alphabeticImageryComparator =
- (ii1, ii2) -> ii1.getName().toLowerCase(Locale.ENGLISH).compareTo(ii2.getName().toLowerCase(Locale.ENGLISH));
+ static final class AdjustImageryOffsetAction extends JosmAction {
- private final transient Action offsetAction = new JosmAction(
- tr("Imagery offset"), "mapmode/adjustimg", tr("Adjust imagery offset"), null, false, false) {
- {
+ AdjustImageryOffsetAction() {
+ super(tr("Imagery offset"), "mapmode/adjustimg", tr("Adjust imagery offset"), null, false, false);
putValue("toolbar", "imagery-offset");
Main.toolbar.register(this);
}
@@ -93,7 +85,18 @@ public class ImageryMenu extends JMenu implements LayerChangeListener {
}
popup.show(source, source.getWidth()/2, source.getHeight()/2);
}
- };
+ }
+
+ /**
+ * Compare ImageryInfo objects alphabetically by name.
+ *
+ * ImageryInfo objects are normally sorted by country code first
+ * (for the preferences). We don't want this in the imagery menu.
+ */
+ public static final Comparator<ImageryInfo> alphabeticImageryComparator =
+ (ii1, ii2) -> ii1.getName().toLowerCase(Locale.ENGLISH).compareTo(ii2.getName().toLowerCase(Locale.ENGLISH));
+
+ private final transient Action offsetAction = new AdjustImageryOffsetAction();
private final JMenuItem singleOffset = new JMenuItem(offsetAction);
private JMenuItem offsetMenuItem = singleOffset;
@@ -226,6 +229,9 @@ public class ImageryMenu extends JMenu implements LayerChangeListener {
return newMenu;
}
+ /**
+ * Refresh offset menu item.
+ */
public void refreshOffsetMenu() {
offsetMenuItem = getNewOffsetMenu();
}
diff --git a/src/org/openstreetmap/josm/gui/MainApplication.java b/src/org/openstreetmap/josm/gui/MainApplication.java
index 4af8300..e037ada 100644
--- a/src/org/openstreetmap/josm/gui/MainApplication.java
+++ b/src/org/openstreetmap/josm/gui/MainApplication.java
@@ -32,6 +32,8 @@ import java.util.Optional;
import java.util.Set;
import java.util.TreeSet;
import java.util.logging.Level;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import javax.swing.JOptionPane;
import javax.swing.RepaintManager;
@@ -151,13 +153,15 @@ public class MainApplication extends Main {
"\t--skip-plugins "+tr("Skip loading plugins")+"\n\n"+
"\t--offline=<osm_api|josm_website|all> "+tr("Disable access to the given resource(s), separated by comma")+"\n\n"+
tr("options provided as Java system properties")+":\n"+
- // CHECKSTYLE.OFF: SingleSpaceSeparator
- "\t-Djosm.pref=" +tr("/PATH/TO/JOSM/PREF ")+tr("Set the preferences directory")+"\n\n"+
- "\t-Djosm.userdata="+tr("/PATH/TO/JOSM/USERDATA")+tr("Set the user data directory")+"\n\n"+
- "\t-Djosm.cache=" +tr("/PATH/TO/JOSM/CACHE ")+tr("Set the cache directory")+"\n\n"+
- "\t-Djosm.home=" +tr("/PATH/TO/JOSM/HOMEDIR ")+
- // CHECKSTYLE.ON: SingleSpaceSeparator
- tr("Relocate all 3 directories to homedir. Cache directory will be in homedir/cache")+"\n\n"+
+ align("\t-Djosm.dir.name=JOSM") + tr("Change the JOSM directory name") + "\n\n" +
+ align("\t-Djosm.pref=" + tr("/PATH/TO/JOSM/PREF ")) + tr("Set the preferences directory") + "\n" +
+ align("\t") + tr("Default: {0}", platform.getDefaultPrefDirectory()) + "\n\n" +
+ align("\t-Djosm.userdata=" + tr("/PATH/TO/JOSM/USERDATA")) + tr("Set the user data directory") + "\n" +
+ align("\t") + tr("Default: {0}", platform.getDefaultUserDataDirectory()) + "\n\n" +
+ align("\t-Djosm.cache=" + tr("/PATH/TO/JOSM/CACHE ")) + tr("Set the cache directory") + "\n" +
+ align("\t") + tr("Default: {0}", platform.getDefaultCacheDirectory()) + "\n\n" +
+ align("\t-Djosm.home=" + tr("/PATH/TO/JOSM/HOMEDIR ")) +
+ tr("Set the preferences+data+cache directory (cache directory will be josm.home/cache)")+"\n\n"+
tr("-Djosm.home has lower precedence, i.e. the specific setting overrides the general one")+"\n\n"+
tr("note: For some tasks, JOSM needs a lot of memory. It can be necessary to add the following\n" +
" Java option to specify the maximum size of allocated memory in megabytes")+":\n"+
@@ -168,12 +172,17 @@ public class MainApplication extends Main {
"\tjava -jar josm.jar london.osm --selection=http://www.ostertag.name/osm/OSM_errors_node-duplicate.xml\n"+
"\tjava -jar josm.jar 43.2,11.1,43.4,11.4\n"+
"\tjava -Djosm.pref=$XDG_CONFIG_HOME -Djosm.userdata=$XDG_DATA_HOME -Djosm.cache=$XDG_CACHE_HOME -jar josm.jar\n"+
+ "\tjava -Djosm.dir.name=josm_dev -jar josm.jar\n"+
"\tjava -Djosm.home=/home/user/.josm_dev -jar josm.jar\n"+
"\tjava -Xmx1024m -jar josm.jar\n\n"+
tr("Parameters --download, --downloadgps, and --selection are processed in this order.")+'\n'+
tr("Make sure you load some data if you use --selection.")+'\n';
}
+ private static String align(String str) {
+ return str + Stream.generate(() -> " ").limit(Math.max(0, 43 - str.length())).collect(Collectors.joining(""));
+ }
+
/**
* Main application Startup
* @param argArray Command-line arguments
diff --git a/src/org/openstreetmap/josm/gui/MainFrame.java b/src/org/openstreetmap/josm/gui/MainFrame.java
index 1c620de..0d9317d 100644
--- a/src/org/openstreetmap/josm/gui/MainFrame.java
+++ b/src/org/openstreetmap/josm/gui/MainFrame.java
@@ -88,12 +88,7 @@ public class MainFrame extends JFrame {
l.add(ImageProvider.get("logo_48x48x8").getImage());
l.add(ImageProvider.get("logo").getImage());
setIconImages(l);
- addWindowListener(new WindowAdapter() {
- @Override
- public void windowClosing(final WindowEvent evt) {
- Main.exitJosm(true, 0, null);
- }
- });
+ addWindowListener(new ExitWindowAdapter());
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
// This listener is never removed, since the main frame exists forever.
@@ -161,6 +156,13 @@ public class MainFrame extends JFrame {
}
}
+ static final class ExitWindowAdapter extends WindowAdapter {
+ @Override
+ public void windowClosing(final WindowEvent evt) {
+ Main.exitJosm(true, 0, null);
+ }
+ }
+
/**
* Manages the layer listeners, adds them to every layer.
*/
diff --git a/src/org/openstreetmap/josm/gui/MapFrame.java b/src/org/openstreetmap/josm/gui/MapFrame.java
index 83b1e4a..12b60d5 100644
--- a/src/org/openstreetmap/josm/gui/MapFrame.java
+++ b/src/org/openstreetmap/josm/gui/MapFrame.java
@@ -212,17 +212,7 @@ public class MapFrame extends JPanel implements Destroyable, ActiveLayerChangeLi
*/
splitPane.setDividerSize(5);
splitPane.setBorder(null);
- splitPane.setUI(new BasicSplitPaneUI() {
- @Override
- public BasicSplitPaneDivider createDefaultDivider() {
- return new BasicSplitPaneDivider(this) {
- @Override
- public void setBorder(Border b) {
- // Do nothing
- }
- };
- }
- });
+ splitPane.setUI(new NoBorderSplitPaneUI());
// JSplitPane supports F6 and F8 shortcuts by default, but we need them for Audio actions
splitPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_F6, 0), new Object());
@@ -532,6 +522,24 @@ public class MapFrame extends JPanel implements Destroyable, ActiveLayerChangeLi
}
}
+ static final class NoBorderSplitPaneUI extends BasicSplitPaneUI {
+ static final class NoBorderBasicSplitPaneDivider extends BasicSplitPaneDivider {
+ NoBorderBasicSplitPaneDivider(BasicSplitPaneUI ui) {
+ super(ui);
+ }
+
+ @Override
+ public void setBorder(Border b) {
+ // Do nothing
+ }
+ }
+
+ @Override
+ public BasicSplitPaneDivider createDefaultDivider() {
+ return new NoBorderBasicSplitPaneDivider(this);
+ }
+ }
+
private final class SideToolbarPopupMenu extends JPopupMenu {
private static final int staticMenuEntryCount = 2;
private final JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar")) {
diff --git a/src/org/openstreetmap/josm/gui/MapStatus.java b/src/org/openstreetmap/josm/gui/MapStatus.java
index d5665be..6f6f542 100644
--- a/src/org/openstreetmap/josm/gui/MapStatus.java
+++ b/src/org/openstreetmap/josm/gui/MapStatus.java
@@ -133,6 +133,25 @@ public final class MapStatus extends JPanel implements Helpful, Destroyable, Pre
private final MapView mv;
private final transient Collector collector;
+ static final class ShowMonitorDialogMouseAdapter extends MouseAdapter {
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ PleaseWaitProgressMonitor monitor = Main.currentProgressMonitor;
+ if (monitor != null) {
+ monitor.showForegroundDialog();
+ }
+ }
+ }
+
+ static final class JumpToOnLeftClickMouseAdapter extends MouseAdapter {
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ if (e.getButton() != MouseEvent.BUTTON3) {
+ Main.main.menu.jumpToAct.showJumpToDialog();
+ }
+ }
+ }
+
public class BackgroundProgressMonitor implements ProgressMonitorDialog {
private String title;
@@ -828,14 +847,7 @@ public final class MapStatus extends JPanel implements Helpful, Destroyable, Pre
setComponentPopupMenu(new MapStatusPopupMenu());
// also show Jump To dialog on mouse click (except context menu)
- MouseListener jumpToOnLeftClick = new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent e) {
- if (e.getButton() != MouseEvent.BUTTON3) {
- Main.main.menu.jumpToAct.showJumpToDialog();
- }
- }
- };
+ MouseListener jumpToOnLeftClick = new JumpToOnLeftClickMouseAdapter();
// Listen for mouse movements and set the position text field
mv.addMouseMotionListener(new MouseMotionListener() {
@@ -917,15 +929,7 @@ public final class MapStatus extends JPanel implements Helpful, Destroyable, Pre
GBC gbc = GBC.eol();
gbc.ipadx = 100;
add(progressBar, gbc);
- progressBar.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent e) {
- PleaseWaitProgressMonitor monitor = Main.currentProgressMonitor;
- if (monitor != null) {
- monitor.showForegroundDialog();
- }
- }
- });
+ progressBar.addMouseListener(new ShowMonitorDialogMouseAdapter());
Main.pref.addPreferenceChangeListener(this);
diff --git a/src/org/openstreetmap/josm/gui/MapView.java b/src/org/openstreetmap/josm/gui/MapView.java
index a811296..d70a3f6 100644
--- a/src/org/openstreetmap/josm/gui/MapView.java
+++ b/src/org/openstreetmap/josm/gui/MapView.java
@@ -419,7 +419,14 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
repaint();
}
- private void paintLayer(Layer layer, Graphics2D g, Bounds box) {
+ /**
+ * Paints the given layer to the graphics object, using the current state of this map view.
+ * @param layer The layer to draw.
+ * @param g A graphics object. It should have the width and height of this component
+ * @throws IllegalArgumentException If the layer is not part of this map view.
+ * @since 11226
+ */
+ public void paintLayer(Layer layer, Graphics2D g) {
try {
LayerPainter painter = registeredLayers.get(layer);
if (painter == null) {
@@ -434,7 +441,7 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
painter.paint(paintGraphics);
g.setPaintMode();
} catch (RuntimeException t) {
- BugReport.intercept(t).put("layer", layer).put("bounds", box).warn();
+ BugReport.intercept(t).put("layer", layer).warn();
}
}
@@ -479,7 +486,6 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
Graphics2D tempG = offscreenBuffer.createGraphics();
tempG.setClip(g.getClip());
- Bounds box = getLatLonBounds(g.getClipBounds());
if (!canUseBuffer || nonChangedLayersBuffer == null) {
if (null == nonChangedLayersBuffer
@@ -492,7 +498,7 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
g2.fillRect(0, 0, getWidth(), getHeight());
for (int i = 0; i < nonChangedLayersCount; i++) {
- paintLayer(visibleLayers.get(i), g2, box);
+ paintLayer(visibleLayers.get(i), g2);
}
} else {
// Maybe there were more unchanged layers then last time - draw them to buffer
@@ -500,7 +506,7 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
Graphics2D g2 = nonChangedLayersBuffer.createGraphics();
g2.setClip(g.getClip());
for (int i = nonChangedLayers.size(); i < nonChangedLayersCount; i++) {
- paintLayer(visibleLayers.get(i), g2, box);
+ paintLayer(visibleLayers.get(i), g2);
}
}
}
@@ -513,11 +519,11 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
tempG.drawImage(nonChangedLayersBuffer, 0, 0, null);
for (int i = nonChangedLayersCount; i < visibleLayers.size(); i++) {
- paintLayer(visibleLayers.get(i), tempG, box);
+ paintLayer(visibleLayers.get(i), tempG);
}
try {
- drawTemporaryLayers(tempG, box);
+ drawTemporaryLayers(tempG, getLatLonBounds(g.getClipBounds()));
} catch (RuntimeException e) {
BugReport.intercept(e).put("temporaryLayers", temporaryLayers).warn();
}
diff --git a/src/org/openstreetmap/josm/gui/NavigatableComponent.java b/src/org/openstreetmap/josm/gui/NavigatableComponent.java
index 2f35963..df3a2f8 100644
--- a/src/org/openstreetmap/josm/gui/NavigatableComponent.java
+++ b/src/org/openstreetmap/josm/gui/NavigatableComponent.java
@@ -82,6 +82,9 @@ public class NavigatableComponent extends JComponent implements Helpful {
void zoomChanged();
}
+ /**
+ * To determine if a primitive is currently selectable.
+ */
public transient Predicate<OsmPrimitive> isSelectablePredicate = prim -> {
if (!prim.isSelectable()) return false;
// if it isn't displayed on screen, you cannot click on it
@@ -93,11 +96,16 @@ public class NavigatableComponent extends JComponent implements Helpful {
}
};
+ /** Snap distance */
public static final IntegerProperty PROP_SNAP_DISTANCE = new IntegerProperty("mappaint.node.snap-distance", 10);
+ /** Zoom steps to get double scale */
public static final DoubleProperty PROP_ZOOM_RATIO = new DoubleProperty("zoom.ratio", 2.0);
+ /** Divide intervals between native resolution levels to smaller steps if they are much larger than zoom ratio */
public static final BooleanProperty PROP_ZOOM_INTERMEDIATE_STEPS = new BooleanProperty("zoom.intermediate-steps", true);
+ /** Property name for center change events */
public static final String PROPNAME_CENTER = "center";
+ /** Property name for scale change events */
public static final String PROPNAME_SCALE = "scale";
/**
@@ -421,6 +429,10 @@ public class NavigatableComponent extends JComponent implements Helpful {
return state.getForView(x, y).getEastNorth();
}
+ /**
+ * Determines the projection bounds of view area.
+ * @return the projection bounds of view area
+ */
public ProjectionBounds getProjectionBounds() {
return getState().getViewArea().getProjectionBounds();
}
@@ -438,20 +450,32 @@ public class NavigatableComponent extends JComponent implements Helpful {
}
/**
+ * Returns unprojected geographic coordinates for a specific pixel position on the screen.
* @param x X-Pixelposition to get coordinate from
* @param y Y-Pixelposition to get coordinate from
*
- * @return Geographic unprojected coordinates from a specific pixel coordination
- * on the screen.
+ * @return Geographic unprojected coordinates from a specific pixel position on the screen.
*/
public LatLon getLatLon(int x, int y) {
return getProjection().eastNorth2latlon(getEastNorth(x, y));
}
+ /**
+ * Returns unprojected geographic coordinates for a specific pixel position on the screen.
+ * @param x X-Pixelposition to get coordinate from
+ * @param y Y-Pixelposition to get coordinate from
+ *
+ * @return Geographic unprojected coordinates from a specific pixel position on the screen.
+ */
public LatLon getLatLon(double x, double y) {
return getLatLon((int) x, (int) y);
}
+ /**
+ * Determines the projection bounds of given rectangle.
+ * @param r rectangle
+ * @return the projection bounds of {@code r}
+ */
public ProjectionBounds getProjectionBounds(Rectangle r) {
return getState().getViewArea(r).getProjectionBounds();
}
@@ -464,6 +488,10 @@ public class NavigatableComponent extends JComponent implements Helpful {
return Main.getProjection().getLatLonBoundsBox(getProjectionBounds(r));
}
+ /**
+ * Creates an affine transform that is used to convert the east/north coordinates to view coordinates.
+ * @return The affine transform.
+ */
public AffineTransform getAffineTransform() {
return getState().getAffineTransform();
}
@@ -471,8 +499,7 @@ public class NavigatableComponent extends JComponent implements Helpful {
/**
* Return the point on the screen where this Coordinate would be.
* @param p The point, where this geopoint would be drawn.
- * @return The point on screen where "point" would be drawn, relative
- * to the own top/left.
+ * @return The point on screen where "point" would be drawn, relative to the own top/left.
*/
public Point2D getPoint2D(EastNorth p) {
if (null == p)
@@ -480,6 +507,11 @@ public class NavigatableComponent extends JComponent implements Helpful {
return getState().getPointFor(p).getInView();
}
+ /**
+ * Return the point on the screen where this Coordinate would be.
+ * @param latlon The point, where this geopoint would be drawn.
+ * @return The point on screen where "point" would be drawn, relative to the own top/left.
+ */
public Point2D getPoint2D(LatLon latlon) {
if (latlon == null)
return new Point();
@@ -489,6 +521,11 @@ public class NavigatableComponent extends JComponent implements Helpful {
return getPoint2D(getProjection().latlon2eastNorth(latlon));
}
+ /**
+ * Return the point on the screen where this Node would be.
+ * @param n The node, where this geopoint would be drawn.
+ * @return The point on screen where "node" would be drawn, relative to the own top/left.
+ */
public Point2D getPoint2D(Node n) {
return getPoint2D(n.getEastNorth());
}
@@ -625,10 +662,18 @@ public class NavigatableComponent extends JComponent implements Helpful {
}
}
+ /**
+ * Zoom to given east/north.
+ * @param newCenter new center coordinates
+ */
public void zoomTo(EastNorth newCenter) {
zoomTo(newCenter, getScale());
}
+ /**
+ * Zoom to given lat/lon.
+ * @param newCenter new center coordinates
+ */
public void zoomTo(LatLon newCenter) {
zoomTo(Projections.project(newCenter));
}
@@ -687,6 +732,10 @@ public class NavigatableComponent extends JComponent implements Helpful {
zoomTo(getCenter(), getScale()*factor);
}
+ /**
+ * Zoom to given projection bounds.
+ * @param box new projection bounds
+ */
public void zoomTo(ProjectionBounds box) {
// -20 to leave some border
int w = getWidth()-20;
@@ -706,11 +755,19 @@ public class NavigatableComponent extends JComponent implements Helpful {
zoomTo(box.getCenter(), newScale);
}
+ /**
+ * Zoom to given bounds.
+ * @param box new bounds
+ */
public void zoomTo(Bounds box) {
zoomTo(new ProjectionBounds(getProjection().latlon2eastNorth(box.getMin()),
getProjection().latlon2eastNorth(box.getMax())));
}
+ /**
+ * Zoom to given viewport data.
+ * @param viewport new viewport data
+ */
public void zoomTo(ViewportData viewport) {
if (viewport == null) return;
if (viewport.getBounds() != null) {
@@ -774,6 +831,9 @@ public class NavigatableComponent extends JComponent implements Helpful {
zoomTimestamp = now;
}
+ /**
+ * Zoom to previous location.
+ */
public void zoomPrevious() {
if (!zoomUndoBuffer.isEmpty()) {
ZoomData zoom = zoomUndoBuffer.pop();
@@ -782,6 +842,9 @@ public class NavigatableComponent extends JComponent implements Helpful {
}
}
+ /**
+ * Zoom to next location.
+ */
public void zoomNext() {
if (!zoomRedoBuffer.isEmpty()) {
ZoomData zoom = zoomRedoBuffer.pop();
@@ -790,10 +853,18 @@ public class NavigatableComponent extends JComponent implements Helpful {
}
}
+ /**
+ * Determines if zoom history contains "undo" entries.
+ * @return {@code true} if zoom history contains "undo" entries
+ */
public boolean hasZoomUndoEntries() {
return !zoomUndoBuffer.isEmpty();
}
+ /**
+ * Determines if zoom history contains "redo" entries.
+ * @return {@code true} if zoom history contains "redo" entries
+ */
public boolean hasZoomRedoEntries() {
return !zoomRedoBuffer.isEmpty();
}
@@ -1313,9 +1384,9 @@ public class NavigatableComponent extends JComponent implements Helpful {
if (osm != null) {
if (osm instanceof Node) {
- nearestList = new ArrayList<OsmPrimitive>(getNearestNodes(p, predicate));
+ nearestList = new ArrayList<>(getNearestNodes(p, predicate));
} else if (osm instanceof Way) {
- nearestList = new ArrayList<OsmPrimitive>(getNearestWays(p, predicate));
+ nearestList = new ArrayList<>(getNearestWays(p, predicate));
}
if (ignore != null) {
nearestList.removeAll(ignore);
diff --git a/src/org/openstreetmap/josm/gui/NotificationManager.java b/src/org/openstreetmap/josm/gui/NotificationManager.java
index ffd3a59..e47e93c 100644
--- a/src/org/openstreetmap/josm/gui/NotificationManager.java
+++ b/src/org/openstreetmap/josm/gui/NotificationManager.java
@@ -182,6 +182,19 @@ class NotificationManager {
private static class NotificationPanel extends JPanel {
+ static final class ShowNoteHelpAction extends AbstractAction {
+ private final Notification note;
+
+ ShowNoteHelpAction(Notification note) {
+ this.note = note;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ SwingUtilities.invokeLater(() -> HelpBrowser.setUrlForHelpTopic(note.getHelpTopic()));
+ }
+ }
+
private JPanel innerPanel;
NotificationPanel(Notification note, MouseListener freeze, ActionListener hideListener) {
@@ -213,12 +226,7 @@ class NotificationManager {
btnHelp.setIcon(ImageProvider.get("help"));
btnHelp.setToolTipText(tr("Show help information"));
HelpUtil.setHelpContext(btnHelp, note.getHelpTopic());
- btnHelp.addActionListener(new AbstractAction() {
- @Override
- public void actionPerformed(ActionEvent e) {
- SwingUtilities.invokeLater(() -> HelpBrowser.setUrlForHelpTopic(note.getHelpTopic()));
- }
- });
+ btnHelp.addActionListener(new ShowNoteHelpAction(note));
btnHelp.setOpaque(false);
tbHelp = new JToolBar();
tbHelp.setFloatable(false);
diff --git a/src/org/openstreetmap/josm/gui/PopupMenuHandler.java b/src/org/openstreetmap/josm/gui/PopupMenuHandler.java
index 5f9cb80..a02d1f2 100644
--- a/src/org/openstreetmap/josm/gui/PopupMenuHandler.java
+++ b/src/org/openstreetmap/josm/gui/PopupMenuHandler.java
@@ -73,11 +73,9 @@ public class PopupMenuHandler {
}
MenuElement[] elements = menu.getSubElements();
for (int i = 0; i < elements.length; i++) {
- if (elements[i] instanceof JMenuItem) {
- if (((JMenuItem) elements[i]).getAction() == a) {
- menu.remove(i);
- return;
- }
+ if (elements[i] instanceof JMenuItem && ((JMenuItem) elements[i]).getAction() == a) {
+ menu.remove(i);
+ return;
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java b/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java
index 4d3885e..014e02f 100644
--- a/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java
+++ b/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java
@@ -117,8 +117,7 @@ public class SlippyMapControler extends MouseAdapter {
}
/**
- * Start drawing the selection rectangle if it was the 1st button (left
- * button)
+ * Start drawing the selection rectangle if it was the 1st button (left button)
*/
@Override
public void mousePressed(MouseEvent e) {
@@ -131,12 +130,10 @@ public class SlippyMapControler extends MouseAdapter {
@Override
public void mouseDragged(MouseEvent e) {
if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == MouseEvent.BUTTON1_DOWN_MASK &&
- !(Main.isPlatformOsx() && e.getModifiersEx() == MAC_MOUSE_BUTTON3_MASK)) {
- if (iStartSelectionPoint != null) {
- iEndSelectionPoint = e.getPoint();
- iSlippyMapChooser.setSelection(iStartSelectionPoint, iEndSelectionPoint);
- isSelecting = true;
- }
+ !(Main.isPlatformOsx() && e.getModifiersEx() == MAC_MOUSE_BUTTON3_MASK) && iStartSelectionPoint != null) {
+ iEndSelectionPoint = e.getPoint();
+ iSlippyMapChooser.setSelection(iStartSelectionPoint, iEndSelectionPoint);
+ isSelecting = true;
}
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java b/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java
similarity index 92%
rename from src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
rename to src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java
index 81c17f5..947cd83 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java
@@ -28,6 +28,8 @@ import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableModel;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.conflict.ConflictResolveCommand;
+import org.openstreetmap.josm.data.conflict.Conflict;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.PrimitiveId;
@@ -51,7 +53,7 @@ import org.openstreetmap.josm.tools.Utils;
* A ListMergeModel is a factory for three {@link TableModel}s and three {@link ListSelectionModel}s:
* <ol>
* <li>the table model and the list selection for for a {@link JTable} which shows my entries.
- * See {@link #getMyTableModel()} and {@link ListMergeModel#getMySelectionModel()}</li>
+ * See {@link #getMyTableModel()} and {@link AbstractListMergeModel#getMySelectionModel()}</li>
* <li>dito for their entries and merged entries</li>
* </ol>
*
@@ -61,18 +63,19 @@ import org.openstreetmap.josm.tools.Utils;
*
* ListMergeModel is an abstract class. Three methods have to be implemented by subclasses:
* <ul>
- * <li>{@link ListMergeModel#cloneEntryForMergedList} - clones an entry of type T</li>
- * <li>{@link ListMergeModel#isEqualEntry} - checks whether two entries are equals </li>
- * <li>{@link ListMergeModel#setValueAt(DefaultTableModel, Object, int, int)} - handles values edited in
+ * <li>{@link AbstractListMergeModel#cloneEntryForMergedList} - clones an entry of type T</li>
+ * <li>{@link AbstractListMergeModel#isEqualEntry} - checks whether two entries are equals </li>
+ * <li>{@link AbstractListMergeModel#setValueAt(DefaultTableModel, Object, int, int)} - handles values edited in
* a JTable, dispatched from {@link TableModel#setValueAt(Object, int, int)} </li>
* </ul>
- * A ListMergeModel is used in combination with a {@link ListMerger}.
+ * A ListMergeModel is used in combination with a {@link AbstractListMerger}.
*
- * @param <T> the type of the list entries
- * @see ListMerger
+ * @param <T> the type of the list entries
+ * @param <C> the type of conflict resolution command
+ * @see AbstractListMerger
*/
-public abstract class ListMergeModel<T extends PrimitiveId> extends ChangeNotifier {
- public static final String FROZEN_PROP = ListMergeModel.class.getName() + ".frozen";
+public abstract class AbstractListMergeModel<T extends PrimitiveId, C extends ConflictResolveCommand> extends ChangeNotifier {
+ public static final String FROZEN_PROP = AbstractListMergeModel.class.getName() + ".frozen";
private static final int MAX_DELETED_PRIMITIVE_IN_DIALOG = 5;
@@ -186,7 +189,7 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends ChangeNotifi
/**
* Constructs a new {@code ListMergeModel}.
*/
- public ListMergeModel() {
+ public AbstractListMergeModel() {
entries = new EnumMap<>(ListRole.class);
for (ListRole role : ListRole.values()) {
entries.put(role, new ArrayList<T>());
@@ -501,10 +504,12 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends ChangeNotifi
mergedEntries.add(row -1, n);
}
fireModelDataChanged();
+ mergedEntriesSelectionModel.setValueIsAdjusting(true);
mergedEntriesSelectionModel.clearSelection();
for (int row: rows) {
mergedEntriesSelectionModel.addSelectionInterval(row-1, row-1);
}
+ mergedEntriesSelectionModel.setValueIsAdjusting(false);
}
/**
@@ -527,10 +532,12 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends ChangeNotifi
mergedEntries.add(row +1, n);
}
fireModelDataChanged();
+ mergedEntriesSelectionModel.setValueIsAdjusting(true);
mergedEntriesSelectionModel.clearSelection();
for (int row: rows) {
mergedEntriesSelectionModel.addSelectionInterval(row+1, row+1);
}
+ mergedEntriesSelectionModel.setValueIsAdjusting(false);
}
/**
@@ -571,13 +578,13 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends ChangeNotifi
/**
* This an adapter between a {@link JTable} and one of the three entry lists
- * in the role {@link ListRole} managed by the {@link ListMergeModel}.
+ * in the role {@link ListRole} managed by the {@link AbstractListMergeModel}.
*
* From the point of view of the {@link JTable} it is a {@link TableModel}.
*
- * @see ListMergeModel#getMyTableModel()
- * @see ListMergeModel#getTheirTableModel()
- * @see ListMergeModel#getMergedTableModel()
+ * @see AbstractListMergeModel#getMyTableModel()
+ * @see AbstractListMergeModel#getTheirTableModel()
+ * @see AbstractListMergeModel#getMergedTableModel()
*/
public class EntriesTableModel extends DefaultTableModel implements OsmPrimitivesTableModel {
private final ListRole role;
@@ -610,11 +617,15 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends ChangeNotifi
@Override
public void setValueAt(Object value, int row, int col) {
- ListMergeModel.this.setValueAt(this, value, row, col);
+ AbstractListMergeModel.this.setValueAt(this, value, row, col);
}
- public ListMergeModel<T> getListMergeModel() {
- return ListMergeModel.this;
+ /**
+ * Returns the list merge model.
+ * @return the list merge model
+ */
+ public AbstractListMergeModel<T, C> getListMergeModel() {
+ return AbstractListMergeModel.this;
}
/**
@@ -624,7 +635,7 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends ChangeNotifi
* @return true, if the if the {@link ListRole} of this {@link EntriesTableModel}
* participates in the current {@link ComparePairType}
*
- * @see ListMergeModel.ComparePairListModel#getSelectedComparePair()
+ * @see AbstractListMergeModel.ComparePairListModel#getSelectedComparePair()
*/
public boolean isParticipatingInCurrentComparePair() {
return getComparePairListModel()
@@ -712,14 +723,14 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends ChangeNotifi
/**
* This is the selection model to be used in a {@link JTable} which displays
- * an entry list managed by {@link ListMergeModel}.
+ * an entry list managed by {@link AbstractListMergeModel}.
*
* The model ensures that only rows displaying an entry in the entry list
* can be selected. "Empty" rows can't be selected.
*
- * @see ListMergeModel#getMySelectionModel()
- * @see ListMergeModel#getMergedSelectionModel()
- * @see ListMergeModel#getTheirSelectionModel()
+ * @see AbstractListMergeModel#getMySelectionModel()
+ * @see AbstractListMergeModel#getMergedSelectionModel()
+ * @see AbstractListMergeModel#getTheirSelectionModel()
*
*/
protected class EntriesSelectionModel extends DefaultListSelectionModel {
@@ -860,4 +871,13 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends ChangeNotifi
return compareModes.get(selectedIdx);
}
}
+
+ /**
+ * Builds the command to resolve conflicts in the list.
+ *
+ * @param conflict the conflict data set
+ * @return the command
+ * @throws IllegalStateException if the merge is not yet frozen
+ */
+ public abstract C buildResolveCommand(Conflict<? extends OsmPrimitive> conflict);
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java b/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMerger.java
similarity index 97%
rename from src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
rename to src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMerger.java
index d4eb184..70dc117 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMerger.java
@@ -31,6 +31,7 @@ import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.conflict.ConflictResolveCommand;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.PrimitiveId;
import org.openstreetmap.josm.data.osm.Relation;
@@ -45,15 +46,17 @@ import org.openstreetmap.josm.tools.ImageProvider;
* A UI component for resolving conflicts in two lists of entries of type T.
*
* @param <T> the type of the entries
- * @see ListMergeModel
+ * @param <C> the type of conflict resolution command
+ * @see AbstractListMergeModel
* @since 1631
*/
-public abstract class ListMerger<T extends PrimitiveId> extends JPanel implements PropertyChangeListener, ChangeListener, IConflictResolver {
+public abstract class AbstractListMerger<T extends PrimitiveId, C extends ConflictResolveCommand> extends JPanel
+implements PropertyChangeListener, ChangeListener, IConflictResolver {
protected OsmPrimitivesTable myEntriesTable;
protected OsmPrimitivesTable mergedEntriesTable;
protected OsmPrimitivesTable theirEntriesTable;
- protected transient ListMergeModel<T> model;
+ protected transient AbstractListMergeModel<T, C> model;
private CopyStartLeftAction copyStartLeftAction;
private CopyBeforeCurrentLeftAction copyBeforeCurrentLeftAction;
@@ -405,7 +408,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
* Constructs a new {@code ListMerger}.
* @param model list merger model
*/
- public ListMerger(ListMergeModel<T> model) {
+ public AbstractListMerger(AbstractListMergeModel<T, C> model) {
this.model = model;
model.addChangeListener(this);
build();
@@ -486,7 +489,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
@Override
public void actionPerformed(ActionEvent e) {
int[] mergedRows = mergedEntriesTable.getSelectedRows();
- if (mergedRows == null || mergedRows.length == 0)
+ if (mergedRows.length == 0)
return;
int[] myRows = myEntriesTable.getSelectedRows();
int current = mergedRows[0];
@@ -516,7 +519,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
@Override
public void actionPerformed(ActionEvent e) {
int[] mergedRows = mergedEntriesTable.getSelectedRows();
- if (mergedRows == null || mergedRows.length == 0)
+ if (mergedRows.length == 0)
return;
int[] myRows = myEntriesTable.getSelectedRows();
int current = mergedRows[0];
@@ -578,7 +581,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
@Override
public void actionPerformed(ActionEvent e) {
int[] mergedRows = mergedEntriesTable.getSelectedRows();
- if (mergedRows == null || mergedRows.length == 0)
+ if (mergedRows.length == 0)
return;
int[] myRows = theirEntriesTable.getSelectedRows();
int current = mergedRows[0];
@@ -604,7 +607,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
@Override
public void actionPerformed(ActionEvent e) {
int[] mergedRows = mergedEntriesTable.getSelectedRows();
- if (mergedRows == null || mergedRows.length == 0)
+ if (mergedRows.length == 0)
return;
int[] myRows = theirEntriesTable.getSelectedRows();
int current = mergedRows[0];
@@ -699,9 +702,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
@Override
public void valueChanged(ListSelectionEvent e) {
int[] rows = mergedEntriesTable.getSelectedRows();
- setEnabled(
- rows != null
- && rows.length > 0
+ setEnabled(rows.length > 0
&& rows[0] != 0
);
}
@@ -733,9 +734,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
@Override
public void valueChanged(ListSelectionEvent e) {
int[] rows = mergedEntriesTable.getSelectedRows();
- setEnabled(
- rows != null
- && rows.length > 0
+ setEnabled(rows.length > 0
&& rows[rows.length -1] != mergedEntriesTable.getRowCount() -1
);
}
@@ -767,10 +766,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
@Override
public void valueChanged(ListSelectionEvent e) {
int[] rows = mergedEntriesTable.getSelectedRows();
- setEnabled(
- rows != null
- && rows.length > 0
- );
+ setEnabled(rows.length > 0);
}
}
@@ -855,12 +851,16 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
@Override
public void propertyChange(PropertyChangeEvent evt) {
- if (evt.getPropertyName().equals(ListMergeModel.FROZEN_PROP)) {
+ if (evt.getPropertyName().equals(AbstractListMergeModel.FROZEN_PROP)) {
handlePropertyChangeFrozen((Boolean) evt.getOldValue(), (Boolean) evt.getNewValue());
}
}
- public ListMergeModel<T> getModel() {
+ /**
+ * Returns the model.
+ * @return the model
+ */
+ public AbstractListMergeModel<T, C> getModel() {
return model;
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java b/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
index 733f0bb..cb77c62 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
@@ -23,11 +23,9 @@ import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.conflict.pair.nodes.NodeListMergeModel;
import org.openstreetmap.josm.gui.conflict.pair.nodes.NodeListMerger;
import org.openstreetmap.josm.gui.conflict.pair.properties.PropertiesMergeModel;
import org.openstreetmap.josm.gui.conflict.pair.properties.PropertiesMerger;
-import org.openstreetmap.josm.gui.conflict.pair.relation.RelationMemberListMergeModel;
import org.openstreetmap.josm.gui.conflict.pair.relation.RelationMemberMerger;
import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeModel;
import org.openstreetmap.josm.gui.conflict.pair.tags.TagMerger;
@@ -45,7 +43,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
* <li>{@link #THEIR_PRIMITIVE_PROP} - new value is the {@link OsmPrimitive} in the role of
* their primitive</li>
* </ul>
- *
+ * @since 1622
*/
public class ConflictResolver extends JPanel implements PropertyChangeListener {
@@ -164,7 +162,7 @@ public class ConflictResolver extends JPanel implements PropertyChangeListener {
* handles property change events
* @param evt the event
* @see TagMergeModel
- * @see ListMergeModel
+ * @see AbstractListMergeModel
* @see PropertiesMergeModel
*/
@Override
@@ -182,7 +180,7 @@ public class ConflictResolver extends JPanel implements PropertyChangeListener {
tabbedPane.setIconAt(1, mergeIncomplete);
}
updateResolvedCompletely();
- } else if (evt.getPropertyName().equals(ListMergeModel.FROZEN_PROP)) {
+ } else if (evt.getPropertyName().equals(AbstractListMergeModel.FROZEN_PROP)) {
boolean frozen = (Boolean) evt.getNewValue();
if (evt.getSource() == nodeListMerger.getModel() && my instanceof Way) {
if (frozen) {
@@ -273,8 +271,7 @@ public class ConflictResolver extends JPanel implements PropertyChangeListener {
}
/**
- * Builds the resolution command(s) for the resolved conflicts in this
- * ConflictResolver
+ * Builds the resolution command(s) for the resolved conflicts in this ConflictResolver
*
* @return the resolution command
*/
@@ -286,11 +283,9 @@ public class ConflictResolver extends JPanel implements PropertyChangeListener {
}
commands.addAll(propertiesMerger.getModel().buildResolveCommand(conflict));
if (my instanceof Way && nodeListMerger.getModel().isFrozen()) {
- NodeListMergeModel model = (NodeListMergeModel) nodeListMerger.getModel();
- commands.add(model.buildResolveCommand(conflict));
+ commands.add(nodeListMerger.getModel().buildResolveCommand(conflict));
} else if (my instanceof Relation && relationMemberMerger.getModel().isFrozen()) {
- RelationMemberListMergeModel model = (RelationMemberListMergeModel) relationMemberMerger.getModel();
- commands.add(model.buildResolveCommand((Relation) my, (Relation) their));
+ commands.add(relationMemberMerger.getModel().buildResolveCommand(conflict));
}
if (isResolvedCompletely()) {
commands.add(new VersionConflictResolveCommand(conflict));
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/ListRole.java b/src/org/openstreetmap/josm/gui/conflict/pair/ListRole.java
index 2f7ab11..9cd0f71 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/ListRole.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/ListRole.java
@@ -2,7 +2,7 @@
package org.openstreetmap.josm.gui.conflict.pair;
/**
- * Enumeration of roles entry lists play in {@link ListMergeModel}
+ * Enumeration of roles entry lists play in {@link AbstractListMergeModel}
*/
public enum ListRole {
MY_ENTRIES,
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/PairTable.java b/src/org/openstreetmap/josm/gui/conflict/pair/PairTable.java
index 702a39f..c86ceb9 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/PairTable.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/PairTable.java
@@ -5,6 +5,7 @@ import javax.swing.JTable;
import javax.swing.ListSelectionModel;
import javax.swing.table.TableColumnModel;
+import org.openstreetmap.josm.command.conflict.ConflictResolveCommand;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.PrimitiveId;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -13,7 +14,7 @@ import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTableModel;
public abstract class PairTable extends OsmPrimitivesTable {
- private final transient ListMergeModel<? extends PrimitiveId> model;
+ private final transient AbstractListMergeModel<? extends PrimitiveId, ? extends ConflictResolveCommand> model;
/**
* Constructs a new {@code PairTable}.
@@ -23,7 +24,7 @@ public abstract class PairTable extends OsmPrimitivesTable {
* @param cm column model
* @param sm selection model
*/
- public PairTable(String name, ListMergeModel<? extends PrimitiveId> model,
+ public PairTable(String name, AbstractListMergeModel<? extends PrimitiveId, ? extends ConflictResolveCommand> model,
OsmPrimitivesTableModel dm, TableColumnModel cm, ListSelectionModel sm) {
super(dm, cm, sm);
this.model = model;
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java b/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java
index 1b3597c..8eb7ad0 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java
@@ -14,10 +14,14 @@ import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.PrimitiveId;
import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
+import org.openstreetmap.josm.gui.conflict.pair.AbstractListMergeModel;
import org.openstreetmap.josm.gui.conflict.pair.ListRole;
-public class NodeListMergeModel extends ListMergeModel<Node> {
+/**
+ * The model for merging two lists of way nodess
+ * @since 1622
+ */
+public class NodeListMergeModel extends AbstractListMergeModel<Node, WayNodesConflictResolverCommand> {
/**
* Populates the model with the nodes in the two {@link Way}s <code>my</code> and
@@ -48,13 +52,7 @@ public class NodeListMergeModel extends ListMergeModel<Node> {
fireModelDataChanged();
}
- /**
- * Builds the command to resolve conflicts in the node list of a way
- *
- * @param conflict the conflict data set
- * @return the command
- * @throws IllegalStateException if the merge is not yet frozen
- */
+ @Override
public WayNodesConflictResolverCommand buildResolveCommand(Conflict<? extends OsmPrimitive> conflict) {
if (!isFrozen())
throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Cannot build resolution command."));
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java b/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java
index b933fff..0408e50 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java
@@ -3,17 +3,18 @@ package org.openstreetmap.josm.gui.conflict.pair.nodes;
import javax.swing.JScrollPane;
+import org.openstreetmap.josm.command.conflict.WayNodesConflictResolverCommand;
import org.openstreetmap.josm.data.conflict.Conflict;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.conflict.pair.ListMerger;
+import org.openstreetmap.josm.gui.conflict.pair.AbstractListMerger;
/**
* A UI component for resolving conflicts in the node lists of two {@link Way}s.
* @since 1622
*/
-public class NodeListMerger extends ListMerger<Node> {
+public class NodeListMerger extends AbstractListMerger<Node, WayNodesConflictResolverCommand> {
/**
* Constructs a new {@code NodeListMerger}.
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTable.java b/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTable.java
index ed2cf9d..0abc72b 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTable.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTable.java
@@ -4,11 +4,16 @@ package org.openstreetmap.josm.gui.conflict.pair.nodes;
import javax.swing.ListSelectionModel;
import org.openstreetmap.josm.actions.ZoomToAction;
+import org.openstreetmap.josm.command.conflict.WayNodesConflictResolverCommand;
import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
+import org.openstreetmap.josm.gui.conflict.pair.AbstractListMergeModel;
import org.openstreetmap.josm.gui.conflict.pair.PairTable;
import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTableModel;
+/**
+ * Node list table.
+ * @since 5297
+ */
public class NodeListTable extends PairTable {
/**
@@ -18,7 +23,8 @@ public class NodeListTable extends PairTable {
* @param dm table model
* @param sm selection model
*/
- public NodeListTable(String name, ListMergeModel<Node> model, OsmPrimitivesTableModel dm, ListSelectionModel sm) {
+ public NodeListTable(String name, AbstractListMergeModel<Node, WayNodesConflictResolverCommand> model,
+ OsmPrimitivesTableModel dm, ListSelectionModel sm) {
super(name, model, dm, new NodeListColumnModel(new NodeListTableCellRenderer()), sm);
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java b/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java
index d2a6a93..2704a52 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java
@@ -11,10 +11,11 @@ import javax.swing.JTable;
import javax.swing.border.Border;
import javax.swing.table.TableCellRenderer;
+import org.openstreetmap.josm.command.conflict.WayNodesConflictResolverCommand;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.gui.DefaultNameFormatter;
import org.openstreetmap.josm.gui.conflict.ConflictColors;
-import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
+import org.openstreetmap.josm.gui.conflict.pair.AbstractListMergeModel;
import org.openstreetmap.josm.tools.ImageProvider;
/**
@@ -53,7 +54,8 @@ public class NodeListTableCellRenderer extends JLabel implements TableCellRender
* @param row the row
* @param isSelected true, if the current row is selected
*/
- protected void renderNode(ListMergeModel<Node>.EntriesTableModel model, Node node, int row, boolean isSelected) {
+ protected void renderNode(AbstractListMergeModel<Node, WayNodesConflictResolverCommand>.EntriesTableModel model, Node node,
+ int row, boolean isSelected) {
setIcon(icon);
setBorder(null);
if (model.getListMergeModel().isFrozen()) {
@@ -87,7 +89,7 @@ public class NodeListTableCellRenderer extends JLabel implements TableCellRender
* @param model the model
* @param row the row index
*/
- protected void renderRowId(ListMergeModel<Node>.EntriesTableModel model, int row) {
+ protected void renderRowId(AbstractListMergeModel<Node, WayNodesConflictResolverCommand>.EntriesTableModel model, int row) {
setIcon(null);
setBorder(rowNumberBorder);
if (model.getListMergeModel().isFrozen()) {
@@ -129,7 +131,7 @@ public class NodeListTableCellRenderer extends JLabel implements TableCellRender
* @return the table model
*/
@SuppressWarnings("unchecked")
- protected ListMergeModel<Node>.EntriesTableModel getModel(JTable table) {
- return (ListMergeModel<Node>.EntriesTableModel) table.getModel();
+ protected AbstractListMergeModel<Node, WayNodesConflictResolverCommand>.EntriesTableModel getModel(JTable table) {
+ return (AbstractListMergeModel<Node, WayNodesConflictResolverCommand>.EntriesTableModel) table.getModel();
}
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java b/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java
index 3f209e6..32a186b 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java
@@ -3,24 +3,25 @@ package org.openstreetmap.josm.gui.conflict.pair.relation;
import static org.openstreetmap.josm.tools.I18n.tr;
-import java.util.List;
import java.util.Map;
import javax.swing.table.DefaultTableModel;
import org.openstreetmap.josm.command.conflict.RelationMemberConflictResolverCommand;
+import org.openstreetmap.josm.data.conflict.Conflict;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.PrimitiveId;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
+import org.openstreetmap.josm.gui.conflict.pair.AbstractListMergeModel;
import org.openstreetmap.josm.gui.conflict.pair.ListRole;
import org.openstreetmap.josm.tools.CheckParameterUtil;
+
/**
* The model for merging two lists of relation members
- *
+ * @since 1631
*/
-public class RelationMemberListMergeModel extends ListMergeModel<RelationMember> {
+public class RelationMemberListMergeModel extends AbstractListMergeModel<RelationMember, RelationMemberConflictResolverCommand> {
@Override
public boolean isEqualEntry(RelationMember e1, RelationMember e2) {
@@ -95,22 +96,11 @@ public class RelationMemberListMergeModel extends ListMergeModel<RelationMember>
return getMyPrimitiveById(entry.getMember());
}
- /**
- * Builds the command to resolve conflicts in the node list of a way
- *
- * @param my my relation. Must not be null.
- * @param their their relation. Must not be null
- * @return the command
- * @throws IllegalArgumentException if my is null
- * @throws IllegalArgumentException if their is null
- * @throws IllegalStateException if the merge is not yet frozen
- */
- public RelationMemberConflictResolverCommand buildResolveCommand(Relation my, Relation their) {
- CheckParameterUtil.ensureParameterNotNull(my, "my");
- CheckParameterUtil.ensureParameterNotNull(their, "their");
+ @Override
+ public RelationMemberConflictResolverCommand buildResolveCommand(Conflict<? extends OsmPrimitive> conflict) {
+ CheckParameterUtil.ensureParameterNotNull(conflict, "conflict");
if (!isFrozen())
- throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Cannot build resolution command"));
- List<RelationMember> entries = getMergedEntries();
- return new RelationMemberConflictResolverCommand(my, their, entries);
+ throw new IllegalArgumentException(tr("Merged members not frozen yet. Cannot build resolution command"));
+ return new RelationMemberConflictResolverCommand(conflict, getMergedEntries());
}
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java b/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java
index 2248e53..770c0ff 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java
@@ -3,17 +3,18 @@ package org.openstreetmap.josm.gui.conflict.pair.relation;
import javax.swing.JScrollPane;
+import org.openstreetmap.josm.command.conflict.RelationMemberConflictResolverCommand;
import org.openstreetmap.josm.data.conflict.Conflict;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.gui.conflict.pair.ListMerger;
+import org.openstreetmap.josm.gui.conflict.pair.AbstractListMerger;
/**
* A UI component for resolving conflicts in the member lists of two {@link Relation}s.
* @since 1631
*/
-public class RelationMemberMerger extends ListMerger<RelationMember> {
+public class RelationMemberMerger extends AbstractListMerger<RelationMember, RelationMemberConflictResolverCommand> {
/**
* Constructs a new {@code RelationMemberMerger}.
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTable.java b/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTable.java
index 2b0f1c5..7c8ec35 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTable.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTable.java
@@ -4,11 +4,16 @@ package org.openstreetmap.josm.gui.conflict.pair.relation;
import javax.swing.ListSelectionModel;
import org.openstreetmap.josm.actions.ZoomToAction;
+import org.openstreetmap.josm.command.conflict.RelationMemberConflictResolverCommand;
import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
+import org.openstreetmap.josm.gui.conflict.pair.AbstractListMergeModel;
import org.openstreetmap.josm.gui.conflict.pair.PairTable;
import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTableModel;
+/**
+ * Relation member table.
+ * @since 5297
+ */
public class RelationMemberTable extends PairTable {
/**
@@ -18,7 +23,8 @@ public class RelationMemberTable extends PairTable {
* @param dm table model
* @param sm selection model
*/
- public RelationMemberTable(String name, ListMergeModel<RelationMember> model, OsmPrimitivesTableModel dm, ListSelectionModel sm) {
+ public RelationMemberTable(String name, AbstractListMergeModel<RelationMember, RelationMemberConflictResolverCommand> model,
+ OsmPrimitivesTableModel dm, ListSelectionModel sm) {
super(name, model, dm, new RelationMemberListColumnModel(), sm);
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java b/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java
index 46708ca..61c4321 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java
@@ -10,16 +10,16 @@ import javax.swing.JTable;
import javax.swing.border.Border;
import javax.swing.table.TableCellRenderer;
-import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.command.conflict.RelationMemberConflictResolverCommand;
import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.gui.DefaultNameFormatter;
import org.openstreetmap.josm.gui.conflict.ConflictColors;
-import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
+import org.openstreetmap.josm.gui.conflict.pair.AbstractListMergeModel;
import org.openstreetmap.josm.tools.ImageProvider;
/**
* This is the {@link TableCellRenderer} used in the tables of {@link RelationMemberMerger}.
- *
+ * @since 1631
*/
public class RelationMemberTableCellRenderer extends JLabel implements TableCellRenderer {
private final transient Border rowNumberBorder;
@@ -44,7 +44,8 @@ public class RelationMemberTableCellRenderer extends JLabel implements TableCell
setToolTipText(null);
}
- protected void renderBackground(ListMergeModel<Node>.EntriesTableModel model, RelationMember member, int row, int col, boolean isSelected) {
+ protected void renderBackground(AbstractListMergeModel<RelationMember, RelationMemberConflictResolverCommand>.EntriesTableModel model,
+ RelationMember member, int row, int col, boolean isSelected) {
Color bgc = ConflictColors.BGCOLOR.get();
if (col == 0) {
if (model.getListMergeModel().isFrozen()) {
@@ -76,7 +77,8 @@ public class RelationMemberTableCellRenderer extends JLabel implements TableCell
setBackground(bgc);
}
- protected void renderForeground(ListMergeModel<Node>.EntriesTableModel model, RelationMember member, int row, int col, boolean isSelected) {
+ protected void renderForeground(AbstractListMergeModel<RelationMember, RelationMemberConflictResolverCommand>.EntriesTableModel model,
+ RelationMember member, int row, int col, boolean isSelected) {
Color fgc = ConflictColors.FGCOLOR.get();
if (col == 0 && model.isParticipatingInCurrentComparePair() && !model.getListMergeModel().isFrozen()) {
fgc = ConflictColors.FGCOLOR_PARTICIPATING_IN_COMPARISON.get();
@@ -145,7 +147,7 @@ public class RelationMemberTableCellRenderer extends JLabel implements TableCell
* @return the table model
*/
@SuppressWarnings("unchecked")
- protected ListMergeModel<Node>.EntriesTableModel getModel(JTable table) {
- return (ListMergeModel<Node>.EntriesTableModel) table.getModel();
+ protected AbstractListMergeModel<RelationMember, RelationMemberConflictResolverCommand>.EntriesTableModel getModel(JTable table) {
+ return (AbstractListMergeModel<RelationMember, RelationMemberConflictResolverCommand>.EntriesTableModel) table.getModel();
}
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java b/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
index 0ef62c3..6fd9f82 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
@@ -272,7 +272,7 @@ public class TagMerger extends JPanel implements IConflictResolver {
@Override
public void actionPerformed(ActionEvent arg0) {
int[] rows = mineTable.getSelectedRows();
- if (rows == null || rows.length == 0)
+ if (rows.length == 0)
return;
model.decide(rows, MergeDecisionType.KEEP_MINE);
selectNextConflict(rows);
@@ -304,7 +304,7 @@ public class TagMerger extends JPanel implements IConflictResolver {
@Override
public void actionPerformed(ActionEvent arg0) {
int[] rows = theirTable.getSelectedRows();
- if (rows == null || rows.length == 0)
+ if (rows.length == 0)
return;
model.decide(rows, MergeDecisionType.KEEP_THEIR);
selectNextConflict(rows);
@@ -402,7 +402,7 @@ public class TagMerger extends JPanel implements IConflictResolver {
@Override
public void actionPerformed(ActionEvent arg0) {
int[] rows = mergedTable.getSelectedRows();
- if (rows == null || rows.length == 0)
+ if (rows.length == 0)
return;
model.decide(rows, MergeDecisionType.UNDECIDED);
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
index c0eb683..77463d5 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
@@ -32,6 +32,7 @@ import org.openstreetmap.josm.command.ChangePropertyCommand;
import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
@@ -195,14 +196,19 @@ public class RelationMemberConflictResolver extends JPanel {
public void prepareForEditing() {
AutoCompletionList acList = new AutoCompletionList();
- Main.getLayerManager().getEditLayer().data.getAutoCompletionManager().populateWithMemberRoles(acList);
+ OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
+ if (editLayer != null) {
+ editLayer.data.getAutoCompletionManager().populateWithMemberRoles(acList);
+ }
tfRole.setAutoCompletionList(acList);
AutoCompletingTextField editor = (AutoCompletingTextField) tblResolver.getColumnModel().getColumn(2).getCellEditor();
if (editor != null) {
editor.setAutoCompletionList(acList);
}
AutoCompletionList acList2 = new AutoCompletionList();
- Main.getLayerManager().getEditLayer().data.getAutoCompletionManager().populateWithKeys(acList2);
+ if (editLayer != null) {
+ editLayer.data.getAutoCompletionManager().populateWithKeys(acList2);
+ }
tfKey.setAutoCompletionList(acList2);
}
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java
index 8320c00..41a0957 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java
@@ -17,38 +17,49 @@ import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
public class RelationMemberConflictResolverColumnModel extends DefaultTableColumnModel {
- private final DefaultTableCellRenderer defaultTableCellRenderer = new DefaultTableCellRenderer();
-
- private final transient OsmPrimitivRenderer primitiveRenderer = new OsmPrimitivRenderer() {
+ static final class MemberRenderer extends OsmPrimitivRenderer {
@Override
public Component getTableCellRendererComponent(JTable table,
Object value, boolean isSelected, boolean hasFocus, int row, int column) {
return setColors(super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column),
table, isSelected, row);
}
- };
+ }
+
+ private final DefaultTableCellRenderer defaultTableCellRenderer = new DefaultTableCellRenderer();
+
+ private final transient OsmPrimitivRenderer primitiveRenderer = new MemberRenderer();
private final transient TableCellRenderer tableRenderer = (table, value, isSelected, hasFocus, row, column)
-> setColors(defaultTableCellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column),
table, isSelected, row);
+ /**
+ * Constructs a new {@code RelationMemberConflictResolverColumnModel}.
+ */
+ public RelationMemberConflictResolverColumnModel() {
+ createColumns();
+ }
+
private static Component setColors(Component comp, JTable table, boolean isSelected, int row) {
- RelationMemberConflictResolverModel model = (RelationMemberConflictResolverModel) table.getModel();
-
- if (!isSelected && comp != null) {
- switch (model.getDecision(row).getDecision()) {
- case UNDECIDED:
- comp.setForeground(ConflictColors.FGCOLOR_UNDECIDED.get());
- comp.setBackground(ConflictColors.BGCOLOR_UNDECIDED.get());
- break;
- case KEEP:
- comp.setForeground(ConflictColors.FGCOLOR_MEMBER_KEEP.get());
- comp.setBackground(ConflictColors.BGCOLOR_MEMBER_KEEP.get());
- break;
- case REMOVE:
- comp.setForeground(ConflictColors.FGCOLOR_MEMBER_REMOVE.get());
- comp.setBackground(ConflictColors.BGCOLOR_MEMBER_REMOVE.get());
- break;
+ if (table.getModel() instanceof RelationMemberConflictResolverModel) {
+ RelationMemberConflictResolverModel model = (RelationMemberConflictResolverModel) table.getModel();
+
+ if (!isSelected && comp != null) {
+ switch (model.getDecision(row).getDecision()) {
+ case UNDECIDED:
+ comp.setForeground(ConflictColors.FGCOLOR_UNDECIDED.get());
+ comp.setBackground(ConflictColors.BGCOLOR_UNDECIDED.get());
+ break;
+ case KEEP:
+ comp.setForeground(ConflictColors.FGCOLOR_MEMBER_KEEP.get());
+ comp.setBackground(ConflictColors.BGCOLOR_MEMBER_KEEP.get());
+ break;
+ case REMOVE:
+ comp.setForeground(ConflictColors.FGCOLOR_MEMBER_REMOVE.get());
+ comp.setBackground(ConflictColors.BGCOLOR_MEMBER_REMOVE.get());
+ break;
+ }
}
}
return comp;
@@ -109,11 +120,4 @@ public class RelationMemberConflictResolverColumnModel extends DefaultTableColum
col.setMaxWidth(100);
addColumn(col);
}
-
- /**
- * Constructs a new {@code RelationMemberConflictResolverColumnModel}.
- */
- public RelationMemberConflictResolverColumnModel() {
- createColumns();
- }
}
diff --git a/src/org/openstreetmap/josm/gui/datatransfer/importers/OsmLinkPaster.java b/src/org/openstreetmap/josm/gui/datatransfer/importers/OsmLinkPaster.java
index d92e95c..c8f3bf7 100644
--- a/src/org/openstreetmap/josm/gui/datatransfer/importers/OsmLinkPaster.java
+++ b/src/org/openstreetmap/josm/gui/datatransfer/importers/OsmLinkPaster.java
@@ -5,22 +5,16 @@ import java.awt.Component;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.UnsupportedFlavorException;
import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.swing.TransferHandler.TransferSupport;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.OpenLocationAction;
import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.data.osm.PrimitiveId;
-import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
import org.openstreetmap.josm.data.preferences.BooleanProperty;
import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.io.DownloadPrimitivesWithReferrersTask;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
/**
@@ -33,6 +27,13 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
*/
public class OsmLinkPaster extends AbstractOsmDataPaster {
+ static final class NoWarnOpenLocationAction extends OpenLocationAction {
+ @Override
+ protected void warnNoSuitableTasks(String url) {
+ // ignore this.
+ }
+ }
+
private static final BooleanProperty PASTE_REFERRERS = new BooleanProperty("paste.url.download-referrers", true);
private static final String OSM_SERVER = "^https?\\://(\\w+\\.)?(osm|openstreetmap)\\.org/";
@@ -51,11 +52,7 @@ public class OsmLinkPaster extends AbstractOsmDataPaster {
}
String transferData = (String) support.getTransferable().getTransferData(df);
- List<PrimitiveId> ids = parseIds(transferData);
-
- if (!ids.isEmpty()) {
- Main.worker.submit(new DownloadPrimitivesWithReferrersTask(layer == null,
- ids, PASTE_REFERRERS.get(), PASTE_REFERRERS.get(), null, null));
+ if (new NoWarnOpenLocationAction().openUrl(transferData)) {
return true;
}
@@ -81,34 +78,4 @@ public class OsmLinkPaster extends AbstractOsmDataPaster {
return new LatLon(Double.parseDouble(matcher.group("lat")), Double.parseDouble(matcher.group("lon")));
}
}
-
- static List<PrimitiveId> parseIds(String transferData) {
- Matcher matcher = Pattern
- .compile(OSM_SERVER + "(?<type>node|way|relation)/(?<id>\\d+)(\\/.*)?$")
- .matcher(transferData);
-
- if (!matcher.matches()) {
- return Collections.emptyList();
- }
-
- OsmPrimitiveType type;
- switch (matcher.group("type")) {
- case "way":
- type = OsmPrimitiveType.WAY;
- break;
-
- case "node":
- type = OsmPrimitiveType.NODE;
- break;
-
- case "relation":
- type = OsmPrimitiveType.RELATION;
- break;
-
- default:
- throw new AssertionError();
- }
-
- return Collections.singletonList(new SimplePrimitiveId(Long.parseLong(matcher.group("id")), type));
- }
}
diff --git a/src/org/openstreetmap/josm/gui/datatransfer/importers/TextTagPaster.java b/src/org/openstreetmap/josm/gui/datatransfer/importers/TextTagPaster.java
index 404cc32..8a36402 100644
--- a/src/org/openstreetmap/josm/gui/datatransfer/importers/TextTagPaster.java
+++ b/src/org/openstreetmap/josm/gui/datatransfer/importers/TextTagPaster.java
@@ -39,14 +39,13 @@ public final class TextTagPaster extends AbstractTagPaster {
}
private boolean containsValidTags(TransferSupport support) throws UnsupportedFlavorException, IOException {
- Map<String, String> tags = getTagsImpl(support);
- return tags != null && !tags.isEmpty();
+ return !getTagsImpl(support).isEmpty();
}
@Override
protected Map<String, String> getTags(TransferSupport support) throws UnsupportedFlavorException, IOException {
Map<String, String> tags = getTagsImpl(support);
- if (tags == null || tags.isEmpty()) {
+ if (tags.isEmpty()) {
TextTagParser.showBadBufferMessage(help);
throw new IOException("Invalid tags to paste.");
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
index f378d43..fc44813 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
@@ -140,30 +140,14 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
popupMenuHandler.addAction(Main.main.menu.autoScaleActions.get("conflict"));
- final ResolveToMyVersionAction resolveToMyVersionAction = new ResolveToMyVersionAction();
- final ResolveToTheirVersionAction resolveToTheirVersionAction = new ResolveToTheirVersionAction();
+ ResolveToMyVersionAction resolveToMyVersionAction = new ResolveToMyVersionAction();
+ ResolveToTheirVersionAction resolveToTheirVersionAction = new ResolveToTheirVersionAction();
addListSelectionListener(resolveToMyVersionAction);
addListSelectionListener(resolveToTheirVersionAction);
- final JMenuItem btnResolveMy = popupMenuHandler.addAction(resolveToMyVersionAction);
- final JMenuItem btnResolveTheir = popupMenuHandler.addAction(resolveToTheirVersionAction);
-
- popupMenuHandler.addListener(new PopupMenuListener() {
- @Override
- public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
- btnResolveMy.setVisible(ExpertToggleAction.isExpert());
- btnResolveTheir.setVisible(ExpertToggleAction.isExpert());
- }
-
- @Override
- public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
- // Do nothing
- }
+ JMenuItem btnResolveMy = popupMenuHandler.addAction(resolveToMyVersionAction);
+ JMenuItem btnResolveTheir = popupMenuHandler.addAction(resolveToTheirVersionAction);
- @Override
- public void popupMenuCanceled(PopupMenuEvent e) {
- // Do nothing
- }
- });
+ popupMenuHandler.addListener(new ResolveButtonsPopupMenuListener(btnResolveTheir, btnResolveMy));
}
@Override
@@ -328,6 +312,7 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
@Override
public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+ lstConflicts.setValueIsAdjusting(true);
lstConflicts.clearSelection();
for (OsmPrimitive osm : newSelection) {
if (conflicts != null && conflicts.hasConflictForMy(osm)) {
@@ -337,6 +322,7 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
}
}
}
+ lstConflicts.setValueIsAdjusting(false);
}
@Override
@@ -344,6 +330,32 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
return ht("/Dialog/ConflictList");
}
+ static final class ResolveButtonsPopupMenuListener implements PopupMenuListener {
+ private final JMenuItem btnResolveTheir;
+ private final JMenuItem btnResolveMy;
+
+ ResolveButtonsPopupMenuListener(JMenuItem btnResolveTheir, JMenuItem btnResolveMy) {
+ this.btnResolveTheir = btnResolveTheir;
+ this.btnResolveMy = btnResolveMy;
+ }
+
+ @Override
+ public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+ btnResolveMy.setVisible(ExpertToggleAction.isExpert());
+ btnResolveTheir.setVisible(ExpertToggleAction.isExpert());
+ }
+
+ @Override
+ public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+ // Do nothing
+ }
+
+ @Override
+ public void popupMenuCanceled(PopupMenuEvent e) {
+ // Do nothing
+ }
+ }
+
class MouseEventHandler extends PopupMenuLauncher {
/**
* Constructs a new {@code MouseEventHandler}.
diff --git a/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java b/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java
index c97792c..eebbbe1 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java
@@ -11,6 +11,7 @@ import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
@@ -184,6 +185,18 @@ public class DeleteFromRelationConfirmationDialog extends JDialog implements Tab
*
*/
public static class RelationMemberTableModel extends DefaultTableModel {
+ private static class RelationToChildReferenceComparator implements Comparator<RelationToChildReference>, Serializable {
+ @Override
+ public int compare(RelationToChildReference o1, RelationToChildReference o2) {
+ NameFormatter nf = DefaultNameFormatter.getInstance();
+ int cmp = o1.getChild().getDisplayName(nf).compareTo(o2.getChild().getDisplayName(nf));
+ if (cmp != 0) return cmp;
+ cmp = o1.getParent().getDisplayName(nf).compareTo(o2.getParent().getDisplayName(nf));
+ if (cmp != 0) return cmp;
+ return Integer.compare(o1.getPosition(), o2.getPosition());
+ }
+ }
+
private final transient List<RelationToChildReference> data;
/**
@@ -199,27 +212,12 @@ public class DeleteFromRelationConfirmationDialog extends JDialog implements Tab
return data.size();
}
- protected void sort() {
- data.sort(new Comparator<RelationToChildReference>() {
- private NameFormatter nf = DefaultNameFormatter.getInstance();
- @Override
- public int compare(RelationToChildReference o1, RelationToChildReference o2) {
- int cmp = o1.getChild().getDisplayName(nf).compareTo(o2.getChild().getDisplayName(nf));
- if (cmp != 0) return cmp;
- cmp = o1.getParent().getDisplayName(nf).compareTo(o2.getParent().getDisplayName(nf));
- if (cmp != 0) return cmp;
- return Integer.compare(o1.getPosition(), o2.getPosition());
- }
- }
- );
- }
-
public void populate(Collection<RelationToChildReference> references) {
data.clear();
if (references != null) {
data.addAll(references);
}
- sort();
+ data.sort(new RelationToChildReferenceComparator());
fireTableDataChanged();
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java b/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
index 1e30b81..88d0a46 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
@@ -82,16 +82,7 @@ public class DialogsPanel extends JPanel implements Destroyable {
allDialogs.add(dlg);
dlg.setDialogsPanel(this);
dlg.setVisible(false);
- final JPanel p = new JPanel() {
- /**
- * Honoured by the MultiSplitPaneLayout when the
- * entire Window is resized.
- */
- @Override
- public Dimension getMinimumSize() {
- return new Dimension(0, 40);
- }
- };
+ final JPanel p = new MinSizePanel();
p.setLayout(new BoxLayout(p, BoxLayout.Y_AXIS));
p.setVisible(false);
@@ -114,6 +105,14 @@ public class DialogsPanel extends JPanel implements Destroyable {
}
}
+ static final class MinSizePanel extends JPanel {
+ @Override
+ public Dimension getMinimumSize() {
+ // Honoured by the MultiSplitPaneLayout when the entire Window is resized
+ return new Dimension(0, 40);
+ }
+ }
+
/**
* What action was performed to trigger the reconstruction
*/
diff --git a/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java b/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
index 721e1db..0edc588 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
@@ -24,6 +24,8 @@ import javax.swing.SwingUtilities;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.JTableHeader;
import javax.swing.table.TableCellRenderer;
+import javax.swing.table.TableColumnModel;
+import javax.swing.table.TableModel;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.search.SearchAction;
@@ -106,20 +108,7 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
};
protected void build() {
- userTable = new JTable(filterModel) {
- @Override
- protected JTableHeader createDefaultTableHeader() {
- return new JTableHeader(columnModel) {
- @Override
- public String getToolTipText(MouseEvent e) {
- java.awt.Point p = e.getPoint();
- int index = columnModel.getColumnIndexAtX(p.x);
- int realIndex = columnModel.getColumn(index).getModelIndex();
- return COLUMN_TOOLTIPS[realIndex];
- }
- };
- }
- };
+ userTable = new UserTable(filterModel);
userTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -253,6 +242,30 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
super.destroy();
}
+ static final class UserTable extends JTable {
+ static final class UserTableHeader extends JTableHeader {
+ UserTableHeader(TableColumnModel cm) {
+ super(cm);
+ }
+
+ @Override
+ public String getToolTipText(MouseEvent e) {
+ int index = columnModel.getColumnIndexAtX(e.getPoint().x);
+ int realIndex = columnModel.getColumn(index).getModelIndex();
+ return COLUMN_TOOLTIPS[realIndex];
+ }
+ }
+
+ UserTable(TableModel dm) {
+ super(dm);
+ }
+
+ @Override
+ protected JTableHeader createDefaultTableHeader() {
+ return new UserTableHeader(columnModel);
+ }
+ }
+
static class StringRenderer extends DefaultTableCellRenderer {
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
index 9dbc439..e82916a 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
@@ -840,10 +840,12 @@ public class LayerListDialog extends ToggleDialog {
Main.map.mapView.moveLayer(l1, row-1);
}
fireTableDataChanged();
+ selectionModel.setValueIsAdjusting(true);
selectionModel.clearSelection();
for (int row : sel) {
selectionModel.addSelectionInterval(row-1, row-1);
}
+ selectionModel.setValueIsAdjusting(false);
ensureSelectedIsVisible();
}
@@ -873,10 +875,12 @@ public class LayerListDialog extends ToggleDialog {
Main.map.mapView.moveLayer(l2, row);
}
fireTableDataChanged();
+ selectionModel.setValueIsAdjusting(true);
selectionModel.clearSelection();
for (int row : sel) {
selectionModel.addSelectionInterval(row+1, row+1);
}
+ selectionModel.setValueIsAdjusting(false);
ensureSelectedIsVisible();
}
@@ -1025,7 +1029,8 @@ public class LayerListDialog extends ToggleDialog {
case 3:
l.rename((String) value);
break;
- default: throw new RuntimeException();
+ default:
+ throw new IllegalArgumentException("Wrong column: " + col);
}
fireTableCellUpdated(row, col);
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java b/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
index 350df80..251c42d 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
@@ -350,10 +350,12 @@ public class MapPaintDialog extends ToggleDialog {
public void actionPerformed(ActionEvent e) {
int[] pos = tblStyles.getSelectedRows();
MapPaintStyles.toggleStyleActive(pos);
+ selectionModel.setValueIsAdjusting(true);
selectionModel.clearSelection();
for (int p: pos) {
selectionModel.addSelectionInterval(p, p);
}
+ selectionModel.setValueIsAdjusting(false);
}
}
@@ -386,10 +388,12 @@ public class MapPaintDialog extends ToggleDialog {
int[] sel = tblStyles.getSelectedRows();
MapPaintStyles.moveStyles(sel, increment);
+ selectionModel.setValueIsAdjusting(true);
selectionModel.clearSelection();
for (int row: sel) {
selectionModel.addSelectionInterval(row + increment, row + increment);
}
+ selectionModel.setValueIsAdjusting(false);
model.ensureSelectedIsVisible();
}
@@ -433,10 +437,12 @@ public class MapPaintDialog extends ToggleDialog {
final int[] rows = tblStyles.getSelectedRows();
MapPaintStyles.reloadStyles(rows);
Main.worker.submit(() -> SwingUtilities.invokeLater(() -> {
+ selectionModel.setValueIsAdjusting(true);
selectionModel.clearSelection();
for (int r: rows) {
selectionModel.addSelectionInterval(r, r);
}
+ selectionModel.setValueIsAdjusting(false);
}));
}
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java b/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java
index 16edff0..ce20fbc 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java
@@ -7,9 +7,9 @@ import java.awt.Component;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
+import java.util.Optional;
import javax.swing.DefaultListCellRenderer;
-import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JMenuItem;
import javax.swing.ListCellRenderer;
@@ -93,12 +93,14 @@ public final class MenuItemSearchDialog extends ExtendedDialog {
@Override
public Component getListCellRendererComponent(JList<? extends JMenuItem> list, JMenuItem value, int index,
boolean isSelected, boolean cellHasFocus) {
- final JLabel label = (JLabel) def.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
- label.setText(value.getText());
- label.setIcon(value.getIcon());
- label.setEnabled(value.isEnabled());
final JMenuItem item = new JMenuItem(value.getText());
item.setAction(value.getAction());
+ Optional.ofNullable(value.getAction())
+ .filter(JosmAction.class::isInstance)
+ .map(JosmAction.class::cast)
+ .map(JosmAction::getShortcut)
+ .map(Shortcut::getKeyStroke)
+ .ifPresent(item::setAccelerator);
if (isSelected) {
item.setBackground(list.getSelectionBackground());
item.setForeground(list.getSelectionForeground());
diff --git a/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
index 1756e93..f853736 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
@@ -97,10 +97,8 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener {
//center view on selected note on double click
@Override
public void mouseClicked(MouseEvent e) {
- if (SwingUtilities.isLeftMouseButton(e) && e.getClickCount() == 2) {
- if (noteData != null && noteData.getSelectedNote() != null) {
- Main.map.mapView.zoomTo(noteData.getSelectedNote().getLatLon());
- }
+ if (SwingUtilities.isLeftMouseButton(e) && e.getClickCount() == 2 && noteData != null && noteData.getSelectedNote() != null) {
+ Main.map.mapView.zoomTo(noteData.getSelectedNote().getLatLon());
}
}
});
diff --git a/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
index 9aad569..be0d9ee 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
@@ -138,15 +138,7 @@ public class RelationListDialog extends ToggleDialog
model = new RelationListModel(selectionModel);
displaylist = new JList<>(model);
displaylist.setSelectionModel(selectionModel);
- displaylist.setCellRenderer(new OsmPrimitivRenderer() {
- /**
- * Don't show the default tooltip in the relation list.
- */
- @Override
- protected String getComponentToolTipText(OsmPrimitive value) {
- return null;
- }
- });
+ displaylist.setCellRenderer(new NoTooltipOsmRenderer());
displaylist.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
displaylist.addMouseListener(new MouseEventHandler());
@@ -156,7 +148,9 @@ public class RelationListDialog extends ToggleDialog
filter = setupFilter();
- displaylist.addListSelectionListener(e -> updateActionsRelationLists());
+ displaylist.addListSelectionListener(e -> {
+ if (!e.getValueIsAdjusting()) updateActionsRelationLists();
+ });
// Setup popup menu handler
setupPopupMenuHandler();
@@ -210,10 +204,8 @@ public class RelationListDialog extends ToggleDialog
Component focused = FocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
//update highlights
- if (highlightEnabled && focused == displaylist && Main.isDisplayingMapView()) {
- if (highlightHelper.highlightOnly(sel)) {
- Main.map.mapView.repaint();
- }
+ if (highlightEnabled && focused == displaylist && Main.isDisplayingMapView() && highlightHelper.highlightOnly(sel)) {
+ Main.map.mapView.repaint();
}
}
@@ -308,6 +300,14 @@ public class RelationListDialog extends ToggleDialog
return f;
}
+ static final class NoTooltipOsmRenderer extends OsmPrimitivRenderer {
+ @Override
+ protected String getComponentToolTipText(OsmPrimitive value) {
+ // Don't show the default tooltip in the relation list
+ return null;
+ }
+ }
+
class MouseEventHandler extends PopupMenuLauncher {
MouseEventHandler() {
@@ -562,18 +562,20 @@ public class RelationListDialog extends ToggleDialog
* @param sel the list of selected relations
*/
public void setSelectedRelations(Collection<Relation> sel) {
+ selectionModel.setValueIsAdjusting(true);
selectionModel.clearSelection();
- if (sel == null || sel.isEmpty())
- return;
- if (!getVisibleRelations().containsAll(sel)) {
- resetFilter();
- }
- for (Relation r: sel) {
- Integer i = getVisibleRelationIndex(r);
- if (i != null) {
- selectionModel.addSelectionInterval(i, i);
+ if (sel != null && !sel.isEmpty()) {
+ if (!getVisibleRelations().containsAll(sel)) {
+ resetFilter();
+ }
+ for (Relation r: sel) {
+ Integer i = getVisibleRelationIndex(r);
+ if (i != null) {
+ selectionModel.addSelectionInterval(i, i);
+ }
}
}
+ selectionModel.setValueIsAdjusting(false);
}
private Integer getVisibleRelationIndex(Relation rel) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
index 0fd02be..4a8615c 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
@@ -210,10 +210,8 @@ public class SelectionListDialog extends ToggleDialog {
// else open relation editor if applicable
actEditRelationSelection.actionPerformed(null);
}
- } else if (highlightEnabled && Main.isDisplayingMapView()) {
- if (helper.highlightOnly(model.getElementAt(idx))) {
- Main.map.mapView.repaint();
- }
+ } else if (highlightEnabled && Main.isDisplayingMapView() && helper.highlightOnly(model.getElementAt(idx))) {
+ Main.map.mapView.repaint();
}
}
@@ -577,14 +575,17 @@ public class SelectionListDialog extends ToggleDialog {
* @param sel the collection of primitives to select
*/
public synchronized void setSelected(Collection<OsmPrimitive> sel) {
+ selectionModel.setValueIsAdjusting(true);
selectionModel.clearSelection();
- if (sel == null) return;
- for (OsmPrimitive p: sel) {
- int i = selection.indexOf(p);
- if (i >= 0) {
- selectionModel.addSelectionInterval(i, i);
+ if (sel != null) {
+ for (OsmPrimitive p: sel) {
+ int i = selection.indexOf(p);
+ if (i >= 0) {
+ selectionModel.addSelectionInterval(i, i);
+ }
}
}
+ selectionModel.setValueIsAdjusting(false);
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
index 0631c68..f6704b4 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
@@ -942,17 +942,16 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
@Override
public void eventDispatched(AWTEvent event) {
- if (isShowing() && !isCollapsed && isDocked && buttonHiding == ButtonHidingType.DYNAMIC) {
- if (buttonsPanel != null) {
- Rectangle b = this.getBounds();
- b.setLocation(getLocationOnScreen());
- if (b.contains(((MouseEvent) event).getLocationOnScreen())) {
- if (!buttonsPanel.isVisible()) {
- buttonsPanel.setVisible(true);
- }
- } else if (buttonsPanel.isVisible()) {
- buttonsPanel.setVisible(false);
+ if (event instanceof MouseEvent && isShowing() && !isCollapsed && isDocked && buttonHiding == ButtonHidingType.DYNAMIC
+ && buttonsPanel != null) {
+ Rectangle b = this.getBounds();
+ b.setLocation(getLocationOnScreen());
+ if (b.contains(((MouseEvent) event).getLocationOnScreen())) {
+ if (!buttonsPanel.isVisible()) {
+ buttonsPanel.setVisible(true);
}
+ } else if (buttonsPanel.isVisible()) {
+ buttonsPanel.setVisible(false);
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
index 1a4e234..d4fef19 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
@@ -159,7 +159,7 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
public void select() {
int[] indexes = userTable.getSelectedRows();
- if (indexes == null || indexes.length == 0)
+ if (indexes.length == 0)
return;
model.selectPrimitivesOwnedBy(userTable.getSelectedRows());
}
@@ -195,7 +195,7 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
@Override
public void actionPerformed(ActionEvent e) {
int[] rows = userTable.getSelectedRows();
- if (rows == null || rows.length == 0)
+ if (rows.length == 0)
return;
List<User> users = model.getSelectedUsers(rows);
if (users.isEmpty())
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
index 7ae55df..367e2f9 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
@@ -54,6 +54,7 @@ import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
import org.openstreetmap.josm.io.OsmTransferException;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.InputMapUtils;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.Shortcut;
import org.xml.sax.SAXException;
@@ -336,7 +337,9 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
Object nodeInfo = childNode.getUserObject();
if (nodeInfo instanceof TestError) {
TestError error = (TestError) nodeInfo;
- sel.addAll(error.getSelectablePrimitives());
+ error.getPrimitives().stream()
+ .filter(OsmPrimitive::isSelectable)
+ .forEach(sel::add);
}
}
}
@@ -387,7 +390,9 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
hasFixes = hasFixes || error.isFixable();
if (addSelected) {
- sel.addAll(error.getSelectablePrimitives());
+ error.getPrimitives().stream()
+ .filter(OsmPrimitive::isSelectable)
+ .forEach(sel::add);
}
}
}
@@ -629,7 +634,7 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
});
} catch (InterruptedException | InvocationTargetException e) {
// FIXME: signature of realRun should have a generic checked exception we could throw here
- throw new RuntimeException(e);
+ throw new JosmRuntimeException(e);
} finally {
monitor.finishTask();
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
index 2cde882..740f00f 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
@@ -103,15 +103,17 @@ public class ChangesetCacheManagerModel extends AbstractTableModel implements Ch
* @param selected the collection of changesets to select. Ignored if empty.
*/
public void setSelectedChangesets(Collection<Changeset> selected) {
- GuiHelper.runInEDTAndWait(selectionModel::clearSelection);
- if (selected == null || selected.isEmpty())
- return;
- for (Changeset cs: selected) {
- final int idx = data.indexOf(cs);
- if (idx >= 0) {
- GuiHelper.runInEDTAndWait(() -> selectionModel.addSelectionInterval(idx, idx));
+ selectionModel.setValueIsAdjusting(true);
+ selectionModel.clearSelection();
+ if (selected != null) {
+ for (Changeset cs: selected) {
+ final int idx = data.indexOf(cs);
+ if (idx >= 0) {
+ selectionModel.addSelectionInterval(idx, idx);
+ }
}
}
+ GuiHelper.runInEDTAndWait(() -> selectionModel.setValueIsAdjusting(false));
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java
index 6f89f5c..9a03781 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java
@@ -49,15 +49,17 @@ public class ChangesetListModel extends DefaultListModel<Changeset> implements C
}
public void setSelectedChangesets(Collection<Changeset> changesets) {
+ selectionModel.setValueIsAdjusting(true);
selectionModel.clearSelection();
- if (changesets == null) return;
- for (Changeset cs: changesets) {
- int idx = data.indexOf(cs);
- if (idx < 0) {
- continue;
+ if (changesets != null) {
+ for (Changeset cs: changesets) {
+ int idx = data.indexOf(cs);
+ if (idx >= 0) {
+ selectionModel.addSelectionInterval(idx, idx);
+ }
}
- selectionModel.addSelectionInterval(idx, idx);
}
+ selectionModel.setValueIsAdjusting(false);
}
protected void setChangesets(Collection<Changeset> changesets) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
index 88a942f..f77684f 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
@@ -4,45 +4,21 @@ package org.openstreetmap.josm.gui.dialogs.changeset.query;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.BorderLayout;
-import java.awt.Color;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
-import java.awt.Insets;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
-import java.time.format.FormatStyle;
-import java.util.Date;
import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
-import javax.swing.JRadioButton;
import javax.swing.JScrollPane;
-import javax.swing.text.JTextComponent;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.HelpAwareOptionPane;
-import org.openstreetmap.josm.gui.JosmUserIdentityManager;
-import org.openstreetmap.josm.gui.help.HelpUtil;
-import org.openstreetmap.josm.gui.preferences.server.UserNameValidator;
import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
-import org.openstreetmap.josm.gui.widgets.BoundingBoxSelectionPanel;
import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
-import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
import org.openstreetmap.josm.io.ChangesetQuery;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
/**
* This panel allows to specify a changeset query
@@ -165,6 +141,9 @@ public class AdvancedChangesetQueryPanel extends JPanel {
add(spQueryPanel, BorderLayout.CENTER);
}
+ /**
+ * Initializes HMI for user input.
+ */
public void startUserInput() {
restoreFromSettings();
pnlBoundingBoxRestriction.setVisible(cbBoundingBoxRestriction.isSelected());
@@ -176,6 +155,9 @@ public class AdvancedChangesetQueryPanel extends JPanel {
pnlTimeRestriction.startUserInput();
}
+ /**
+ * Display error message if a field is invalid.
+ */
public void displayMessageIfInvalid() {
if (cbUserRestriction.isSelected()) {
if (!pnlUserRestriction.isValidChangesetQuery()) {
@@ -222,6 +204,9 @@ public class AdvancedChangesetQueryPanel extends JPanel {
return query;
}
+ /**
+ * Remember settings in preferences.
+ */
public void rememberSettings() {
Main.pref.put("changeset-query.advanced.user-restrictions", cbUserRestriction.isSelected());
Main.pref.put("changeset-query.advanced.open-restrictions", cbOpenAndCloseRestrictions.isSelected());
@@ -233,6 +218,9 @@ public class AdvancedChangesetQueryPanel extends JPanel {
pnlTimeRestriction.rememberSettings();
}
+ /**
+ * Restore settings from preferences.
+ */
public void restoreFromSettings() {
cbUserRestriction.setSelected(Main.pref.getBoolean("changeset-query.advanced.user-restrictions", false));
cbOpenAndCloseRestrictions.setSelected(Main.pref.getBoolean("changeset-query.advanced.open-restrictions", false));
@@ -280,873 +268,4 @@ public class AdvancedChangesetQueryPanel extends JPanel {
repaint();
}
}
-
- /**
- * This is the panel for selecting whether the changeset query should be restricted to
- * open or closed changesets
- */
- private static class OpenAndCloseStateRestrictionPanel extends JPanel {
-
- private final JRadioButton rbOpenOnly = new JRadioButton();
- private final JRadioButton rbClosedOnly = new JRadioButton();
- private final JRadioButton rbBoth = new JRadioButton();
-
- OpenAndCloseStateRestrictionPanel() {
- build();
- }
-
- protected void build() {
- setLayout(new GridBagLayout());
- setBorder(BorderFactory.createCompoundBorder(
- BorderFactory.createEmptyBorder(3, 3, 3, 3),
- BorderFactory.createCompoundBorder(
- BorderFactory.createLineBorder(Color.GRAY),
- BorderFactory.createEmptyBorder(5, 5, 5, 5)
- )
- ));
- GridBagConstraints gc = new GridBagConstraints();
- gc.anchor = GridBagConstraints.NORTHWEST;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 0.0;
- add(rbOpenOnly, gc);
-
- gc.gridx = 1;
- gc.weightx = 1.0;
- add(new JMultilineLabel(tr("Query open changesets only")), gc);
-
- gc.gridy = 1;
- gc.gridx = 0;
- gc.weightx = 0.0;
- add(rbClosedOnly, gc);
-
- gc.gridx = 1;
- gc.weightx = 1.0;
- add(new JMultilineLabel(tr("Query closed changesets only")), gc);
-
- gc.gridy = 2;
- gc.gridx = 0;
- gc.weightx = 0.0;
- add(rbBoth, gc);
-
- gc.gridx = 1;
- gc.weightx = 1.0;
- add(new JMultilineLabel(tr("Query both open and closed changesets")), gc);
-
- ButtonGroup bgRestrictions = new ButtonGroup();
- bgRestrictions.add(rbBoth);
- bgRestrictions.add(rbClosedOnly);
- bgRestrictions.add(rbOpenOnly);
- }
-
- public void startUserInput() {
- restoreFromSettings();
- }
-
- public void fillInQuery(ChangesetQuery query) {
- if (rbBoth.isSelected()) {
- query.beingClosed(true);
- query.beingOpen(true);
- } else if (rbOpenOnly.isSelected()) {
- query.beingOpen(true);
- } else if (rbClosedOnly.isSelected()) {
- query.beingClosed(true);
- }
- }
-
- public void rememberSettings() {
- String prefRoot = "changeset-query.advanced.open-restrictions";
- if (rbBoth.isSelected()) {
- Main.pref.put(prefRoot + ".query-type", "both");
- } else if (rbOpenOnly.isSelected()) {
- Main.pref.put(prefRoot + ".query-type", "open");
- } else if (rbClosedOnly.isSelected()) {
- Main.pref.put(prefRoot + ".query-type", "closed");
- }
- }
-
- public void restoreFromSettings() {
- String prefRoot = "changeset-query.advanced.open-restrictions";
- String v = Main.pref.get(prefRoot + ".query-type", "open");
- rbBoth.setSelected("both".equals(v));
- rbOpenOnly.setSelected("open".equals(v));
- rbClosedOnly.setSelected("closed".equals(v));
- }
- }
-
- /**
- * This is the panel for selecting whether the query should be restricted to a specific user
- */
- private static class UserRestrictionPanel extends JPanel {
- private final ButtonGroup bgUserRestrictions = new ButtonGroup();
- private final JRadioButton rbRestrictToMyself = new JRadioButton();
- private final JRadioButton rbRestrictToUid = new JRadioButton();
- private final JRadioButton rbRestrictToUserName = new JRadioButton();
- private final JosmTextField tfUid = new JosmTextField(10);
- private transient UidInputFieldValidator valUid;
- private final JosmTextField tfUserName = new JosmTextField(10);
- private transient UserNameValidator valUserName;
- private final JMultilineLabel lblRestrictedToMyself = new JMultilineLabel(tr("Only changesets owned by myself"));
-
- UserRestrictionPanel() {
- build();
- }
-
- protected JPanel buildUidInputPanel() {
- JPanel pnl = new JPanel(new GridBagLayout());
- GridBagConstraints gc = new GridBagConstraints();
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 0.0;
- gc.insets = new Insets(0, 0, 0, 3);
- pnl.add(new JLabel(tr("User ID:")), gc);
-
- gc.gridx = 1;
- pnl.add(tfUid, gc);
- SelectAllOnFocusGainedDecorator.decorate(tfUid);
- valUid = UidInputFieldValidator.decorate(tfUid);
-
- // grab remaining space
- gc.gridx = 2;
- gc.weightx = 1.0;
- pnl.add(new JPanel(), gc);
- return pnl;
- }
-
- protected JPanel buildUserNameInputPanel() {
- JPanel pnl = new JPanel(new GridBagLayout());
- GridBagConstraints gc = new GridBagConstraints();
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 0.0;
- gc.insets = new Insets(0, 0, 0, 3);
- pnl.add(new JLabel(tr("User name:")), gc);
-
- gc.gridx = 1;
- pnl.add(tfUserName, gc);
- SelectAllOnFocusGainedDecorator.decorate(tfUserName);
- valUserName = new UserNameValidator(tfUserName);
-
- // grab remaining space
- gc.gridx = 2;
- gc.weightx = 1.0;
- pnl.add(new JPanel(), gc);
- return pnl;
- }
-
- protected void build() {
- setLayout(new GridBagLayout());
- setBorder(BorderFactory.createCompoundBorder(
- BorderFactory.createEmptyBorder(3, 3, 3, 3),
- BorderFactory.createCompoundBorder(
- BorderFactory.createLineBorder(Color.GRAY),
- BorderFactory.createEmptyBorder(5, 5, 5, 5)
- )
- ));
-
- ItemListener userRestrictionChangeHandler = new UserRestrictionChangedHandler();
- GridBagConstraints gc = new GridBagConstraints();
- gc.anchor = GridBagConstraints.NORTHWEST;
- gc.gridx = 0;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 0.0;
- add(rbRestrictToMyself, gc);
- rbRestrictToMyself.addItemListener(userRestrictionChangeHandler);
-
- gc.gridx = 1;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 1.0;
- add(lblRestrictedToMyself, gc);
-
- gc.gridx = 0;
- gc.gridy = 1;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 0.0;
- add(rbRestrictToUid, gc);
- rbRestrictToUid.addItemListener(userRestrictionChangeHandler);
-
- gc.gridx = 1;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 1.0;
- add(new JMultilineLabel(tr("Only changesets owned by the user with the following user ID")), gc);
-
- gc.gridx = 1;
- gc.gridy = 2;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 1.0;
- add(buildUidInputPanel(), gc);
-
- gc.gridx = 0;
- gc.gridy = 3;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 0.0;
- add(rbRestrictToUserName, gc);
- rbRestrictToUserName.addItemListener(userRestrictionChangeHandler);
-
- gc.gridx = 1;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 1.0;
- add(new JMultilineLabel(tr("Only changesets owned by the user with the following user name")), gc);
-
- gc.gridx = 1;
- gc.gridy = 4;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 1.0;
- add(buildUserNameInputPanel(), gc);
-
- bgUserRestrictions.add(rbRestrictToMyself);
- bgUserRestrictions.add(rbRestrictToUid);
- bgUserRestrictions.add(rbRestrictToUserName);
- }
-
- public void startUserInput() {
- if (JosmUserIdentityManager.getInstance().isAnonymous()) {
- lblRestrictedToMyself.setText(tr("Only changesets owned by myself (disabled. JOSM is currently run by an anonymous user)"));
- rbRestrictToMyself.setEnabled(false);
- if (rbRestrictToMyself.isSelected()) {
- rbRestrictToUid.setSelected(true);
- }
- } else {
- lblRestrictedToMyself.setText(tr("Only changesets owned by myself"));
- rbRestrictToMyself.setEnabled(true);
- rbRestrictToMyself.setSelected(true);
- }
- restoreFromSettings();
- }
-
- /**
- * Sets the query restrictions on <code>query</code> for changeset owner based
- * restrictions.
- *
- * @param query the query. Must not be null.
- * @throws IllegalArgumentException if query is null
- * @throws IllegalStateException if one of the available values for query parameters in
- * this panel isn't valid
- */
- public void fillInQuery(ChangesetQuery query) {
- CheckParameterUtil.ensureParameterNotNull(query, "query");
- if (rbRestrictToMyself.isSelected()) {
- JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
- if (im.isPartiallyIdentified()) {
- query.forUser(im.getUserName());
- } else if (im.isFullyIdentified()) {
- query.forUser(im.getUserId());
- } else
- throw new IllegalStateException(
- tr("Cannot restrict changeset query to the current user because the current user is anonymous"));
- } else if (rbRestrictToUid.isSelected()) {
- int uid = valUid.getUid();
- if (uid > 0) {
- query.forUser(uid);
- } else
- throw new IllegalStateException(tr("Current value ''{0}'' for user ID is not valid", tfUid.getText()));
- } else if (rbRestrictToUserName.isSelected()) {
- if (!valUserName.isValid())
- throw new IllegalStateException(
- tr("Cannot restrict the changeset query to the user name ''{0}''", tfUserName.getText()));
- query.forUser(tfUserName.getText());
- }
- }
-
- public boolean isValidChangesetQuery() {
- if (rbRestrictToUid.isSelected())
- return valUid.isValid();
- else if (rbRestrictToUserName.isSelected())
- return valUserName.isValid();
- return true;
- }
-
- protected void alertInvalidUid() {
- HelpAwareOptionPane.showOptionDialog(
- this,
- tr("Please enter a valid user ID"),
- tr("Invalid user ID"),
- JOptionPane.ERROR_MESSAGE,
- HelpUtil.ht("/Dialog/ChangesetQueryDialog#InvalidUserId")
- );
- }
-
- protected void alertInvalidUserName() {
- HelpAwareOptionPane.showOptionDialog(
- this,
- tr("Please enter a non-empty user name"),
- tr("Invalid user name"),
- JOptionPane.ERROR_MESSAGE,
- HelpUtil.ht("/Dialog/ChangesetQueryDialog#InvalidUserName")
- );
- }
-
- public void displayMessageIfInvalid() {
- if (rbRestrictToUid.isSelected()) {
- if (!valUid.isValid()) {
- alertInvalidUid();
- }
- } else if (rbRestrictToUserName.isSelected()) {
- if (!valUserName.isValid()) {
- alertInvalidUserName();
- }
- }
- }
-
- public void rememberSettings() {
- String prefRoot = "changeset-query.advanced.user-restrictions";
- if (rbRestrictToMyself.isSelected()) {
- Main.pref.put(prefRoot + ".query-type", "mine");
- } else if (rbRestrictToUid.isSelected()) {
- Main.pref.put(prefRoot + ".query-type", "uid");
- } else if (rbRestrictToUserName.isSelected()) {
- Main.pref.put(prefRoot + ".query-type", "username");
- }
- Main.pref.put(prefRoot + ".uid", tfUid.getText());
- Main.pref.put(prefRoot + ".username", tfUserName.getText());
- }
-
- public void restoreFromSettings() {
- String prefRoot = "changeset-query.advanced.user-restrictions";
- String v = Main.pref.get(prefRoot + ".query-type", "mine");
- if ("mine".equals(v)) {
- JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
- if (im.isAnonymous()) {
- rbRestrictToUid.setSelected(true);
- } else {
- rbRestrictToMyself.setSelected(true);
- }
- } else if ("uid".equals(v)) {
- rbRestrictToUid.setSelected(true);
- } else if ("username".equals(v)) {
- rbRestrictToUserName.setSelected(true);
- }
- tfUid.setText(Main.pref.get(prefRoot + ".uid", ""));
- if (!valUid.isValid()) {
- tfUid.setText("");
- }
- tfUserName.setText(Main.pref.get(prefRoot + ".username", ""));
- }
-
- class UserRestrictionChangedHandler implements ItemListener {
- @Override
- public void itemStateChanged(ItemEvent e) {
- tfUid.setEnabled(rbRestrictToUid.isSelected());
- tfUserName.setEnabled(rbRestrictToUserName.isSelected());
- if (rbRestrictToUid.isSelected()) {
- tfUid.requestFocusInWindow();
- } else if (rbRestrictToUserName.isSelected()) {
- tfUserName.requestFocusInWindow();
- }
- }
- }
- }
-
- /**
- * This is the panel to apply a time restriction to the changeset query
- */
- private static class TimeRestrictionPanel extends JPanel {
-
- private final JRadioButton rbClosedAfter = new JRadioButton();
- private final JRadioButton rbClosedAfterAndCreatedBefore = new JRadioButton();
- private final JosmTextField tfClosedAfterDate1 = new JosmTextField();
- private transient DateValidator valClosedAfterDate1;
- private final JosmTextField tfClosedAfterTime1 = new JosmTextField();
- private transient TimeValidator valClosedAfterTime1;
- private final JosmTextField tfClosedAfterDate2 = new JosmTextField();
- private transient DateValidator valClosedAfterDate2;
- private final JosmTextField tfClosedAfterTime2 = new JosmTextField();
- private transient TimeValidator valClosedAfterTime2;
- private final JosmTextField tfCreatedBeforeDate = new JosmTextField();
- private transient DateValidator valCreatedBeforeDate;
- private final JosmTextField tfCreatedBeforeTime = new JosmTextField();
- private transient TimeValidator valCreatedBeforeTime;
-
- TimeRestrictionPanel() {
- build();
- }
-
- protected JPanel buildClosedAfterInputPanel() {
- JPanel pnl = new JPanel(new GridBagLayout());
- GridBagConstraints gc = new GridBagConstraints();
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 0.0;
- gc.insets = new Insets(0, 0, 0, 3);
- pnl.add(new JLabel(tr("Date: ")), gc);
-
- gc.gridx = 1;
- gc.weightx = 0.7;
- pnl.add(tfClosedAfterDate1, gc);
- SelectAllOnFocusGainedDecorator.decorate(tfClosedAfterDate1);
- valClosedAfterDate1 = DateValidator.decorate(tfClosedAfterDate1);
- tfClosedAfterDate1.setToolTipText(valClosedAfterDate1.getStandardTooltipTextAsHtml());
-
- gc.gridx = 2;
- gc.weightx = 0.0;
- pnl.add(new JLabel(tr("Time:")), gc);
-
- gc.gridx = 3;
- gc.weightx = 0.3;
- pnl.add(tfClosedAfterTime1, gc);
- SelectAllOnFocusGainedDecorator.decorate(tfClosedAfterTime1);
- valClosedAfterTime1 = TimeValidator.decorate(tfClosedAfterTime1);
- tfClosedAfterTime1.setToolTipText(valClosedAfterTime1.getStandardTooltipTextAsHtml());
- return pnl;
- }
-
- protected JPanel buildClosedAfterAndCreatedBeforeInputPanel() {
- JPanel pnl = new JPanel(new GridBagLayout());
- GridBagConstraints gc = new GridBagConstraints();
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 0.0;
- gc.insets = new Insets(0, 0, 0, 3);
- pnl.add(new JLabel(tr("Closed after - ")), gc);
-
- gc.gridx = 1;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 0.0;
- gc.insets = new Insets(0, 0, 0, 3);
- pnl.add(new JLabel(tr("Date:")), gc);
-
- gc.gridx = 2;
- gc.weightx = 0.7;
- pnl.add(tfClosedAfterDate2, gc);
- SelectAllOnFocusGainedDecorator.decorate(tfClosedAfterDate2);
- valClosedAfterDate2 = DateValidator.decorate(tfClosedAfterDate2);
- tfClosedAfterDate2.setToolTipText(valClosedAfterDate2.getStandardTooltipTextAsHtml());
- gc.gridx = 3;
- gc.weightx = 0.0;
- pnl.add(new JLabel(tr("Time:")), gc);
-
- gc.gridx = 4;
- gc.weightx = 0.3;
- pnl.add(tfClosedAfterTime2, gc);
- SelectAllOnFocusGainedDecorator.decorate(tfClosedAfterTime2);
- valClosedAfterTime2 = TimeValidator.decorate(tfClosedAfterTime2);
- tfClosedAfterTime2.setToolTipText(valClosedAfterTime2.getStandardTooltipTextAsHtml());
-
- gc.gridy = 1;
- gc.gridx = 0;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 0.0;
- gc.insets = new Insets(0, 0, 0, 3);
- pnl.add(new JLabel(tr("Created before - ")), gc);
-
- gc.gridx = 1;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 0.0;
- gc.insets = new Insets(0, 0, 0, 3);
- pnl.add(new JLabel(tr("Date:")), gc);
-
- gc.gridx = 2;
- gc.weightx = 0.7;
- pnl.add(tfCreatedBeforeDate, gc);
- SelectAllOnFocusGainedDecorator.decorate(tfCreatedBeforeDate);
- valCreatedBeforeDate = DateValidator.decorate(tfCreatedBeforeDate);
- tfCreatedBeforeDate.setToolTipText(valCreatedBeforeDate.getStandardTooltipTextAsHtml());
-
- gc.gridx = 3;
- gc.weightx = 0.0;
- pnl.add(new JLabel(tr("Time:")), gc);
-
- gc.gridx = 4;
- gc.weightx = 0.3;
- pnl.add(tfCreatedBeforeTime, gc);
- SelectAllOnFocusGainedDecorator.decorate(tfCreatedBeforeTime);
- valCreatedBeforeTime = TimeValidator.decorate(tfCreatedBeforeTime);
- tfCreatedBeforeTime.setToolTipText(valCreatedBeforeDate.getStandardTooltipTextAsHtml());
-
- return pnl;
- }
-
- protected void build() {
- setLayout(new GridBagLayout());
- setBorder(BorderFactory.createCompoundBorder(
- BorderFactory.createEmptyBorder(3, 3, 3, 3),
- BorderFactory.createCompoundBorder(
- BorderFactory.createLineBorder(Color.GRAY),
- BorderFactory.createEmptyBorder(5, 5, 5, 5)
- )
- ));
-
- // -- changesets closed after a specific date/time
- //
- GridBagConstraints gc = new GridBagConstraints();
- gc.anchor = GridBagConstraints.NORTHWEST;
- gc.gridx = 0;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 0.0;
- add(rbClosedAfter, gc);
-
- gc.gridx = 1;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 1.0;
- add(new JMultilineLabel(tr("Only changesets closed after the following date/time")), gc);
-
- gc.gridx = 1;
- gc.gridy = 1;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 1.0;
- add(buildClosedAfterInputPanel(), gc);
-
- // -- changesets closed after a specific date/time and created before a specific date time
- //
- gc = new GridBagConstraints();
- gc.anchor = GridBagConstraints.NORTHWEST;
- gc.gridy = 2;
- gc.gridx = 0;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 0.0;
- add(rbClosedAfterAndCreatedBefore, gc);
-
- gc.gridx = 1;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 1.0;
- add(new JMultilineLabel(tr("Only changesets closed after and created before a specific date/time")), gc);
-
- gc.gridx = 1;
- gc.gridy = 3;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 1.0;
- add(buildClosedAfterAndCreatedBeforeInputPanel(), gc);
-
- ButtonGroup bg = new ButtonGroup();
- bg.add(rbClosedAfter);
- bg.add(rbClosedAfterAndCreatedBefore);
-
- ItemListener restrictionChangeHandler = new TimeRestrictionChangedHandler();
- rbClosedAfter.addItemListener(restrictionChangeHandler);
- rbClosedAfterAndCreatedBefore.addItemListener(restrictionChangeHandler);
-
- rbClosedAfter.setSelected(true);
- }
-
- public boolean isValidChangesetQuery() {
- if (rbClosedAfter.isSelected())
- return valClosedAfterDate1.isValid() && valClosedAfterTime1.isValid();
- else if (rbClosedAfterAndCreatedBefore.isSelected())
- return valClosedAfterDate2.isValid() && valClosedAfterTime2.isValid()
- && valCreatedBeforeDate.isValid() && valCreatedBeforeTime.isValid();
- // should not happen
- return true;
- }
-
- class TimeRestrictionChangedHandler implements ItemListener {
- @Override
- public void itemStateChanged(ItemEvent e) {
- tfClosedAfterDate1.setEnabled(rbClosedAfter.isSelected());
- tfClosedAfterTime1.setEnabled(rbClosedAfter.isSelected());
-
- tfClosedAfterDate2.setEnabled(rbClosedAfterAndCreatedBefore.isSelected());
- tfClosedAfterTime2.setEnabled(rbClosedAfterAndCreatedBefore.isSelected());
- tfCreatedBeforeDate.setEnabled(rbClosedAfterAndCreatedBefore.isSelected());
- tfCreatedBeforeTime.setEnabled(rbClosedAfterAndCreatedBefore.isSelected());
- }
- }
-
- public void startUserInput() {
- restoreFromSettings();
- }
-
- public void fillInQuery(ChangesetQuery query) {
- if (!isValidChangesetQuery())
- throw new IllegalStateException(tr("Cannot build changeset query with time based restrictions. Input is not valid."));
- if (rbClosedAfter.isSelected()) {
- LocalDate d1 = valClosedAfterDate1.getDate();
- LocalTime d2 = valClosedAfterTime1.getDate();
- final Date d3 = new Date(d1.atTime(d2).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
- query.closedAfter(d3);
- } else if (rbClosedAfterAndCreatedBefore.isSelected()) {
- LocalDate d1 = valClosedAfterDate2.getDate();
- LocalTime d2 = valClosedAfterTime2.getDate();
- Date d3 = new Date(d1.atTime(d2).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
-
- d1 = valCreatedBeforeDate.getDate();
- d2 = valCreatedBeforeTime.getDate();
- Date d4 = new Date(d1.atTime(d2).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
-
- query.closedAfterAndCreatedBefore(d3, d4);
- }
- }
-
- public void displayMessageIfInvalid() {
- if (isValidChangesetQuery())
- return;
- HelpAwareOptionPane.showOptionDialog(
- this,
- tr(
- "<html>Please enter valid date/time values to restrict<br>"
- + "the query to a specific time range.</html>"
- ),
- tr("Invalid date/time values"),
- JOptionPane.ERROR_MESSAGE,
- HelpUtil.ht("/Dialog/ChangesetQueryDialog#InvalidDateTimeValues")
- );
- }
-
- public void rememberSettings() {
- String prefRoot = "changeset-query.advanced.time-restrictions";
- if (rbClosedAfter.isSelected()) {
- Main.pref.put(prefRoot + ".query-type", "closed-after");
- } else if (rbClosedAfterAndCreatedBefore.isSelected()) {
- Main.pref.put(prefRoot + ".query-type", "closed-after-created-before");
- }
- Main.pref.put(prefRoot + ".closed-after.date", tfClosedAfterDate1.getText());
- Main.pref.put(prefRoot + ".closed-after.time", tfClosedAfterTime1.getText());
- Main.pref.put(prefRoot + ".closed-created.closed.date", tfClosedAfterDate2.getText());
- Main.pref.put(prefRoot + ".closed-created.closed.time", tfClosedAfterTime2.getText());
- Main.pref.put(prefRoot + ".closed-created.created.date", tfCreatedBeforeDate.getText());
- Main.pref.put(prefRoot + ".closed-created.created.time", tfCreatedBeforeTime.getText());
- }
-
- public void restoreFromSettings() {
- String prefRoot = "changeset-query.advanced.open-restrictions";
- String v = Main.pref.get(prefRoot + ".query-type", "closed-after");
- rbClosedAfter.setSelected("closed-after".equals(v));
- rbClosedAfterAndCreatedBefore.setSelected("closed-after-created-before".equals(v));
- if (!rbClosedAfter.isSelected() && !rbClosedAfterAndCreatedBefore.isSelected()) {
- rbClosedAfter.setSelected(true);
- }
- tfClosedAfterDate1.setText(Main.pref.get(prefRoot + ".closed-after.date", ""));
- tfClosedAfterTime1.setText(Main.pref.get(prefRoot + ".closed-after.time", ""));
- tfClosedAfterDate2.setText(Main.pref.get(prefRoot + ".closed-created.closed.date", ""));
- tfClosedAfterTime2.setText(Main.pref.get(prefRoot + ".closed-created.closed.time", ""));
- tfCreatedBeforeDate.setText(Main.pref.get(prefRoot + ".closed-created.created.date", ""));
- tfCreatedBeforeTime.setText(Main.pref.get(prefRoot + ".closed-created.created.time", ""));
- if (!valClosedAfterDate1.isValid()) {
- tfClosedAfterDate1.setText("");
- }
- if (!valClosedAfterTime1.isValid()) {
- tfClosedAfterTime1.setText("");
- }
- if (!valClosedAfterDate2.isValid()) {
- tfClosedAfterDate2.setText("");
- }
- if (!valClosedAfterTime2.isValid()) {
- tfClosedAfterTime2.setText("");
- }
- if (!valCreatedBeforeDate.isValid()) {
- tfCreatedBeforeDate.setText("");
- }
- if (!valCreatedBeforeTime.isValid()) {
- tfCreatedBeforeTime.setText("");
- }
- }
- }
-
- private static class BBoxRestrictionPanel extends BoundingBoxSelectionPanel {
- BBoxRestrictionPanel() {
- setBorder(BorderFactory.createCompoundBorder(
- BorderFactory.createEmptyBorder(3, 3, 3, 3),
- BorderFactory.createCompoundBorder(
- BorderFactory.createLineBorder(Color.GRAY),
- BorderFactory.createEmptyBorder(5, 5, 5, 5)
- )
- ));
- }
-
- public boolean isValidChangesetQuery() {
- return getBoundingBox() != null;
- }
-
- public void fillInQuery(ChangesetQuery query) {
- if (!isValidChangesetQuery())
- throw new IllegalStateException(tr("Cannot restrict the changeset query to a specific bounding box. The input is invalid."));
- query.inBbox(getBoundingBox());
- }
-
- public void displayMessageIfInvalid() {
- if (isValidChangesetQuery())
- return;
- HelpAwareOptionPane.showOptionDialog(
- this,
- tr(
- "<html>Please enter valid longitude/latitude values to restrict<br>" +
- "the changeset query to a specific bounding box.</html>"
- ),
- tr("Invalid bounding box"),
- JOptionPane.ERROR_MESSAGE,
- HelpUtil.ht("/Dialog/ChangesetQueryDialog#InvalidBoundingBox")
- );
- }
- }
-
- /**
- * Validator for user ids entered in a {@link JTextComponent}.
- *
- */
- private static class UidInputFieldValidator extends AbstractTextComponentValidator {
- UidInputFieldValidator(JTextComponent tc) {
- super(tc);
- }
-
- public static UidInputFieldValidator decorate(JTextComponent tc) {
- return new UidInputFieldValidator(tc);
- }
-
- @Override
- public boolean isValid() {
- return getUid() > 0;
- }
-
- @Override
- public void validate() {
- String value = getComponent().getText();
- if (value == null || value.trim().isEmpty()) {
- feedbackInvalid("");
- return;
- }
- try {
- int uid = Integer.parseInt(value);
- if (uid <= 0) {
- feedbackInvalid(tr("The current value is not a valid user ID. Please enter an integer value > 0"));
- return;
- }
- } catch (NumberFormatException e) {
- feedbackInvalid(tr("The current value is not a valid user ID. Please enter an integer value > 0"));
- return;
- }
- feedbackValid(tr("Please enter an integer value > 0"));
- }
-
- public int getUid() {
- String value = getComponent().getText();
- if (value == null || value.trim().isEmpty()) return 0;
- try {
- int uid = Integer.parseInt(value.trim());
- if (uid > 0)
- return uid;
- return 0;
- } catch (NumberFormatException e) {
- return 0;
- }
- }
- }
-
- /**
- * Validates dates entered as text in a {@link JTextComponent}. Validates the input
- * on the fly and gives feedback about whether the date is valid or not.
- *
- * Dates can be entered in one of four standard formats defined for the current locale.
- */
- private static class DateValidator extends AbstractTextComponentValidator {
- DateValidator(JTextComponent tc) {
- super(tc);
- }
-
- public static DateValidator decorate(JTextComponent tc) {
- return new DateValidator(tc);
- }
-
- @Override
- public boolean isValid() {
- return getDate() != null;
- }
-
- public String getStandardTooltipTextAsHtml() {
- return "<html>" + getStandardTooltipText() + "</html>";
- }
-
- public String getStandardTooltipText() {
- final ZonedDateTime now = ZonedDateTime.now();
- return tr(
- "Please enter a date in the usual format for your locale.<br>"
- + "Example: {0}<br>"
- + "Example: {1}<br>"
- + "Example: {2}<br>"
- + "Example: {3}<br>",
- DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT).format(now),
- DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM).format(now),
- DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).format(now),
- DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL).format(now)
- );
- }
-
- @Override
- public void validate() {
- if (!isValid()) {
- String msg = "<html>The current value isn't a valid date.<br>" + getStandardTooltipText()+ "</html>";
- feedbackInvalid(msg);
- return;
- } else {
- String msg = "<html>" + getStandardTooltipText() + "</html>";
- feedbackValid(msg);
- }
- }
-
- public LocalDate getDate() {
- for (final FormatStyle format: FormatStyle.values()) {
- DateTimeFormatter df = DateTimeFormatter.ofLocalizedDate(format);
- try {
- return LocalDate.parse(getComponent().getText(), df);
- } catch (DateTimeParseException e) {
- // Try next format
- Main.trace(e);
- }
- }
- return null;
- }
- }
-
- /**
- * Validates time values entered as text in a {@link JTextComponent}. Validates the input
- * on the fly and gives feedback about whether the time value is valid or not.
- *
- * Time values can be entered in one of four standard formats defined for the current locale.
- */
- private static class TimeValidator extends AbstractTextComponentValidator {
- TimeValidator(JTextComponent tc) {
- super(tc);
- }
-
- public static TimeValidator decorate(JTextComponent tc) {
- return new TimeValidator(tc);
- }
-
- @Override
- public boolean isValid() {
- if (getComponent().getText().trim().isEmpty())
- return true;
- return getDate() != null;
- }
-
- public String getStandardTooltipTextAsHtml() {
- return "<html>" + getStandardTooltipText() + "</html>";
- }
-
- public String getStandardTooltipText() {
- final ZonedDateTime now = ZonedDateTime.now();
- return tr(
- "Please enter a valid time in the usual format for your locale.<br>"
- + "Example: {0}<br>"
- + "Example: {1}<br>"
- + "Example: {2}<br>"
- + "Example: {3}<br>",
- DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT).format(now),
- DateTimeFormatter.ofLocalizedTime(FormatStyle.MEDIUM).format(now),
- DateTimeFormatter.ofLocalizedTime(FormatStyle.LONG).format(now),
- DateTimeFormatter.ofLocalizedTime(FormatStyle.FULL).format(now)
- );
- }
-
- @Override
- public void validate() {
- if (!isValid()) {
- String msg = "<html>The current value isn't a valid time.<br>" + getStandardTooltipText() + "</html>";
- feedbackInvalid(msg);
- return;
- } else {
- String msg = "<html>" + getStandardTooltipText() + "</html>";
- feedbackValid(msg);
- }
- }
-
- public LocalTime getDate() {
- if (getComponent().getText().trim().isEmpty())
- return LocalTime.MIDNIGHT;
-
- for (final FormatStyle format: FormatStyle.values()) {
- DateTimeFormatter df = DateTimeFormatter.ofLocalizedTime(format);
- try {
- return LocalTime.parse(getComponent().getText(), df);
- } catch (DateTimeParseException e) {
- // Try next format
- Main.trace(e);
- }
- }
- return LocalTime.MIDNIGHT;
- }
- }
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BBoxRestrictionPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BBoxRestrictionPanel.java
new file mode 100644
index 0000000..3f0fe88
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BBoxRestrictionPanel.java
@@ -0,0 +1,70 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.changeset.query;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Color;
+
+import javax.swing.BorderFactory;
+import javax.swing.JOptionPane;
+
+import org.openstreetmap.josm.gui.HelpAwareOptionPane;
+import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.widgets.BoundingBoxSelectionPanel;
+import org.openstreetmap.josm.io.ChangesetQuery;
+
+/**
+ * This is the panel for selecting whether the query should be restricted to a specific bounding box.
+ * @since 11326 (extracted from AdvancedChangesetQueryPanel)
+ */
+public class BBoxRestrictionPanel extends BoundingBoxSelectionPanel implements RestrictionPanel {
+
+ /**
+ * Constructs a new {@code BBoxRestrictionPanel}.
+ */
+ public BBoxRestrictionPanel() {
+ setBorder(BorderFactory.createCompoundBorder(
+ BorderFactory.createEmptyBorder(3, 3, 3, 3),
+ BorderFactory.createCompoundBorder(
+ BorderFactory.createLineBorder(Color.GRAY),
+ BorderFactory.createEmptyBorder(5, 5, 5, 5)
+ )
+ ));
+ }
+
+ /**
+ * Determines if the changeset query bbox is valid.
+ * @return {@code true} if the changeset query bbox is defined.
+ */
+ @Override
+ public boolean isValidChangesetQuery() {
+ return getBoundingBox() != null;
+ }
+
+ /**
+ * Sets the query restrictions on <code>query</code> for bbox based restrictions.
+ * @param query query to fill
+ */
+ @Override
+ public void fillInQuery(ChangesetQuery query) {
+ if (!isValidChangesetQuery())
+ throw new IllegalStateException(tr("Cannot restrict the changeset query to a specific bounding box. The input is invalid."));
+ query.inBbox(getBoundingBox());
+ }
+
+ @Override
+ public void displayMessageIfInvalid() {
+ if (isValidChangesetQuery())
+ return;
+ HelpAwareOptionPane.showOptionDialog(
+ this,
+ tr(
+ "<html>Please enter valid longitude/latitude values to restrict<br>" +
+ "the changeset query to a specific bounding box.</html>"
+ ),
+ tr("Invalid bounding box"),
+ JOptionPane.ERROR_MESSAGE,
+ HelpUtil.ht("/Dialog/ChangesetQueryDialog#InvalidBoundingBox")
+ );
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java
index 9a276f4..716df05 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java
@@ -26,8 +26,8 @@ import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.io.ChangesetQuery;
/**
- * This panel presents a list of basic queries for changests.
- *
+ * This panel presents a list of basic queries for changesets.
+ * @since 2689
*/
public class BasicChangesetQueryPanel extends JPanel {
@@ -144,6 +144,9 @@ public class BasicChangesetQueryPanel extends JPanel {
build();
}
+ /**
+ * Initializes the panel.
+ */
public void init() {
JMultilineLabel lbl = lblQueries.get(BasicQuery.MOST_RECENT_CHANGESETS);
lbl.setText(tr("<html>Download the latest changesets</html>"));
@@ -175,6 +178,9 @@ public class BasicChangesetQueryPanel extends JPanel {
restoreFromPreferences();
}
+ /**
+ * Remember settings in preferences.
+ */
public void rememberInPreferences() {
BasicQuery q = getSelectedQuery();
if (q == null) {
@@ -185,6 +191,9 @@ public class BasicChangesetQueryPanel extends JPanel {
Main.pref.put("changeset-query.basic.my-changesets-only", cbMyChangesetsOnly.isSelected());
}
+ /**
+ * Restore settings from preferences.
+ */
public void restoreFromPreferences() {
BasicQuery q;
String value = Main.pref.get("changeset-query.basic.query", null);
@@ -213,6 +222,10 @@ public class BasicChangesetQueryPanel extends JPanel {
return null;
}
+ /**
+ * Builds the changeset query.
+ * @return the changeset query
+ */
public ChangesetQuery buildChangesetQuery() {
BasicQuery q = getSelectedQuery();
ChangesetQuery query = new ChangesetQuery();
@@ -246,7 +259,6 @@ public class BasicChangesetQueryPanel extends JPanel {
/**
* Responds to changes in the selected query
- *
*/
class SelectQueryHandler implements ItemListener {
@Override
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java
index bd4a8e2..afad85f 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java
@@ -95,10 +95,17 @@ public class ChangesetQueryDialog extends JDialog {
addWindowListener(new WindowEventHandler());
}
+ /**
+ * Determines if the dialog has been canceled.
+ * @return {@code true} if the dialog has been canceled
+ */
public boolean isCanceled() {
return canceled;
}
+ /**
+ * Initializes HMI for user input.
+ */
public void initForUserInput() {
pnlBasicChangesetQueries.init();
}
@@ -107,6 +114,10 @@ public class ChangesetQueryDialog extends JDialog {
this.canceled = canceled;
}
+ /**
+ * Returns the changeset query.
+ * @return the changeset query
+ */
public ChangesetQuery getChangesetQuery() {
if (isCanceled())
return null;
@@ -123,6 +134,9 @@ public class ChangesetQueryDialog extends JDialog {
}
}
+ /**
+ * Initializes HMI for user input.
+ */
public void startUserInput() {
pnlUrlBasedQueries.startUserInput();
pnlAdvancedQueries.startUserInput();
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/DateValidator.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/DateValidator.java
new file mode 100644
index 0000000..c69784e
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/DateValidator.java
@@ -0,0 +1,103 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.changeset.query;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.time.LocalDate;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.format.FormatStyle;
+
+import javax.swing.text.JTextComponent;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
+
+/**
+ * Validates dates entered as text in a {@link JTextComponent}. Validates the input
+ * on the fly and gives feedback about whether the date is valid or not.
+ *
+ * Dates can be entered in one of four standard formats defined for the current locale.
+ * @since 11326 (extracted from AdvancedChangesetQueryPanel)
+ */
+public class DateValidator extends AbstractTextComponentValidator {
+
+ /**
+ * Constructs a new {@code DateValidator} for the given text component.
+ * @param tc text component
+ */
+ public DateValidator(JTextComponent tc) {
+ super(tc);
+ }
+
+ /**
+ * Decorates the given text component.
+ * @param tc text component to decorate
+ * @return new date validator attached to {@code tc}
+ */
+ public static DateValidator decorate(JTextComponent tc) {
+ return new DateValidator(tc);
+ }
+
+ @Override
+ public boolean isValid() {
+ return getDate() != null;
+ }
+
+ /**
+ * Returns the standard tooltip text as HTML.
+ * @return the standard tooltip text as HTML
+ */
+ public String getStandardTooltipTextAsHtml() {
+ return "<html>" + getStandardTooltipText() + "</html>";
+ }
+
+ /**
+ * Returns the standard tooltip text.
+ * @return the standard tooltip text
+ */
+ public String getStandardTooltipText() {
+ final ZonedDateTime now = ZonedDateTime.now();
+ return tr(
+ "Please enter a date in the usual format for your locale.<br>"
+ + "Example: {0}<br>"
+ + "Example: {1}<br>"
+ + "Example: {2}<br>"
+ + "Example: {3}<br>",
+ DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT).format(now),
+ DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM).format(now),
+ DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).format(now),
+ DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL).format(now)
+ );
+ }
+
+ @Override
+ public void validate() {
+ if (!isValid()) {
+ String msg = "<html>The current value isn't a valid date.<br>" + getStandardTooltipText()+ "</html>";
+ feedbackInvalid(msg);
+ return;
+ } else {
+ String msg = "<html>" + getStandardTooltipText() + "</html>";
+ feedbackValid(msg);
+ }
+ }
+
+ /**
+ * Returns the date.
+ * @return the date
+ */
+ public LocalDate getDate() {
+ for (final FormatStyle format: FormatStyle.values()) {
+ DateTimeFormatter df = DateTimeFormatter.ofLocalizedDate(format);
+ try {
+ return LocalDate.parse(getComponent().getText(), df);
+ } catch (DateTimeParseException e) {
+ // Try next format
+ Main.trace(e);
+ }
+ }
+ return null;
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/OpenAndCloseStateRestrictionPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/OpenAndCloseStateRestrictionPanel.java
new file mode 100644
index 0000000..eb03829
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/OpenAndCloseStateRestrictionPanel.java
@@ -0,0 +1,138 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.changeset.query;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Color;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
+import org.openstreetmap.josm.io.ChangesetQuery;
+
+/**
+ * This is the panel for selecting whether the changeset query should be restricted to
+ * open or closed changesets.
+ * @since 11326 (extracted from AdvancedChangesetQueryPanel)
+ */
+public class OpenAndCloseStateRestrictionPanel extends JPanel implements RestrictionPanel {
+
+ private static final String PREF_ROOT = "changeset-query.advanced.open-restrictions";
+ private static final String PREF_QUERY_TYPE = PREF_ROOT + ".query-type";
+
+ private final JRadioButton rbOpenOnly = new JRadioButton();
+ private final JRadioButton rbClosedOnly = new JRadioButton();
+ private final JRadioButton rbBoth = new JRadioButton();
+
+ /**
+ * Constructs a new {@code OpenAndCloseStateRestrictionPanel}.
+ */
+ public OpenAndCloseStateRestrictionPanel() {
+ build();
+ }
+
+ protected void build() {
+ setLayout(new GridBagLayout());
+ setBorder(BorderFactory.createCompoundBorder(
+ BorderFactory.createEmptyBorder(3, 3, 3, 3),
+ BorderFactory.createCompoundBorder(
+ BorderFactory.createLineBorder(Color.GRAY),
+ BorderFactory.createEmptyBorder(5, 5, 5, 5)
+ )
+ ));
+ GridBagConstraints gc = new GridBagConstraints();
+ gc.anchor = GridBagConstraints.NORTHWEST;
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 0.0;
+ add(rbOpenOnly, gc);
+
+ gc.gridx = 1;
+ gc.weightx = 1.0;
+ add(new JMultilineLabel(tr("Query open changesets only")), gc);
+
+ gc.gridy = 1;
+ gc.gridx = 0;
+ gc.weightx = 0.0;
+ add(rbClosedOnly, gc);
+
+ gc.gridx = 1;
+ gc.weightx = 1.0;
+ add(new JMultilineLabel(tr("Query closed changesets only")), gc);
+
+ gc.gridy = 2;
+ gc.gridx = 0;
+ gc.weightx = 0.0;
+ add(rbBoth, gc);
+
+ gc.gridx = 1;
+ gc.weightx = 1.0;
+ add(new JMultilineLabel(tr("Query both open and closed changesets")), gc);
+
+ ButtonGroup bgRestrictions = new ButtonGroup();
+ bgRestrictions.add(rbBoth);
+ bgRestrictions.add(rbClosedOnly);
+ bgRestrictions.add(rbOpenOnly);
+ }
+
+ /**
+ * Initializes HMI for user input.
+ */
+ public void startUserInput() {
+ restoreFromSettings();
+ }
+
+ /**
+ * Sets the query restrictions on <code>query</code> for state based restrictions.
+ * @param query the query to fill
+ */
+ @Override
+ public void fillInQuery(ChangesetQuery query) {
+ if (rbBoth.isSelected()) {
+ query.beingClosed(true);
+ query.beingOpen(true);
+ } else if (rbOpenOnly.isSelected()) {
+ query.beingOpen(true);
+ } else if (rbClosedOnly.isSelected()) {
+ query.beingClosed(true);
+ }
+ }
+
+ /**
+ * Remember settings in preferences.
+ */
+ public void rememberSettings() {
+ if (rbBoth.isSelected()) {
+ Main.pref.put(PREF_QUERY_TYPE, "both");
+ } else if (rbOpenOnly.isSelected()) {
+ Main.pref.put(PREF_QUERY_TYPE, "open");
+ } else if (rbClosedOnly.isSelected()) {
+ Main.pref.put(PREF_QUERY_TYPE, "closed");
+ }
+ }
+
+ /**
+ * Restore settings from preferences.
+ */
+ public void restoreFromSettings() {
+ String v = Main.pref.get(PREF_QUERY_TYPE, "open");
+ rbBoth.setSelected("both".equals(v));
+ rbOpenOnly.setSelected("open".equals(v));
+ rbClosedOnly.setSelected("closed".equals(v));
+ }
+
+ @Override
+ public boolean isValidChangesetQuery() {
+ return true;
+ }
+
+ @Override
+ public void displayMessageIfInvalid() {
+ // Do nothing
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/RestrictionPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/RestrictionPanel.java
new file mode 100644
index 0000000..3857765
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/RestrictionPanel.java
@@ -0,0 +1,28 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.changeset.query;
+
+import org.openstreetmap.josm.io.ChangesetQuery;
+
+/**
+ * Defines a panel to apply a restriction to the changeset query.
+ * @since 11326
+ */
+public interface RestrictionPanel {
+
+ /**
+ * Determines if the changeset query is valid.
+ * @return {@code true} if the changeset query is valid.
+ */
+ boolean isValidChangesetQuery();
+
+ /**
+ * Sets the query restrictions on <code>query</code>.
+ * @param query query to fill
+ */
+ void fillInQuery(ChangesetQuery query);
+
+ /**
+ * Display error message if a field is invalid.
+ */
+ void displayMessageIfInvalid();
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/TimeRestrictionPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/TimeRestrictionPanel.java
new file mode 100644
index 0000000..fbda6dc
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/TimeRestrictionPanel.java
@@ -0,0 +1,346 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.changeset.query;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Color;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.util.Date;
+
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane;
+import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
+import org.openstreetmap.josm.io.ChangesetQuery;
+
+/**
+ * This is the panel to apply a time restriction to the changeset query.
+ * @since 11326 (extracted from AdvancedChangesetQueryPanel)
+ */
+public class TimeRestrictionPanel extends JPanel implements RestrictionPanel {
+
+ private final JRadioButton rbClosedAfter = new JRadioButton();
+ private final JRadioButton rbClosedAfterAndCreatedBefore = new JRadioButton();
+ private final JosmTextField tfClosedAfterDate1 = new JosmTextField();
+ private transient DateValidator valClosedAfterDate1;
+ private final JosmTextField tfClosedAfterTime1 = new JosmTextField();
+ private transient TimeValidator valClosedAfterTime1;
+ private final JosmTextField tfClosedAfterDate2 = new JosmTextField();
+ private transient DateValidator valClosedAfterDate2;
+ private final JosmTextField tfClosedAfterTime2 = new JosmTextField();
+ private transient TimeValidator valClosedAfterTime2;
+ private final JosmTextField tfCreatedBeforeDate = new JosmTextField();
+ private transient DateValidator valCreatedBeforeDate;
+ private final JosmTextField tfCreatedBeforeTime = new JosmTextField();
+ private transient TimeValidator valCreatedBeforeTime;
+
+ /**
+ * Constructs a new {@code TimeRestrictionPanel}.
+ */
+ public TimeRestrictionPanel() {
+ build();
+ }
+
+ protected JPanel buildClosedAfterInputPanel() {
+ JPanel pnl = new JPanel(new GridBagLayout());
+ GridBagConstraints gc = new GridBagConstraints();
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 0.0;
+ gc.insets = new Insets(0, 0, 0, 3);
+ pnl.add(new JLabel(tr("Date: ")), gc);
+
+ gc.gridx = 1;
+ gc.weightx = 0.7;
+ pnl.add(tfClosedAfterDate1, gc);
+ SelectAllOnFocusGainedDecorator.decorate(tfClosedAfterDate1);
+ valClosedAfterDate1 = DateValidator.decorate(tfClosedAfterDate1);
+ tfClosedAfterDate1.setToolTipText(valClosedAfterDate1.getStandardTooltipTextAsHtml());
+
+ gc.gridx = 2;
+ gc.weightx = 0.0;
+ pnl.add(new JLabel(tr("Time:")), gc);
+
+ gc.gridx = 3;
+ gc.weightx = 0.3;
+ pnl.add(tfClosedAfterTime1, gc);
+ SelectAllOnFocusGainedDecorator.decorate(tfClosedAfterTime1);
+ valClosedAfterTime1 = TimeValidator.decorate(tfClosedAfterTime1);
+ tfClosedAfterTime1.setToolTipText(valClosedAfterTime1.getStandardTooltipTextAsHtml());
+ return pnl;
+ }
+
+ protected JPanel buildClosedAfterAndCreatedBeforeInputPanel() {
+ JPanel pnl = new JPanel(new GridBagLayout());
+ GridBagConstraints gc = new GridBagConstraints();
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 0.0;
+ gc.insets = new Insets(0, 0, 0, 3);
+ pnl.add(new JLabel(tr("Closed after - ")), gc);
+
+ gc.gridx = 1;
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 0.0;
+ gc.insets = new Insets(0, 0, 0, 3);
+ pnl.add(new JLabel(tr("Date:")), gc);
+
+ gc.gridx = 2;
+ gc.weightx = 0.7;
+ pnl.add(tfClosedAfterDate2, gc);
+ SelectAllOnFocusGainedDecorator.decorate(tfClosedAfterDate2);
+ valClosedAfterDate2 = DateValidator.decorate(tfClosedAfterDate2);
+ tfClosedAfterDate2.setToolTipText(valClosedAfterDate2.getStandardTooltipTextAsHtml());
+ gc.gridx = 3;
+ gc.weightx = 0.0;
+ pnl.add(new JLabel(tr("Time:")), gc);
+
+ gc.gridx = 4;
+ gc.weightx = 0.3;
+ pnl.add(tfClosedAfterTime2, gc);
+ SelectAllOnFocusGainedDecorator.decorate(tfClosedAfterTime2);
+ valClosedAfterTime2 = TimeValidator.decorate(tfClosedAfterTime2);
+ tfClosedAfterTime2.setToolTipText(valClosedAfterTime2.getStandardTooltipTextAsHtml());
+
+ gc.gridy = 1;
+ gc.gridx = 0;
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 0.0;
+ gc.insets = new Insets(0, 0, 0, 3);
+ pnl.add(new JLabel(tr("Created before - ")), gc);
+
+ gc.gridx = 1;
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 0.0;
+ gc.insets = new Insets(0, 0, 0, 3);
+ pnl.add(new JLabel(tr("Date:")), gc);
+
+ gc.gridx = 2;
+ gc.weightx = 0.7;
+ pnl.add(tfCreatedBeforeDate, gc);
+ SelectAllOnFocusGainedDecorator.decorate(tfCreatedBeforeDate);
+ valCreatedBeforeDate = DateValidator.decorate(tfCreatedBeforeDate);
+ tfCreatedBeforeDate.setToolTipText(valCreatedBeforeDate.getStandardTooltipTextAsHtml());
+
+ gc.gridx = 3;
+ gc.weightx = 0.0;
+ pnl.add(new JLabel(tr("Time:")), gc);
+
+ gc.gridx = 4;
+ gc.weightx = 0.3;
+ pnl.add(tfCreatedBeforeTime, gc);
+ SelectAllOnFocusGainedDecorator.decorate(tfCreatedBeforeTime);
+ valCreatedBeforeTime = TimeValidator.decorate(tfCreatedBeforeTime);
+ tfCreatedBeforeTime.setToolTipText(valCreatedBeforeDate.getStandardTooltipTextAsHtml());
+
+ return pnl;
+ }
+
+ protected void build() {
+ setLayout(new GridBagLayout());
+ setBorder(BorderFactory.createCompoundBorder(
+ BorderFactory.createEmptyBorder(3, 3, 3, 3),
+ BorderFactory.createCompoundBorder(
+ BorderFactory.createLineBorder(Color.GRAY),
+ BorderFactory.createEmptyBorder(5, 5, 5, 5)
+ )
+ ));
+
+ // -- changesets closed after a specific date/time
+ //
+ GridBagConstraints gc = new GridBagConstraints();
+ gc.anchor = GridBagConstraints.NORTHWEST;
+ gc.gridx = 0;
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 0.0;
+ add(rbClosedAfter, gc);
+
+ gc.gridx = 1;
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 1.0;
+ add(new JMultilineLabel(tr("Only changesets closed after the following date/time")), gc);
+
+ gc.gridx = 1;
+ gc.gridy = 1;
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 1.0;
+ add(buildClosedAfterInputPanel(), gc);
+
+ // -- changesets closed after a specific date/time and created before a specific date time
+ //
+ gc = new GridBagConstraints();
+ gc.anchor = GridBagConstraints.NORTHWEST;
+ gc.gridy = 2;
+ gc.gridx = 0;
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 0.0;
+ add(rbClosedAfterAndCreatedBefore, gc);
+
+ gc.gridx = 1;
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 1.0;
+ add(new JMultilineLabel(tr("Only changesets closed after and created before a specific date/time")), gc);
+
+ gc.gridx = 1;
+ gc.gridy = 3;
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 1.0;
+ add(buildClosedAfterAndCreatedBeforeInputPanel(), gc);
+
+ ButtonGroup bg = new ButtonGroup();
+ bg.add(rbClosedAfter);
+ bg.add(rbClosedAfterAndCreatedBefore);
+
+ ItemListener restrictionChangeHandler = new TimeRestrictionChangedHandler();
+ rbClosedAfter.addItemListener(restrictionChangeHandler);
+ rbClosedAfterAndCreatedBefore.addItemListener(restrictionChangeHandler);
+
+ rbClosedAfter.setSelected(true);
+ }
+
+ /**
+ * Determines if the changeset query time information is valid.
+ * @return {@code true} if the changeset query time information is valid.
+ */
+ @Override
+ public boolean isValidChangesetQuery() {
+ if (rbClosedAfter.isSelected())
+ return valClosedAfterDate1.isValid() && valClosedAfterTime1.isValid();
+ else if (rbClosedAfterAndCreatedBefore.isSelected())
+ return valClosedAfterDate2.isValid() && valClosedAfterTime2.isValid()
+ && valCreatedBeforeDate.isValid() && valCreatedBeforeTime.isValid();
+ // should not happen
+ return true;
+ }
+
+ class TimeRestrictionChangedHandler implements ItemListener {
+ @Override
+ public void itemStateChanged(ItemEvent e) {
+ tfClosedAfterDate1.setEnabled(rbClosedAfter.isSelected());
+ tfClosedAfterTime1.setEnabled(rbClosedAfter.isSelected());
+
+ tfClosedAfterDate2.setEnabled(rbClosedAfterAndCreatedBefore.isSelected());
+ tfClosedAfterTime2.setEnabled(rbClosedAfterAndCreatedBefore.isSelected());
+ tfCreatedBeforeDate.setEnabled(rbClosedAfterAndCreatedBefore.isSelected());
+ tfCreatedBeforeTime.setEnabled(rbClosedAfterAndCreatedBefore.isSelected());
+ }
+ }
+
+ /**
+ * Initializes HMI for user input.
+ */
+ public void startUserInput() {
+ restoreFromSettings();
+ }
+
+ /**
+ * Sets the query restrictions on <code>query</code> for time based restrictions.
+ * @param query the query to fill
+ */
+ @Override
+ public void fillInQuery(ChangesetQuery query) {
+ if (!isValidChangesetQuery())
+ throw new IllegalStateException(tr("Cannot build changeset query with time based restrictions. Input is not valid."));
+ if (rbClosedAfter.isSelected()) {
+ LocalDate d1 = valClosedAfterDate1.getDate();
+ LocalTime d2 = valClosedAfterTime1.getTime();
+ final Date d3 = new Date(d1.atTime(d2).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
+ query.closedAfter(d3);
+ } else if (rbClosedAfterAndCreatedBefore.isSelected()) {
+ LocalDate d1 = valClosedAfterDate2.getDate();
+ LocalTime d2 = valClosedAfterTime2.getTime();
+ Date d3 = new Date(d1.atTime(d2).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
+
+ d1 = valCreatedBeforeDate.getDate();
+ d2 = valCreatedBeforeTime.getTime();
+ Date d4 = new Date(d1.atTime(d2).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
+
+ query.closedAfterAndCreatedBefore(d3, d4);
+ }
+ }
+
+ @Override
+ public void displayMessageIfInvalid() {
+ if (isValidChangesetQuery())
+ return;
+ HelpAwareOptionPane.showOptionDialog(
+ this,
+ tr(
+ "<html>Please enter valid date/time values to restrict<br>"
+ + "the query to a specific time range.</html>"
+ ),
+ tr("Invalid date/time values"),
+ JOptionPane.ERROR_MESSAGE,
+ HelpUtil.ht("/Dialog/ChangesetQueryDialog#InvalidDateTimeValues")
+ );
+ }
+
+ /**
+ * Remember settings in preferences.
+ */
+ public void rememberSettings() {
+ String prefRoot = "changeset-query.advanced.time-restrictions";
+ if (rbClosedAfter.isSelected()) {
+ Main.pref.put(prefRoot + ".query-type", "closed-after");
+ } else if (rbClosedAfterAndCreatedBefore.isSelected()) {
+ Main.pref.put(prefRoot + ".query-type", "closed-after-created-before");
+ }
+ Main.pref.put(prefRoot + ".closed-after.date", tfClosedAfterDate1.getText());
+ Main.pref.put(prefRoot + ".closed-after.time", tfClosedAfterTime1.getText());
+ Main.pref.put(prefRoot + ".closed-created.closed.date", tfClosedAfterDate2.getText());
+ Main.pref.put(prefRoot + ".closed-created.closed.time", tfClosedAfterTime2.getText());
+ Main.pref.put(prefRoot + ".closed-created.created.date", tfCreatedBeforeDate.getText());
+ Main.pref.put(prefRoot + ".closed-created.created.time", tfCreatedBeforeTime.getText());
+ }
+
+ /**
+ * Restore settings from preferences.
+ */
+ public void restoreFromSettings() {
+ String prefRoot = "changeset-query.advanced.open-restrictions";
+ String v = Main.pref.get(prefRoot + ".query-type", "closed-after");
+ rbClosedAfter.setSelected("closed-after".equals(v));
+ rbClosedAfterAndCreatedBefore.setSelected("closed-after-created-before".equals(v));
+ if (!rbClosedAfter.isSelected() && !rbClosedAfterAndCreatedBefore.isSelected()) {
+ rbClosedAfter.setSelected(true);
+ }
+ tfClosedAfterDate1.setText(Main.pref.get(prefRoot + ".closed-after.date", ""));
+ tfClosedAfterTime1.setText(Main.pref.get(prefRoot + ".closed-after.time", ""));
+ tfClosedAfterDate2.setText(Main.pref.get(prefRoot + ".closed-created.closed.date", ""));
+ tfClosedAfterTime2.setText(Main.pref.get(prefRoot + ".closed-created.closed.time", ""));
+ tfCreatedBeforeDate.setText(Main.pref.get(prefRoot + ".closed-created.created.date", ""));
+ tfCreatedBeforeTime.setText(Main.pref.get(prefRoot + ".closed-created.created.time", ""));
+ if (!valClosedAfterDate1.isValid()) {
+ tfClosedAfterDate1.setText("");
+ }
+ if (!valClosedAfterTime1.isValid()) {
+ tfClosedAfterTime1.setText("");
+ }
+ if (!valClosedAfterDate2.isValid()) {
+ tfClosedAfterDate2.setText("");
+ }
+ if (!valClosedAfterTime2.isValid()) {
+ tfClosedAfterTime2.setText("");
+ }
+ if (!valCreatedBeforeDate.isValid()) {
+ tfCreatedBeforeDate.setText("");
+ }
+ if (!valCreatedBeforeTime.isValid()) {
+ tfCreatedBeforeTime.setText("");
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/TimeValidator.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/TimeValidator.java
new file mode 100644
index 0000000..5f33443
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/TimeValidator.java
@@ -0,0 +1,108 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.changeset.query;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.time.LocalTime;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.format.FormatStyle;
+
+import javax.swing.text.JTextComponent;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
+
+/**
+ * Validates time values entered as text in a {@link JTextComponent}. Validates the input
+ * on the fly and gives feedback about whether the time value is valid or not.
+ *
+ * Time values can be entered in one of four standard formats defined for the current locale.
+ * @since 11326 (extracted from AdvancedChangesetQueryPanel)
+ */
+public class TimeValidator extends AbstractTextComponentValidator {
+
+ /**
+ * Constructs a new {@code TimeValidator} for the given text component.
+ * @param tc text component
+ */
+ public TimeValidator(JTextComponent tc) {
+ super(tc);
+ }
+
+ /**
+ * Decorates the given text component.
+ * @param tc text component to decorate
+ * @return new time validator attached to {@code tc}
+ */
+ public static TimeValidator decorate(JTextComponent tc) {
+ return new TimeValidator(tc);
+ }
+
+ @Override
+ public boolean isValid() {
+ if (getComponent().getText().trim().isEmpty())
+ return true;
+ return getTime() != null;
+ }
+
+ /**
+ * Returns the standard tooltip text as HTML.
+ * @return the standard tooltip text as HTML
+ */
+ public String getStandardTooltipTextAsHtml() {
+ return "<html>" + getStandardTooltipText() + "</html>";
+ }
+
+ /**
+ * Returns the standard tooltip text.
+ * @return the standard tooltip text
+ */
+ public String getStandardTooltipText() {
+ final ZonedDateTime now = ZonedDateTime.now();
+ return tr(
+ "Please enter a valid time in the usual format for your locale.<br>"
+ + "Example: {0}<br>"
+ + "Example: {1}<br>"
+ + "Example: {2}<br>"
+ + "Example: {3}<br>",
+ DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT).format(now),
+ DateTimeFormatter.ofLocalizedTime(FormatStyle.MEDIUM).format(now),
+ DateTimeFormatter.ofLocalizedTime(FormatStyle.LONG).format(now),
+ DateTimeFormatter.ofLocalizedTime(FormatStyle.FULL).format(now)
+ );
+ }
+
+ @Override
+ public void validate() {
+ if (!isValid()) {
+ String msg = "<html>The current value isn't a valid time.<br>" + getStandardTooltipText() + "</html>";
+ feedbackInvalid(msg);
+ return;
+ } else {
+ String msg = "<html>" + getStandardTooltipText() + "</html>";
+ feedbackValid(msg);
+ }
+ }
+
+ /**
+ * Returns the time.
+ * @return the time
+ */
+ public LocalTime getTime() {
+ if (getComponent().getText().trim().isEmpty())
+ return LocalTime.MIDNIGHT;
+
+ for (final FormatStyle format: FormatStyle.values()) {
+ DateTimeFormatter df = DateTimeFormatter.ofLocalizedTime(format);
+ try {
+ return LocalTime.parse(getComponent().getText(), df);
+ } catch (DateTimeParseException e) {
+ // Try next format
+ Main.trace(e);
+ }
+ }
+ return LocalTime.MIDNIGHT;
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UidInputFieldValidator.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UidInputFieldValidator.java
new file mode 100644
index 0000000..a12d7c5
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UidInputFieldValidator.java
@@ -0,0 +1,74 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.changeset.query;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import javax.swing.text.JTextComponent;
+
+import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
+
+/**
+ * Validator for user ids entered in a {@link JTextComponent}.
+ * @since 11326 (extracted from AdvancedChangesetQueryPanel)
+ */
+public class UidInputFieldValidator extends AbstractTextComponentValidator {
+
+ /**
+ * Constructs a new {@code TimeValidator} for the given text component.
+ * @param tc text component
+ */
+ public UidInputFieldValidator(JTextComponent tc) {
+ super(tc);
+ }
+
+ /**
+ * Decorates the given text component.
+ * @param tc text component to decorate
+ * @return new uid validator attached to {@code tc}
+ */
+ public static UidInputFieldValidator decorate(JTextComponent tc) {
+ return new UidInputFieldValidator(tc);
+ }
+
+ @Override
+ public boolean isValid() {
+ return getUid() > 0;
+ }
+
+ @Override
+ public void validate() {
+ String value = getComponent().getText();
+ if (value == null || value.trim().isEmpty()) {
+ feedbackInvalid("");
+ return;
+ }
+ try {
+ int uid = Integer.parseInt(value);
+ if (uid <= 0) {
+ feedbackInvalid(tr("The current value is not a valid user ID. Please enter an integer value > 0"));
+ return;
+ }
+ } catch (NumberFormatException e) {
+ feedbackInvalid(tr("The current value is not a valid user ID. Please enter an integer value > 0"));
+ return;
+ }
+ feedbackValid(tr("Please enter an integer value > 0"));
+ }
+
+ /**
+ * Returns the user identifier.
+ * @return the user identifier
+ */
+ public int getUid() {
+ String value = getComponent().getText();
+ if (value == null || value.trim().isEmpty()) return 0;
+ try {
+ int uid = Integer.parseInt(value.trim());
+ if (uid > 0)
+ return uid;
+ return 0;
+ } catch (NumberFormatException e) {
+ return 0;
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java
index 0fbc5c8..623bab1 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java
@@ -27,6 +27,10 @@ import org.openstreetmap.josm.io.ChangesetQuery.ChangesetQueryUrlException;
import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.tools.ImageProvider;
+/**
+ * This panel allows to build a changeset query from an URL.
+ * @since 2689
+ */
public class UrlBasedQueryPanel extends JPanel {
private final JosmTextField tfUrl = new JosmTextField();
@@ -149,6 +153,9 @@ public class UrlBasedQueryPanel extends JPanel {
return buildChangesetQuery(value);
}
+ /**
+ * Initializes HMI for user input.
+ */
public void startUserInput() {
tfUrl.requestFocusInWindow();
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UserRestrictionPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UserRestrictionPanel.java
new file mode 100644
index 0000000..e20886d
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UserRestrictionPanel.java
@@ -0,0 +1,309 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.changeset.query;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Color;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane;
+import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.preferences.server.UserNameValidator;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
+import org.openstreetmap.josm.io.ChangesetQuery;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
+
+/**
+ * This is the panel for selecting whether the query should be restricted to a specific user.
+ * @since 11326 (extracted from AdvancedChangesetQueryPanel)
+ */
+public class UserRestrictionPanel extends JPanel implements RestrictionPanel {
+ private static final String PREF_ROOT = "changeset-query.advanced.user-restrictions";
+ private static final String PREF_QUERY_TYPE = PREF_ROOT + ".query-type";
+
+ private final ButtonGroup bgUserRestrictions = new ButtonGroup();
+ private final JRadioButton rbRestrictToMyself = new JRadioButton();
+ private final JRadioButton rbRestrictToUid = new JRadioButton();
+ private final JRadioButton rbRestrictToUserName = new JRadioButton();
+ private final JosmTextField tfUid = new JosmTextField(10);
+ private transient UidInputFieldValidator valUid;
+ private final JosmTextField tfUserName = new JosmTextField(10);
+ private transient UserNameValidator valUserName;
+ private final JMultilineLabel lblRestrictedToMyself = new JMultilineLabel(tr("Only changesets owned by myself"));
+
+ /**
+ * Constructs a new {@code UserRestrictionPanel}.
+ */
+ public UserRestrictionPanel() {
+ build();
+ }
+
+ protected JPanel buildUidInputPanel() {
+ JPanel pnl = new JPanel(new GridBagLayout());
+ GridBagConstraints gc = new GridBagConstraints();
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 0.0;
+ gc.insets = new Insets(0, 0, 0, 3);
+ pnl.add(new JLabel(tr("User ID:")), gc);
+
+ gc.gridx = 1;
+ pnl.add(tfUid, gc);
+ SelectAllOnFocusGainedDecorator.decorate(tfUid);
+ valUid = UidInputFieldValidator.decorate(tfUid);
+
+ // grab remaining space
+ gc.gridx = 2;
+ gc.weightx = 1.0;
+ pnl.add(new JPanel(), gc);
+ return pnl;
+ }
+
+ protected JPanel buildUserNameInputPanel() {
+ JPanel pnl = new JPanel(new GridBagLayout());
+ GridBagConstraints gc = new GridBagConstraints();
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 0.0;
+ gc.insets = new Insets(0, 0, 0, 3);
+ pnl.add(new JLabel(tr("User name:")), gc);
+
+ gc.gridx = 1;
+ pnl.add(tfUserName, gc);
+ SelectAllOnFocusGainedDecorator.decorate(tfUserName);
+ valUserName = new UserNameValidator(tfUserName);
+
+ // grab remaining space
+ gc.gridx = 2;
+ gc.weightx = 1.0;
+ pnl.add(new JPanel(), gc);
+ return pnl;
+ }
+
+ protected void build() {
+ setLayout(new GridBagLayout());
+ setBorder(BorderFactory.createCompoundBorder(
+ BorderFactory.createEmptyBorder(3, 3, 3, 3),
+ BorderFactory.createCompoundBorder(
+ BorderFactory.createLineBorder(Color.GRAY),
+ BorderFactory.createEmptyBorder(5, 5, 5, 5)
+ )
+ ));
+
+ ItemListener userRestrictionChangeHandler = new UserRestrictionChangedHandler();
+ GridBagConstraints gc = new GridBagConstraints();
+ gc.anchor = GridBagConstraints.NORTHWEST;
+ gc.gridx = 0;
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 0.0;
+ add(rbRestrictToMyself, gc);
+ rbRestrictToMyself.addItemListener(userRestrictionChangeHandler);
+
+ gc.gridx = 1;
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 1.0;
+ add(lblRestrictedToMyself, gc);
+
+ gc.gridx = 0;
+ gc.gridy = 1;
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 0.0;
+ add(rbRestrictToUid, gc);
+ rbRestrictToUid.addItemListener(userRestrictionChangeHandler);
+
+ gc.gridx = 1;
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 1.0;
+ add(new JMultilineLabel(tr("Only changesets owned by the user with the following user ID")), gc);
+
+ gc.gridx = 1;
+ gc.gridy = 2;
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 1.0;
+ add(buildUidInputPanel(), gc);
+
+ gc.gridx = 0;
+ gc.gridy = 3;
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 0.0;
+ add(rbRestrictToUserName, gc);
+ rbRestrictToUserName.addItemListener(userRestrictionChangeHandler);
+
+ gc.gridx = 1;
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 1.0;
+ add(new JMultilineLabel(tr("Only changesets owned by the user with the following user name")), gc);
+
+ gc.gridx = 1;
+ gc.gridy = 4;
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 1.0;
+ add(buildUserNameInputPanel(), gc);
+
+ bgUserRestrictions.add(rbRestrictToMyself);
+ bgUserRestrictions.add(rbRestrictToUid);
+ bgUserRestrictions.add(rbRestrictToUserName);
+ }
+
+ /**
+ * Initializes HMI for user input.
+ */
+ public void startUserInput() {
+ if (JosmUserIdentityManager.getInstance().isAnonymous()) {
+ lblRestrictedToMyself.setText(tr("Only changesets owned by myself (disabled. JOSM is currently run by an anonymous user)"));
+ rbRestrictToMyself.setEnabled(false);
+ if (rbRestrictToMyself.isSelected()) {
+ rbRestrictToUid.setSelected(true);
+ }
+ } else {
+ lblRestrictedToMyself.setText(tr("Only changesets owned by myself"));
+ rbRestrictToMyself.setEnabled(true);
+ rbRestrictToMyself.setSelected(true);
+ }
+ restoreFromSettings();
+ }
+
+ /**
+ * Sets the query restrictions on <code>query</code> for changeset owner based restrictions.
+ *
+ * @param query the query. Must not be null.
+ * @throws IllegalArgumentException if query is null
+ * @throws IllegalStateException if one of the available values for query parameters in this panel isn't valid
+ */
+ @Override
+ public void fillInQuery(ChangesetQuery query) {
+ CheckParameterUtil.ensureParameterNotNull(query, "query");
+ if (rbRestrictToMyself.isSelected()) {
+ JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+ if (im.isPartiallyIdentified()) {
+ query.forUser(im.getUserName());
+ } else if (im.isFullyIdentified()) {
+ query.forUser(im.getUserId());
+ } else
+ throw new IllegalStateException(
+ tr("Cannot restrict changeset query to the current user because the current user is anonymous"));
+ } else if (rbRestrictToUid.isSelected()) {
+ int uid = valUid.getUid();
+ if (uid > 0) {
+ query.forUser(uid);
+ } else
+ throw new IllegalStateException(tr("Current value ''{0}'' for user ID is not valid", tfUid.getText()));
+ } else if (rbRestrictToUserName.isSelected()) {
+ if (!valUserName.isValid())
+ throw new IllegalStateException(
+ tr("Cannot restrict the changeset query to the user name ''{0}''", tfUserName.getText()));
+ query.forUser(tfUserName.getText());
+ }
+ }
+
+ /**
+ * Determines if the changeset query time information is valid.
+ * @return {@code true} if the changeset query time information is valid.
+ */
+ @Override
+ public boolean isValidChangesetQuery() {
+ if (rbRestrictToUid.isSelected())
+ return valUid.isValid();
+ else if (rbRestrictToUserName.isSelected())
+ return valUserName.isValid();
+ return true;
+ }
+
+ protected void alertInvalidUid() {
+ HelpAwareOptionPane.showOptionDialog(
+ this,
+ tr("Please enter a valid user ID"),
+ tr("Invalid user ID"),
+ JOptionPane.ERROR_MESSAGE,
+ HelpUtil.ht("/Dialog/ChangesetQueryDialog#InvalidUserId")
+ );
+ }
+
+ protected void alertInvalidUserName() {
+ HelpAwareOptionPane.showOptionDialog(
+ this,
+ tr("Please enter a non-empty user name"),
+ tr("Invalid user name"),
+ JOptionPane.ERROR_MESSAGE,
+ HelpUtil.ht("/Dialog/ChangesetQueryDialog#InvalidUserName")
+ );
+ }
+
+ @Override
+ public void displayMessageIfInvalid() {
+ if (rbRestrictToUid.isSelected()) {
+ if (!valUid.isValid()) {
+ alertInvalidUid();
+ }
+ } else if (rbRestrictToUserName.isSelected()) {
+ if (!valUserName.isValid()) {
+ alertInvalidUserName();
+ }
+ }
+ }
+
+ /**
+ * Remember settings in preferences.
+ */
+ public void rememberSettings() {
+ if (rbRestrictToMyself.isSelected()) {
+ Main.pref.put(PREF_QUERY_TYPE, "mine");
+ } else if (rbRestrictToUid.isSelected()) {
+ Main.pref.put(PREF_QUERY_TYPE, "uid");
+ } else if (rbRestrictToUserName.isSelected()) {
+ Main.pref.put(PREF_QUERY_TYPE, "username");
+ }
+ Main.pref.put(PREF_ROOT + ".uid", tfUid.getText());
+ Main.pref.put(PREF_ROOT + ".username", tfUserName.getText());
+ }
+
+ /**
+ * Restore settings from preferences.
+ */
+ public void restoreFromSettings() {
+ String v = Main.pref.get(PREF_QUERY_TYPE, "mine");
+ if ("mine".equals(v)) {
+ JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+ if (im.isAnonymous()) {
+ rbRestrictToUid.setSelected(true);
+ } else {
+ rbRestrictToMyself.setSelected(true);
+ }
+ } else if ("uid".equals(v)) {
+ rbRestrictToUid.setSelected(true);
+ } else if ("username".equals(v)) {
+ rbRestrictToUserName.setSelected(true);
+ }
+ tfUid.setText(Main.pref.get(PREF_ROOT + ".uid", ""));
+ if (!valUid.isValid()) {
+ tfUid.setText("");
+ }
+ tfUserName.setText(Main.pref.get(PREF_ROOT + ".username", ""));
+ }
+
+ class UserRestrictionChangedHandler implements ItemListener {
+ @Override
+ public void itemStateChanged(ItemEvent e) {
+ tfUid.setEnabled(rbRestrictToUid.isSelected());
+ tfUserName.setEnabled(rbRestrictToUserName.isSelected());
+ if (rbRestrictToUid.isSelected()) {
+ tfUid.requestFocusInWindow();
+ } else if (rbRestrictToUserName.isSelected()) {
+ tfUserName.requestFocusInWindow();
+ }
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java b/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java
index 71524fb..748f87d 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java
@@ -24,6 +24,28 @@ import org.openstreetmap.josm.tools.GBC;
*/
public class PresetListPanel extends JPanel {
+ static final class LabelMouseAdapter extends MouseAdapter {
+ private final TaggingPreset t;
+ private final TaggingPresetHandler presetHandler;
+
+ LabelMouseAdapter(TaggingPreset t, TaggingPresetHandler presetHandler) {
+ this.t = t;
+ this.presetHandler = presetHandler;
+ }
+
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ Collection<OsmPrimitive> selection = t.createSelection(presetHandler.getSelection());
+ if (selection.isEmpty())
+ return;
+ int answer = t.showDialog(selection, false);
+
+ if (answer == TaggingPreset.DIALOG_ANSWER_APPLY) {
+ presetHandler.updateTags(t.getChangedTags());
+ }
+ }
+ }
+
/**
* Constructs a new {@code PresetListPanel}.
*/
@@ -49,19 +71,7 @@ public class PresetListPanel extends JPanel {
for (final TaggingPreset t : TaggingPresets.getMatchingPresets(types, tags, true)) {
final JLabel lbl = new TaggingPresetLabel(t);
- lbl.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent e) {
- Collection<OsmPrimitive> selection = t.createSelection(presetHandler.getSelection());
- if (selection == null || selection.isEmpty())
- return;
- int answer = t.showDialog(selection, false);
-
- if (answer == TaggingPreset.DIALOG_ANSWER_APPLY) {
- presetHandler.updateTags(t.getChangedTags());
- }
- }
- });
+ lbl.addMouseListener(new LabelMouseAdapter(t, presetHandler));
add(lbl, GBC.eol().fill(GBC.HORIZONTAL));
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
index 9e5039d..398f749 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
@@ -232,20 +232,7 @@ implements SelectionChangedListener, ActiveLayerChangeListener, DataSetListenerA
}
};
- private final transient TaggingPresetHandler presetHandler = new TaggingPresetHandler() {
- @Override
- public void updateTags(List<Tag> tags) {
- Command command = TaggingPreset.createCommand(getSelection(), tags);
- if (command != null) {
- Main.main.undoRedo.add(command);
- }
- }
-
- @Override
- public Collection<OsmPrimitive> getSelection() {
- return Main.main == null ? Collections.<OsmPrimitive>emptyList() : Main.main.getInProgressSelection();
- }
- };
+ private final transient TaggingPresetHandler presetHandler = new TaggingPresetCommandHandler();
/**
* Create a new PropertiesDialog
@@ -338,57 +325,9 @@ implements SelectionChangedListener, ActiveLayerChangeListener, DataSetListenerA
TableColumnModel mod = membershipTable.getColumnModel();
membershipTable.getTableHeader().setReorderingAllowed(false);
- mod.getColumn(0).setCellRenderer(new DefaultTableCellRenderer() {
- @Override public Component getTableCellRendererComponent(JTable table, Object value,
- boolean isSelected, boolean hasFocus, int row, int column) {
- Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);
- if (value == null)
- return this;
- if (c instanceof JLabel) {
- JLabel label = (JLabel) c;
- Relation r = (Relation) value;
- label.setText(r.getDisplayName(DefaultNameFormatter.getInstance()));
- if (r.isDisabledAndHidden()) {
- label.setFont(label.getFont().deriveFont(Font.ITALIC));
- }
- }
- return c;
- }
- });
-
- mod.getColumn(1).setCellRenderer(new DefaultTableCellRenderer() {
- @Override public Component getTableCellRendererComponent(JTable table, Object value,
- boolean isSelected, boolean hasFocus, int row, int column) {
- if (value == null)
- return this;
- Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);
- boolean isDisabledAndHidden = ((Relation) table.getValueAt(row, 0)).isDisabledAndHidden();
- if (c instanceof JLabel) {
- JLabel label = (JLabel) c;
- label.setText(((MemberInfo) value).getRoleString());
- if (isDisabledAndHidden) {
- label.setFont(label.getFont().deriveFont(Font.ITALIC));
- }
- }
- return c;
- }
- });
-
- mod.getColumn(2).setCellRenderer(new DefaultTableCellRenderer() {
- @Override public Component getTableCellRendererComponent(JTable table, Object value,
- boolean isSelected, boolean hasFocus, int row, int column) {
- Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);
- boolean isDisabledAndHidden = ((Relation) table.getValueAt(row, 0)).isDisabledAndHidden();
- if (c instanceof JLabel) {
- JLabel label = (JLabel) c;
- label.setText(((MemberInfo) table.getValueAt(row, 1)).getPositionString());
- if (isDisabledAndHidden) {
- label.setFont(label.getFont().deriveFont(Font.ITALIC));
- }
- }
- return c;
- }
- });
+ mod.getColumn(0).setCellRenderer(new MemberOfCellRenderer());
+ mod.getColumn(1).setCellRenderer(new RoleCellRenderer());
+ mod.getColumn(2).setCellRenderer(new PositionCellRenderer());
mod.getColumn(2).setPreferredWidth(20);
mod.getColumn(1).setPreferredWidth(40);
mod.getColumn(0).setPreferredWidth(200);
@@ -400,15 +339,7 @@ implements SelectionChangedListener, ActiveLayerChangeListener, DataSetListenerA
private void setupBlankSpaceMenu() {
if (Main.pref.getBoolean("properties.menu.add_edit_delete", true)) {
blankSpaceMenuHandler.addAction(addAction);
- PopupMenuLauncher launcher = new PopupMenuLauncher(blankSpaceMenu) {
- @Override
- protected boolean checkSelection(Component component, Point p) {
- if (component instanceof JTable) {
- return ((JTable) component).rowAtPoint(p) == -1;
- }
- return true;
- }
- };
+ PopupMenuLauncher launcher = new BlankSpaceMenuLauncher(blankSpaceMenu);
bothTables.addMouseListener(launcher);
tagTable.addMouseListener(launcher);
}
@@ -453,10 +384,8 @@ implements SelectionChangedListener, ActiveLayerChangeListener, DataSetListenerA
//update highlights
if (Main.isDisplayingMapView()) {
int row = membershipTable.rowAtPoint(e.getPoint());
- if (row >= 0) {
- if (highlightHelper.highlightOnly((Relation) membershipTable.getValueAt(row, 0))) {
- Main.map.mapView.repaint();
- }
+ if (row >= 0 && highlightHelper.highlightOnly((Relation) membershipTable.getValueAt(row, 0))) {
+ Main.map.mapView.repaint();
}
}
super.mouseClicked(e);
@@ -830,6 +759,90 @@ implements SelectionChangedListener, ActiveLayerChangeListener, DataSetListenerA
cellRenderer.removeCustomRenderer(renderer);
}
+ static final class MemberOfCellRenderer extends DefaultTableCellRenderer {
+ @Override
+ public Component getTableCellRendererComponent(JTable table, Object value,
+ boolean isSelected, boolean hasFocus, int row, int column) {
+ Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);
+ if (value == null)
+ return this;
+ if (c instanceof JLabel) {
+ JLabel label = (JLabel) c;
+ Relation r = (Relation) value;
+ label.setText(r.getDisplayName(DefaultNameFormatter.getInstance()));
+ if (r.isDisabledAndHidden()) {
+ label.setFont(label.getFont().deriveFont(Font.ITALIC));
+ }
+ }
+ return c;
+ }
+ }
+
+ static final class RoleCellRenderer extends DefaultTableCellRenderer {
+ @Override
+ public Component getTableCellRendererComponent(JTable table, Object value,
+ boolean isSelected, boolean hasFocus, int row, int column) {
+ if (value == null)
+ return this;
+ Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);
+ boolean isDisabledAndHidden = ((Relation) table.getValueAt(row, 0)).isDisabledAndHidden();
+ if (c instanceof JLabel) {
+ JLabel label = (JLabel) c;
+ label.setText(((MemberInfo) value).getRoleString());
+ if (isDisabledAndHidden) {
+ label.setFont(label.getFont().deriveFont(Font.ITALIC));
+ }
+ }
+ return c;
+ }
+ }
+
+ static final class PositionCellRenderer extends DefaultTableCellRenderer {
+ @Override
+ public Component getTableCellRendererComponent(JTable table, Object value,
+ boolean isSelected, boolean hasFocus, int row, int column) {
+ Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);
+ boolean isDisabledAndHidden = ((Relation) table.getValueAt(row, 0)).isDisabledAndHidden();
+ if (c instanceof JLabel) {
+ JLabel label = (JLabel) c;
+ label.setText(((MemberInfo) table.getValueAt(row, 1)).getPositionString());
+ if (isDisabledAndHidden) {
+ label.setFont(label.getFont().deriveFont(Font.ITALIC));
+ }
+ }
+ return c;
+ }
+ }
+
+ static final class BlankSpaceMenuLauncher extends PopupMenuLauncher {
+ BlankSpaceMenuLauncher(JPopupMenu menu) {
+ super(menu);
+ }
+
+ @Override
+ protected boolean checkSelection(Component component, Point p) {
+ if (component instanceof JTable) {
+ return ((JTable) component).rowAtPoint(p) == -1;
+ }
+ return true;
+ }
+ }
+
+ static final class TaggingPresetCommandHandler implements TaggingPresetHandler {
+ @Override
+ public void updateTags(List<Tag> tags) {
+ Command command = TaggingPreset.createCommand(getSelection(), tags);
+ if (command != null) {
+ Main.main.undoRedo.add(command);
+ }
+ }
+
+ @Override
+ public Collection<OsmPrimitive> getSelection() {
+ return Main.main == null ? Collections.<OsmPrimitive>emptyList() : Main.main.getInProgressSelection();
+ }
+ }
+
/**
* Class that watches for mouse clicks
* @author imi
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollection.java b/src/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollection.java
index cf83ca8..264b5d9 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollection.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollection.java
@@ -14,17 +14,28 @@ import org.openstreetmap.josm.data.preferences.CollectionProperty;
class RecentTagCollection {
+ /**
+ * LRU cache for recently added tags (http://java-planet.blogspot.com/2005/08/how-to-set-up-simple-lru-cache-using.html)
+ */
+ static final class LruCache extends LinkedHashMap<Tag, Void> {
+ private final int capacity;
+
+ LruCache(int capacity) {
+ super(capacity + 1, 1.1f, true);
+ this.capacity = capacity;
+ }
+
+ @Override
+ protected boolean removeEldestEntry(Map.Entry<Tag, Void> eldest) {
+ return size() > capacity;
+ }
+ }
+
private final Map<Tag, Void> recentTags;
private SearchCompiler.Match tagsToIgnore;
RecentTagCollection(final int capacity) {
- // LRU cache for recently added tags (http://java-planet.blogspot.com/2005/08/how-to-set-up-simple-lru-cache-using.html)
- recentTags = new LinkedHashMap<Tag, Void>(capacity + 1, 1.1f, true) {
- @Override
- protected boolean removeEldestEntry(Map.Entry<Tag, Void> eldest) {
- return size() > capacity;
- }
- };
+ recentTags = new LruCache(capacity);
tagsToIgnore = SearchCompiler.Never.INSTANCE;
}
@@ -63,12 +74,7 @@ class RecentTagCollection {
public void setTagsToIgnore(SearchCompiler.Match tagsToIgnore) {
this.tagsToIgnore = tagsToIgnore;
- final Iterator<Tag> it = recentTags.keySet().iterator();
- while (it.hasNext()) {
- if (tagsToIgnore.match(it.next())) {
- it.remove();
- }
- }
+ recentTags.keySet().removeIf(tagsToIgnore::match);
}
public void setTagsToIgnore(SearchAction.SearchSetting tagsToIgnore) throws SearchCompiler.ParseError {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java b/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
index 69c126b..aece652 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
@@ -32,11 +32,11 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.TreeMap;
+import java.util.stream.IntStream;
import javax.swing.AbstractAction;
import javax.swing.Action;
@@ -109,9 +109,6 @@ public class TagEditHelper {
private final Comparator<AutoCompletionListItem> defaultACItemComparator =
(o1, o2) -> String.CASE_INSENSITIVE_ORDER.compare(o1.getValue(), o2.getValue());
- private String lastAddKey;
- private String lastAddValue;
-
/** Default number of recent tags */
public static final int DEFAULT_LRU_TAGS_NUMBER = 5;
/** Maximum number of recent tags */
@@ -163,9 +160,21 @@ public class TagEditHelper {
final RecentTagCollection recentTags = new RecentTagCollection(MAX_LRU_TAGS_NUMBER);
SearchAction.SearchSetting tagsToIgnore;
- // Copy of recently added tags, used to cache initial status
+ /**
+ * Copy of recently added tags in sorted from newest to oldest order.
+ *
+ * We store the maximum number of recent tags to allow dynamic change of number of tags shown in the preferences.
+ * Used to cache initial status.
+ */
private List<Tag> tags;
+ static {
+ // init user input based on recent tags
+ final RecentTagCollection recentTags = new RecentTagCollection(MAX_LRU_TAGS_NUMBER);
+ recentTags.loadFromPreference(PROPERTY_RECENT_TAGS);
+ recentTags.toList().forEach(tag -> AutoCompletionManager.rememberUserInput(tag.getKey(), tag.getValue(), false));
+ }
+
/**
* Constructs a new {@code TagEditHelper}.
* @param tagTable tag table
@@ -187,6 +196,12 @@ public class TagEditHelper {
return tagData.getValueAt(tagTable.convertRowIndexToModel(viewRow), 0).toString();
}
+ private boolean containsDataKey(String key) {
+ return IntStream.range(0, tagData.getRowCount())
+ .mapToObj(i -> tagData.getValueAt(i, 0) /* sic! do not use getDataKey*/)
+ .anyMatch(key::equals);
+ }
+
/**
* Finds the values from given row of tag editor.
* @param viewRow index of row
@@ -334,6 +349,7 @@ public class TagEditHelper {
*/
private void cacheRecentTags() {
tags = recentTags.toList();
+ Collections.reverse(tags);
}
/**
@@ -664,27 +680,12 @@ public class TagEditHelper {
"This will change up to {0} objects.", sel.size(), sel.size())
+"<br><br>"+tr("Please select a key")), GBC.eol().fill(GBC.HORIZONTAL));
+ cacheRecentTags();
AutoCompletionManager autocomplete = Main.getLayerManager().getEditLayer().data.getAutoCompletionManager();
List<AutoCompletionListItem> keyList = autocomplete.getKeys();
- AutoCompletionListItem itemToSelect = null;
// remove the object's tag keys from the list
- Iterator<AutoCompletionListItem> iter = keyList.iterator();
- while (iter.hasNext()) {
- AutoCompletionListItem item = iter.next();
- if (item.getValue().equals(lastAddKey)) {
- itemToSelect = item;
- }
- for (int i = 0; i < tagData.getRowCount(); ++i) {
- if (item.getValue().equals(tagData.getValueAt(i, 0) /* sic! do not use getDataKey*/)) {
- if (itemToSelect == item) {
- itemToSelect = null;
- }
- iter.remove();
- break;
- }
- }
- }
+ keyList.removeIf(item -> containsDataKey(item.getValue()));
keyList.sort(defaultACItemComparator);
keys.setPossibleACItems(keyList);
@@ -695,12 +696,15 @@ public class TagEditHelper {
mainPanel.add(new JLabel(tr("Please select a value")), GBC.eol());
values.setEditable(true);
mainPanel.add(values, GBC.eop().fill(GBC.HORIZONTAL));
- if (itemToSelect != null) {
- keys.setSelectedItem(itemToSelect);
- if (lastAddValue != null) {
- values.setSelectedItem(lastAddValue);
- }
- }
+
+ // pre-fill first recent tag for which the key is not already present
+ tags.stream()
+ .filter(tag -> !containsDataKey(tag.getKey()))
+ .findFirst()
+ .ifPresent(tag -> {
+ keys.setSelectedItem(tag.getKey());
+ values.setSelectedItem(tag.getValue());
+ });
focus = addFocusAdapter(autocomplete, defaultACItemComparator);
// fire focus event in advance or otherwise the popup list will be too small at first
@@ -718,7 +722,6 @@ public class TagEditHelper {
}
});
- cacheRecentTags();
suggestRecentlyAddedTags();
mainPanel.add(Box.createVerticalGlue(), GBC.eop().fill());
@@ -860,10 +863,7 @@ public class TagEditHelper {
int count = 0;
destroyActions();
- // We store the maximum number of recent tags to allow dynamic change of number of tags shown in the preferences.
- // This implies to iterate in descending order, as the oldest elements will only be removed after we reach the maximum
- // number and not the number of tags to show.
- for (int i = tags.size()-1; i >= 0 && count < tagsToShow; i--) {
+ for (int i = 0; i < tags.size() && count < tagsToShow; i++) {
final Tag t = tags.get(i);
boolean keyExists = keyExists(t);
if (keyExists && PROPERTY_RECENT_EXISTING.get() == RecentExisting.HIDE)
@@ -1055,8 +1055,6 @@ public class TagEditHelper {
break;
}
}
- lastAddKey = key;
- lastAddValue = value;
recentTags.add(new Tag(key, value));
valueCount.put(key, new TreeMap<String, Integer>());
AutoCompletionManager.rememberUserInput(key, value, false);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
index 3ba7711..3bf2dfd 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
@@ -8,7 +8,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
@@ -348,13 +347,7 @@ implements TableModelListener, SelectionChangedListener, DataSetListener, OsmPri
public void removeMembersReferringTo(List<? extends OsmPrimitive> primitives) {
if (primitives == null)
return;
- Iterator<RelationMember> it = members.iterator();
- while (it.hasNext()) {
- RelationMember member = it.next();
- if (primitives.contains(member.getMember())) {
- it.remove();
- }
- }
+ members.removeIf(member -> primitives.contains(member.getMember()));
fireTableDataChanged();
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java b/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
index 4a77e6e..20fd1e6 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
@@ -29,6 +29,16 @@ import javax.swing.tree.TreeSelectionModel;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
+import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
+import org.openstreetmap.josm.data.osm.event.DataSetListener;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
+import org.openstreetmap.josm.data.osm.event.NodeMovedEvent;
+import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent;
+import org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent;
+import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent;
+import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
+import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
import org.openstreetmap.josm.data.validation.Severity;
import org.openstreetmap.josm.data.validation.TestError;
import org.openstreetmap.josm.data.validation.util.MultipleNameVisitor;
@@ -45,7 +55,7 @@ import org.openstreetmap.josm.tools.ListenerList;
*
* @author frsantos
*/
-public class ValidatorTreePanel extends JTree implements Destroyable {
+public class ValidatorTreePanel extends JTree implements Destroyable, DataSetListener {
private static final class GroupTreeNode extends DefaultMutableTreeNode {
@@ -95,6 +105,7 @@ public class ValidatorTreePanel extends JTree implements Destroyable {
removeKeyListener(keyListener);
}
}
+ DatasetEventManager.getInstance().addDatasetListener(this, DatasetEventManager.FireMode.IN_EDT);
}
@Override
@@ -302,13 +313,9 @@ public class ValidatorTreePanel extends JTree implements Destroyable {
if (errors == null)
return;
clearErrors();
- DataSet ds = Main.getLayerManager().getEditDataSet();
for (TestError error : newerrors) {
if (!error.isIgnored()) {
errors.add(error);
- if (ds != null) {
- ds.addDataSetListener(error);
- }
}
}
if (isVisible()) {
@@ -346,10 +353,8 @@ public class ValidatorTreePanel extends JTree implements Destroyable {
if (getModel().isLeaf(child) && child instanceof DefaultMutableTreeNode
&& ((DefaultMutableTreeNode) child).getUserObject() instanceof TestError) {
final TestError error = (TestError) ((DefaultMutableTreeNode) child).getUserObject();
- if (error.getPrimitives() != null) {
- if (error.getPrimitives().stream().anyMatch(isRelevant)) {
- paths.add(p.pathByAddingChild(child));
- }
+ if (error.getPrimitives().stream().anyMatch(isRelevant)) {
+ paths.add(p.pathByAddingChild(child));
}
} else {
walkAndSelectRelatedErrors(p.pathByAddingChild(child), isRelevant, paths);
@@ -413,18 +418,52 @@ public class ValidatorTreePanel extends JTree implements Destroyable {
private void clearErrors() {
if (errors != null) {
- DataSet ds = Main.getLayerManager().getEditDataSet();
- if (ds != null) {
- for (TestError e : errors) {
- ds.removeDataSetListener(e);
- }
- }
errors.clear();
}
}
@Override
public void destroy() {
+ DataSet ds = Main.getLayerManager().getEditDataSet();
+ if (ds != null) {
+ ds.removeDataSetListener(this);
+ }
clearErrors();
}
+
+ @Override public void primitivesRemoved(PrimitivesRemovedEvent event) {
+ // Remove purged primitives (fix #8639)
+ if (errors != null) {
+ final Set<? extends OsmPrimitive> deletedPrimitives = new HashSet<>(event.getPrimitives());
+ errors.removeIf(error -> error.getPrimitives().stream().anyMatch(deletedPrimitives::contains));
+ }
+ }
+
+ @Override public void primitivesAdded(PrimitivesAddedEvent event) {
+ // Do nothing
+ }
+
+ @Override public void tagsChanged(TagsChangedEvent event) {
+ // Do nothing
+ }
+
+ @Override public void nodeMoved(NodeMovedEvent event) {
+ // Do nothing
+ }
+
+ @Override public void wayNodesChanged(WayNodesChangedEvent event) {
+ // Do nothing
+ }
+
+ @Override public void relationMembersChanged(RelationMembersChangedEvent event) {
+ // Do nothing
+ }
+
+ @Override public void otherDatasetChange(AbstractDatasetChangedEvent event) {
+ // Do nothing
+ }
+
+ @Override public void dataChanged(DataChangedEvent event) {
+ // Do nothing
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/download/DownloadDialog.java b/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
index 48a8401..38ab686 100644
--- a/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
+++ b/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
@@ -35,6 +35,8 @@ import javax.swing.event.ChangeListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.ExpertToggleAction;
import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
+import org.openstreetmap.josm.data.preferences.IntegerProperty;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
@@ -46,12 +48,21 @@ import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.InputMapUtils;
import org.openstreetmap.josm.tools.OsmUrlToBounds;
+import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.WindowGeometry;
/**
* Dialog displayed to download OSM and/or GPS data from OSM server.
*/
public class DownloadDialog extends JDialog {
+ private static final IntegerProperty DOWNLOAD_TAB = new IntegerProperty("download.tab", 0);
+
+ private static final BooleanProperty DOWNLOAD_AUTORUN = new BooleanProperty("download.autorun", false);
+ private static final BooleanProperty DOWNLOAD_OSM = new BooleanProperty("download.osm", true);
+ private static final BooleanProperty DOWNLOAD_GPS = new BooleanProperty("download.gps", false);
+ private static final BooleanProperty DOWNLOAD_NOTES = new BooleanProperty("download.notes", false);
+ private static final BooleanProperty DOWNLOAD_NEWLAYER = new BooleanProperty("download.newlayer", false);
+
/** the unique instance of the download dialog */
private static DownloadDialog instance;
@@ -130,10 +141,10 @@ public class DownloadDialog extends JDialog {
pnl.add(tpDownloadAreaSelectors, GBC.eol().fill());
try {
- tpDownloadAreaSelectors.setSelectedIndex(Main.pref.getInteger("download.tab", 0));
+ tpDownloadAreaSelectors.setSelectedIndex(DOWNLOAD_TAB.get());
} catch (IndexOutOfBoundsException ex) {
Main.trace(ex);
- Main.pref.putInteger("download.tab", 0);
+ DOWNLOAD_TAB.put(0);
}
Font labelFont = sizeCheck.getFont();
@@ -147,7 +158,7 @@ public class DownloadDialog extends JDialog {
cbStartup.setToolTipText(
tr("<html>Autostart ''Download from OSM'' dialog every time JOSM is started.<br>" +
"You can open it manually from File menu or toolbar.</html>"));
- cbStartup.addActionListener(e -> Main.pref.put("download.autorun", cbStartup.isSelected()));
+ cbStartup.addActionListener(e -> DOWNLOAD_AUTORUN.put(cbStartup.isSelected()));
pnl.add(cbNewLayer, GBC.std().anchor(GBC.WEST).insets(5, 5, 5, 5));
pnl.add(cbStartup, GBC.std().anchor(GBC.WEST).insets(15, 5, 5, 5));
@@ -350,11 +361,11 @@ public class DownloadDialog extends JDialog {
* Remembers the current settings in the download dialog.
*/
public void rememberSettings() {
- Main.pref.put("download.tab", Integer.toString(tpDownloadAreaSelectors.getSelectedIndex()));
- Main.pref.put("download.osm", cbDownloadOsmData.isSelected());
- Main.pref.put("download.gps", cbDownloadGpxData.isSelected());
- Main.pref.put("download.notes", cbDownloadNotes.isSelected());
- Main.pref.put("download.newlayer", cbNewLayer.isSelected());
+ DOWNLOAD_TAB.put(tpDownloadAreaSelectors.getSelectedIndex());
+ DOWNLOAD_OSM.put(cbDownloadOsmData.isSelected());
+ DOWNLOAD_GPS.put(cbDownloadGpxData.isSelected());
+ DOWNLOAD_NOTES.put(cbDownloadNotes.isSelected());
+ DOWNLOAD_NEWLAYER.put(cbNewLayer.isSelected());
if (currentBounds != null) {
Main.pref.put("osm-download.bounds", currentBounds.encodeAsString(";"));
}
@@ -364,15 +375,12 @@ public class DownloadDialog extends JDialog {
* Restores the previous settings in the download dialog.
*/
public void restoreSettings() {
- cbDownloadOsmData.setSelected(Main.pref.getBoolean("download.osm", true));
- cbDownloadGpxData.setSelected(Main.pref.getBoolean("download.gps", false));
- cbDownloadNotes.setSelected(Main.pref.getBoolean("download.notes", false));
- cbNewLayer.setSelected(Main.pref.getBoolean("download.newlayer", false));
+ cbDownloadOsmData.setSelected(DOWNLOAD_OSM.get());
+ cbDownloadGpxData.setSelected(DOWNLOAD_GPS.get());
+ cbDownloadNotes.setSelected(DOWNLOAD_NOTES.get());
+ cbNewLayer.setSelected(DOWNLOAD_NEWLAYER.get());
cbStartup.setSelected(isAutorunEnabled());
- int idx = Main.pref.getInteger("download.tab", 0);
- if (idx < 0 || idx > tpDownloadAreaSelectors.getTabCount()) {
- idx = 0;
- }
+ int idx = Utils.clamp(DOWNLOAD_TAB.get(), 0, tpDownloadAreaSelectors.getTabCount() - 1);
tpDownloadAreaSelectors.setSelectedIndex(idx);
if (Main.isDisplayingMapView()) {
@@ -413,7 +421,7 @@ public class DownloadDialog extends JDialog {
* @return {@code true} if the download dialog must be open at startup, {@code false} otherwise
*/
public static boolean isAutorunEnabled() {
- return Main.pref.getBoolean("download.autorun", false);
+ return DOWNLOAD_AUTORUN.get();
}
/**
diff --git a/src/org/openstreetmap/josm/gui/draw/MapViewPath.java b/src/org/openstreetmap/josm/gui/draw/MapViewPath.java
index 3a9301b..3cdae85 100644
--- a/src/org/openstreetmap/josm/gui/draw/MapViewPath.java
+++ b/src/org/openstreetmap/josm/gui/draw/MapViewPath.java
@@ -234,6 +234,7 @@ public class MapViewPath extends MapPath2D {
* @author Michael Zangl
* @since 11147
*/
+ @FunctionalInterface
public interface PathSegmentConsumer {
/**
@@ -255,7 +256,7 @@ public class MapViewPath extends MapPath2D {
private MapViewPoint lastMoveTo;
private MapViewPoint cursor;
- private boolean cursorIsActive = false;
+ private boolean cursorIsActive;
/**
* Create a new {@link ClampingPathVisitor}
@@ -338,7 +339,7 @@ public class MapViewPath extends MapPath2D {
}
double distance = Math.sqrt(distanceSq);
- double offset = ((strokeProgress + distance)) % strokeLength;
+ double offset = (strokeProgress + distance) % strokeLength;
if (offset < 0.01) {
return entry;
}
diff --git a/src/org/openstreetmap/josm/gui/help/HelpUtil.java b/src/org/openstreetmap/josm/gui/help/HelpUtil.java
index b1a6644..dd7f1af 100644
--- a/src/org/openstreetmap/josm/gui/help/HelpUtil.java
+++ b/src/org/openstreetmap/josm/gui/help/HelpUtil.java
@@ -68,7 +68,8 @@ public final class HelpUtil {
*/
public static String getHelpTopicEditUrl(String absoluteHelpTopic) {
String topicUrl = getHelpTopicUrl(absoluteHelpTopic);
- topicUrl = topicUrl.replaceAll("#[^#]*$", ""); // remove optional fragment
+ if (topicUrl != null)
+ topicUrl = topicUrl.replaceAll("#[^#]*$", ""); // remove optional fragment
return topicUrl + "?action=edit";
}
@@ -83,7 +84,10 @@ public final class HelpUtil {
String topic = extractAbsoluteHelpTopic(url);
if (topic == null)
return null;
- String pattern = "/[A-Z][a-z]{1,2}(_[A-Z]{2})?:" + getHelpTopicPrefix(LocaleType.ENGLISH).replaceAll("^\\/+", "");
+ String topicPrefix = getHelpTopicPrefix(LocaleType.ENGLISH);
+ if (topicPrefix != null)
+ topicPrefix = topicPrefix.replaceAll("^\\/+", "");
+ String pattern = "/[A-Z][a-z]{1,2}(_[A-Z]{2})?:" + topicPrefix;
if (url.matches(pattern)) {
return topic.substring(pattern.length());
}
@@ -99,14 +103,14 @@ public final class HelpUtil {
*/
public static String extractAbsoluteHelpTopic(String url) {
if (url == null || !url.startsWith(getWikiBaseHelpUrl())) return null;
- url = url.substring(getWikiBaseHelpUrl().length());
+ String topic = url.substring(getWikiBaseHelpUrl().length());
String prefix = getHelpTopicPrefix(LocaleType.ENGLISH);
- if (url.startsWith(prefix))
- return url;
+ if (prefix == null || topic.startsWith(prefix))
+ return topic;
String pattern = "/[A-Z][a-z]{1,2}(_[A-Z]{2})?:" + prefix.replaceAll("^\\/+", "");
- if (url.matches(pattern))
- return url;
+ if (topic.matches(pattern))
+ return topic;
return null;
}
diff --git a/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java b/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
index 220fe1e..e1a9cd4 100644
--- a/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
+++ b/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
@@ -36,10 +36,36 @@ import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
*/
public final class HistoryBrowserDialogManager implements LayerChangeListener {
+ static final class UnloadedHistoryPredicate implements Predicate<PrimitiveId> {
+ private final HistoryDataSet hds = HistoryDataSet.getInstance();
+
+ @Override
+ public boolean test(PrimitiveId p) {
+ History h = hds.getHistory(p);
+ if (h == null)
+ // reload if the history is not in the cache yet
+ return true;
+ else
+ // reload if the history object of the selected object is not in the cache yet
+ return !p.isNew() && h.getByVersion(p.getUniqueId()) == null;
+ }
+ }
+
private static final String WINDOW_GEOMETRY_PREF = HistoryBrowserDialogManager.class.getName() + ".geometry";
private static HistoryBrowserDialogManager instance;
+ private final Map<Long, HistoryBrowserDialog> dialogs;
+
+ private final Predicate<PrimitiveId> unloadedHistoryPredicate = new UnloadedHistoryPredicate();
+
+ private final Predicate<PrimitiveId> notNewPredicate = p -> !p.isNew();
+
+ protected HistoryBrowserDialogManager() {
+ dialogs = new HashMap<>();
+ Main.getLayerManager().addLayerChangeListener(this);
+ }
+
/**
* Replies the unique instance.
* @return the unique instance
@@ -51,13 +77,6 @@ public final class HistoryBrowserDialogManager implements LayerChangeListener {
return instance;
}
- private final Map<Long, HistoryBrowserDialog> dialogs;
-
- protected HistoryBrowserDialogManager() {
- dialogs = new HashMap<>();
- Main.getLayerManager().addLayerChangeListener(this);
- }
-
/**
* Determines if an history dialog exists for the given object id.
* @param id the object id
@@ -210,22 +229,4 @@ public final class HistoryBrowserDialogManager implements LayerChangeListener {
};
Main.worker.submit(r);
}
-
- private final Predicate<PrimitiveId> unloadedHistoryPredicate = new Predicate<PrimitiveId>() {
-
- private HistoryDataSet hds = HistoryDataSet.getInstance();
-
- @Override
- public boolean test(PrimitiveId p) {
- History h = hds.getHistory(p);
- if (h == null)
- // reload if the history is not in the cache yet
- return true;
- else
- // reload if the history object of the selected object is not in the cache yet
- return !p.isNew() && h.getByVersion(p.getUniqueId()) == null;
- }
- };
-
- private final Predicate<PrimitiveId> notNewPredicate = p -> !p.isNew();
}
diff --git a/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java b/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
index 639ecbe..ed5704c 100644
--- a/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
+++ b/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
@@ -15,6 +15,7 @@ import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableModel;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -422,18 +423,21 @@ public class HistoryBrowserModel extends ChangeNotifier implements ActiveLayerCh
@Override
public Object getValueAt(int row, int column) {
switch (column) {
- case 0:
- return Long.toString(getPrimitive(row).getVersion());
- case 1:
+ case VersionTableColumnModel.COL_VERSION:
+ HistoryOsmPrimitive p1 = getPrimitive(row);
+ if (p1 != null)
+ return Long.toString(p1.getVersion());
+ return null;
+ case VersionTableColumnModel.COL_REFERENCE:
return isReferencePointInTime(row);
- case 2:
+ case VersionTableColumnModel.COL_CURRENT:
return isCurrentPointInTime(row);
- case 3:
+ case VersionTableColumnModel.COL_DATE:
HistoryOsmPrimitive p3 = getPrimitive(row);
if (p3 != null && p3.getTimestamp() != null)
return DateUtils.formatDateTime(p3.getTimestamp(), DateFormat.SHORT, DateFormat.SHORT);
return null;
- case 4:
+ case VersionTableColumnModel.COL_USER:
HistoryOsmPrimitive p4 = getPrimitive(row);
if (p4 != null) {
User user = p4.getUser();
@@ -441,6 +445,15 @@ public class HistoryBrowserModel extends ChangeNotifier implements ActiveLayerCh
return user.getName();
}
return null;
+ case VersionTableColumnModel.COL_EDITOR:
+ HistoryOsmPrimitive p5 = getPrimitive(row);
+ if (p5 != null) {
+ Changeset cs = p5.getChangeset();
+ if (cs != null) {
+ return cs.get("created_by");
+ }
+ }
+ return null;
}
return null;
}
diff --git a/src/org/openstreetmap/josm/gui/history/NodeListViewer.java b/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
index 799e426..f0c53ee 100644
--- a/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
+++ b/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
@@ -43,7 +43,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
* <li>on the left, it displays the node list for the version at {@link PointInTimeType#REFERENCE_POINT_IN_TIME}</li>
* <li>on the right, it displays the node list for the version at {@link PointInTimeType#CURRENT_POINT_IN_TIME}</li>
* </ul>
- *
+ * @since 1709
*/
public class NodeListViewer extends JPanel {
@@ -73,7 +73,7 @@ public class NodeListViewer extends JPanel {
final DiffTableModel tableModel = model.getNodeListTableModel(PointInTimeType.REFERENCE_POINT_IN_TIME);
final NodeListTableColumnModel columnModel = new NodeListTableColumnModel();
final JTable table = new JTable(tableModel, columnModel);
- tableModel.addTableModelListener(newReversedChangeListener(table, columnModel));
+ tableModel.addTableModelListener(new ReversedChangeListener(table, columnModel));
table.setName("table.referencenodelisttable");
table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());
@@ -86,7 +86,7 @@ public class NodeListViewer extends JPanel {
final DiffTableModel tableModel = model.getNodeListTableModel(PointInTimeType.CURRENT_POINT_IN_TIME);
final NodeListTableColumnModel columnModel = new NodeListTableColumnModel();
final JTable table = new JTable(tableModel, columnModel);
- tableModel.addTableModelListener(newReversedChangeListener(table, columnModel));
+ tableModel.addTableModelListener(new ReversedChangeListener(table, columnModel));
table.setName("table.currentnodelisttable");
table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());
@@ -95,28 +95,6 @@ public class NodeListViewer extends JPanel {
return table;
}
- protected TableModelListener newReversedChangeListener(final JTable table, final NodeListTableColumnModel columnModel) {
- return new TableModelListener() {
- private Boolean reversed;
- private final String nonReversedText = tr("Nodes") + (table.getFont().canDisplay('\u25bc') ? " \u25bc" : " (1-n)");
- private final String reversedText = tr("Nodes") + (table.getFont().canDisplay('\u25b2') ? " \u25b2" : " (n-1)");
-
- @Override
- public void tableChanged(TableModelEvent e) {
- if (e.getSource() instanceof DiffTableModel) {
- final DiffTableModel mod = (DiffTableModel) e.getSource();
- if (reversed == null || reversed != mod.isReversed()) {
- reversed = mod.isReversed();
- columnModel.getColumn(0).setHeaderValue(reversed ? reversedText : nonReversedText);
- table.getTableHeader().setToolTipText(
- reversed ? tr("The nodes of this way are in reverse order") : null);
- table.getTableHeader().repaint();
- }
- }
- }
- };
- }
-
protected void build() {
setLayout(new GridBagLayout());
GridBagConstraints gc = new GridBagConstraints();
@@ -204,6 +182,35 @@ public class NodeListViewer extends JPanel {
}
}
+ static final class ReversedChangeListener implements TableModelListener {
+ private final NodeListTableColumnModel columnModel;
+ private final JTable table;
+ private Boolean reversed;
+ private final String nonReversedText;
+ private final String reversedText;
+
+ ReversedChangeListener(JTable table, NodeListTableColumnModel columnModel) {
+ this.columnModel = columnModel;
+ this.table = table;
+ nonReversedText = tr("Nodes") + (table.getFont().canDisplay('\u25bc') ? " \u25bc" : " (1-n)");
+ reversedText = tr("Nodes") + (table.getFont().canDisplay('\u25b2') ? " \u25b2" : " (n-1)");
+ }
+
+ @Override
+ public void tableChanged(TableModelEvent e) {
+ if (e.getSource() instanceof DiffTableModel) {
+ final DiffTableModel mod = (DiffTableModel) e.getSource();
+ if (reversed == null || reversed != mod.isReversed()) {
+ reversed = mod.isReversed();
+ columnModel.getColumn(0).setHeaderValue(reversed ? reversedText : nonReversedText);
+ table.getTableHeader().setToolTipText(
+ reversed ? tr("The nodes of this way are in reverse order") : null);
+ table.getTableHeader().repaint();
+ }
+ }
+ }
+ }
+
static class NodeListPopupMenu extends JPopupMenu {
private final ZoomToNodeAction zoomToNodeAction;
private final ShowHistoryAction showHistoryAction;
diff --git a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
index 44f8ebd..ab9cc84 100644
--- a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
+++ b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
@@ -224,7 +224,7 @@ public class VersionInfoPanel extends JPanel implements ChangeListener {
public void update(final Changeset cs, final boolean isLatest, final Date timestamp, final long version) {
lblInfo.setText(getInfoText(timestamp, version, isLatest));
- if (!isLatest) {
+ if (!isLatest && cs != null) {
User user = cs.getUser();
String url = Main.getBaseBrowseUrl() + "/changeset/" + cs.getId();
lblChangeset.setUrl(url);
@@ -296,7 +296,9 @@ public class VersionInfoPanel extends JPanel implements ChangeListener {
@Override
public void actionPerformed(ActionEvent e) {
- ChangesetDialog.LaunchChangesetManager.displayChangesets(Collections.singleton(id));
+ if (id != null) {
+ ChangesetDialog.LaunchChangesetManager.displayChangesets(Collections.singleton(id));
+ }
if (componentToSelect != null) {
ChangesetCacheManager.getInstance().setSelectedComponentInDetailPanel(componentToSelect);
}
diff --git a/src/org/openstreetmap/josm/gui/history/VersionTable.java b/src/org/openstreetmap/josm/gui/history/VersionTable.java
index 7569930..6a1473f 100644
--- a/src/org/openstreetmap/josm/gui/history/VersionTable.java
+++ b/src/org/openstreetmap/josm/gui/history/VersionTable.java
@@ -96,6 +96,7 @@ public class VersionTable extends JTable implements ChangeListener {
adjustColumnWidth(this, 2, -8);
adjustColumnWidth(this, 3, 0);
adjustColumnWidth(this, 4, 0);
+ adjustColumnWidth(this, 5, 0);
});
}
diff --git a/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java b/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java
index 8391bfe..7b9cfd3 100644
--- a/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java
+++ b/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java
@@ -24,6 +24,8 @@ public class VersionTableColumnModel extends DefaultTableColumnModel {
public static final int COL_DATE = 3;
/** Column index for user */
public static final int COL_USER = 4;
+ /** Column index for editor */
+ public static final int COL_EDITOR = 5;
/**
* Creates a new {@code VersionTableColumnModel}.
@@ -66,5 +68,10 @@ public class VersionTableColumnModel extends DefaultTableColumnModel {
col.setHeaderValue(tr("User"));
col.setResizable(false);
addColumn(col);
+ // column 5 - Editor
+ col = new TableColumn(COL_EDITOR);
+ col.setHeaderValue(tr("Editor"));
+ col.setResizable(false);
+ addColumn(col);
}
}
diff --git a/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java b/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
index 9e61b39..6470348 100644
--- a/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
+++ b/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
@@ -15,6 +15,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import javax.swing.Action;
import javax.swing.BorderFactory;
@@ -129,16 +130,7 @@ public class BasicUploadSettingsPanel extends JPanel {
public void setHistoryComboBoxDownFocusTraversalHandler(final Action handler, final HistoryComboBox hcb) {
hcb.getEditor().addActionListener(handler);
- hcb.getEditorComponent().addKeyListener(
- new KeyAdapter() {
- @Override
- public void keyTyped(KeyEvent e) {
- if (e.getKeyCode() == KeyEvent.VK_TAB) {
- handler.actionPerformed(new ActionEvent(hcb, 0, "focusDown"));
- }
- }
- }
- );
+ hcb.getEditorComponent().addKeyListener(new HistoryComboBoxKeyAdapter(hcb, handler));
}
/**
@@ -148,7 +140,7 @@ public class BasicUploadSettingsPanel extends JPanel {
// store the history of comments
hcbUploadComment.addCurrentItemToHistory();
Main.pref.putCollection(HISTORY_KEY, hcbUploadComment.getHistory());
- Main.pref.putInteger(HISTORY_LAST_USED_KEY, (int) (System.currentTimeMillis() / 1000));
+ Main.pref.putInteger(HISTORY_LAST_USED_KEY, (int) (TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())));
// store the history of sources
hcbUploadSource.addCurrentItemToHistory();
Main.pref.putCollection(SOURCE_HISTORY_KEY, hcbUploadSource.getHistory());
@@ -182,6 +174,23 @@ public class BasicUploadSettingsPanel extends JPanel {
return pnlUploadParameterSummary;
}
+ static final class HistoryComboBoxKeyAdapter extends KeyAdapter {
+ private final HistoryComboBox hcb;
+ private final Action handler;
+
+ HistoryComboBoxKeyAdapter(HistoryComboBox hcb, Action handler) {
+ this.hcb = hcb;
+ this.handler = handler;
+ }
+
+ @Override
+ public void keyTyped(KeyEvent e) {
+ if (e.getKeyCode() == KeyEvent.VK_TAB) {
+ handler.actionPerformed(new ActionEvent(hcb, 0, "focusDown"));
+ }
+ }
+ }
+
/**
* Updates the changeset comment model upon changes in the input field.
*/
diff --git a/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java b/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java
index f40867b..0be71c6 100644
--- a/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java
+++ b/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java
@@ -59,20 +59,7 @@ public class RecentlyOpenedFilesMenu extends JMenu {
Collection<String> fileHistory = Main.pref.getCollection("file-open.history");
for (final String file : fileHistory) {
- add(new AbstractAction() {
- {
- putValue(NAME, file);
- putValue("help", ht("/Action/OpenRecent"));
- putValue("toolbar", Boolean.FALSE);
- }
- @Override
- public void actionPerformed(ActionEvent e) {
- File f = new File(file);
- OpenFileTask task = new OpenFileTask(Collections.singletonList(f), null);
- task.setRecordHistory(true);
- Main.worker.submit(task);
- }
- });
+ add(new OpenRecentAction(file));
}
add(new JSeparator());
if (clearAction == null) {
@@ -83,6 +70,24 @@ public class RecentlyOpenedFilesMenu extends JMenu {
add(clearItem);
}
+ static final class OpenRecentAction extends AbstractAction {
+ private final String file;
+
+ OpenRecentAction(String file) {
+ this.file = file;
+ putValue(NAME, file);
+ putValue("help", ht("/Action/OpenRecent"));
+ putValue("toolbar", Boolean.FALSE);
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ OpenFileTask task = new OpenFileTask(Collections.singletonList(new File(file)), null);
+ task.setRecordHistory(true);
+ Main.worker.submit(task);
+ }
+ }
+
private static class ClearAction extends AbstractAction {
ClearAction() {
diff --git a/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java b/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
index d498627..8d5e22e 100644
--- a/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
@@ -224,17 +224,29 @@ public class SaveLayersDialog extends JDialog implements TableModelListener {
}
private static class LayerListWarningMessagePanel extends JPanel {
+ static final class LayerCellRenderer implements ListCellRenderer<SaveLayerInfo> {
+ private final DefaultListCellRenderer def = new DefaultListCellRenderer();
+
+ @Override
+ public Component getListCellRendererComponent(JList<? extends SaveLayerInfo> list, SaveLayerInfo info, int index,
+ boolean isSelected, boolean cellHasFocus) {
+ def.setIcon(info.getLayer().getIcon());
+ def.setText(info.getName());
+ return def;
+ }
+ }
+
private final JLabel lblMessage = new JLabel();
private final JList<SaveLayerInfo> lstLayers = new JList<>();
LayerListWarningMessagePanel(String msg, List<SaveLayerInfo> infos) {
+ super(new GridBagLayout());
build();
lblMessage.setText(msg);
lstLayers.setListData(infos.toArray(new SaveLayerInfo[infos.size()]));
}
protected void build() {
- setLayout(new GridBagLayout());
GridBagConstraints gc = new GridBagConstraints();
gc.gridx = 0;
gc.gridy = 0;
@@ -243,18 +255,7 @@ public class SaveLayersDialog extends JDialog implements TableModelListener {
gc.weighty = 0.0;
add(lblMessage, gc);
lblMessage.setHorizontalAlignment(JLabel.LEFT);
- lstLayers.setCellRenderer(
- new ListCellRenderer<SaveLayerInfo>() {
- private final DefaultListCellRenderer def = new DefaultListCellRenderer();
- @Override
- public Component getListCellRendererComponent(JList<? extends SaveLayerInfo> list, SaveLayerInfo info, int index,
- boolean isSelected, boolean cellHasFocus) {
- def.setIcon(info.getLayer().getIcon());
- def.setText(info.getName());
- return def;
- }
- }
- );
+ lstLayers.setCellRenderer(new LayerCellRenderer());
gc.gridx = 0;
gc.gridy = 1;
gc.fill = GridBagConstraints.HORIZONTAL;
@@ -446,15 +447,20 @@ public class SaveLayersDialog extends JDialog implements TableModelListener {
final class SaveAndProceedAction extends AbstractAction implements PropertyChangeListener {
private static final int ICON_SIZE = 24;
private static final String BASE_ICON = "BASE_ICON";
- private final transient Image save = ImageProvider.get("save").getImage();
- private final transient Image upld = ImageProvider.get("upload").getImage();
- private final transient Image saveDis = new ImageProvider("save").setDisabled(true).get().getImage();
- private final transient Image upldDis = new ImageProvider("upload").setDisabled(true).get().getImage();
+ private final transient Image save = getImage("save", false);
+ private final transient Image upld = getImage("upload", false);
+ private final transient Image saveDis = getImage("save", true);
+ private final transient Image upldDis = getImage("upload", true);
SaveAndProceedAction() {
initForReason(Reason.EXIT);
}
+ Image getImage(String name, boolean disabled) {
+ ImageIcon img = new ImageProvider(name).setDisabled(disabled).get();
+ return img != null ? img.getImage() : null;
+ }
+
public void initForReason(Reason reason) {
switch (reason) {
case EXIT:
diff --git a/src/org/openstreetmap/josm/gui/io/UploadDialog.java b/src/org/openstreetmap/josm/gui/io/UploadDialog.java
index 42c870a..0687169 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadDialog.java
@@ -24,6 +24,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
import javax.swing.AbstractAction;
import javax.swing.BorderFactory;
@@ -53,9 +54,9 @@ import org.openstreetmap.josm.tools.ImageOverlay;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
import org.openstreetmap.josm.tools.InputMapUtils;
+import org.openstreetmap.josm.tools.MultiLineFlowLayout;
import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.WindowGeometry;
-import org.openstreetmap.josm.tools.MultiLineFlowLayout;
/**
* This is a dialog for entering upload options like the parameters for
@@ -133,13 +134,7 @@ public class UploadDialog extends AbstractUploadDialog implements PropertyChange
}
// a tabbed pane with configuration panels in the lower half
- tpConfigPanels = new JTabbedPane() {
- @Override
- public Dimension getPreferredSize() {
- // make sure the tabbed pane never grabs more space than necessary
- return super.getMinimumSize();
- }
- };
+ tpConfigPanels = new CompactTabbedPane();
pnlBasicUploadSettings = new BasicUploadSettingsPanel(changesetCommentModel, changesetSourceModel);
tpConfigPanels.add(pnlBasicUploadSettings);
@@ -412,6 +407,14 @@ public class UploadDialog extends AbstractUploadDialog implements PropertyChange
return false;
}
+ static final class CompactTabbedPane extends JTabbedPane {
+ @Override
+ public Dimension getPreferredSize() {
+ // make sure the tabbed pane never grabs more space than necessary
+ return super.getMinimumSize();
+ }
+ }
+
/**
* Handles an upload.
*/
@@ -639,7 +642,8 @@ public class UploadDialog extends AbstractUploadDialog implements PropertyChange
private static String getLastChangesetTagFromHistory(String historyKey, List<String> def) {
Collection<String> history = Main.pref.getCollection(historyKey, def);
int age = (int) (System.currentTimeMillis() / 1000 - Main.pref.getInteger(BasicUploadSettingsPanel.HISTORY_LAST_USED_KEY, 0));
- if (age < Main.pref.getInteger(BasicUploadSettingsPanel.HISTORY_MAX_AGE_KEY, 4 * 3600 * 1000) && history != null && !history.isEmpty()) {
+ if (age < Main.pref.getLong(BasicUploadSettingsPanel.HISTORY_MAX_AGE_KEY, TimeUnit.HOURS.toMillis(4))
+ && history != null && !history.isEmpty()) {
return history.iterator().next();
} else {
return null;
diff --git a/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java b/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java
index d33ff91..cb8d20d 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java
@@ -131,10 +131,8 @@ public class UploadLayerTask extends AbstractIOTask {
recoverFromGoneOnServer(e, monitor);
}
}
- if (strategy.isCloseChangesetAfterUpload()) {
- if (changeset != null && changeset.getId() > 0) {
- OsmApi.getOsmApi().closeChangeset(changeset, monitor.createSubTaskMonitor(0, false));
- }
+ if (strategy.isCloseChangesetAfterUpload() && changeset != null && changeset.getId() > 0) {
+ OsmApi.getOsmApi().closeChangeset(changeset, monitor.createSubTaskMonitor(0, false));
}
} catch (OsmTransferException sxe) {
if (isCanceled()) {
diff --git a/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java b/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java
index e51f994..45000da 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java
@@ -9,6 +9,7 @@ import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -195,22 +196,22 @@ public class UploadSelectionDialog extends JDialog {
}
static class OsmPrimitiveListModel extends AbstractListModel<OsmPrimitive> {
+ static final class OsmPrimitiveComparator implements Comparator<OsmPrimitive>, Serializable {
+ @Override
+ public int compare(OsmPrimitive o1, OsmPrimitive o2) {
+ int ret = OsmPrimitiveType.from(o1).compareTo(OsmPrimitiveType.from(o2));
+ if (ret != 0)
+ return ret;
+ DefaultNameFormatter formatter = DefaultNameFormatter.getInstance();
+ return o1.getDisplayName(formatter).compareTo(o1.getDisplayName(formatter));
+ }
+ }
+
private transient List<OsmPrimitive> data;
protected void sort() {
- if (data == null)
- return;
- data.sort(new Comparator<OsmPrimitive>() {
- private DefaultNameFormatter formatter = DefaultNameFormatter.getInstance();
- @Override
- public int compare(OsmPrimitive o1, OsmPrimitive o2) {
- int ret = OsmPrimitiveType.from(o1).compareTo(OsmPrimitiveType.from(o2));
- if (ret != 0)
- return ret;
- return o1.getDisplayName(formatter).compareTo(o1.getDisplayName(formatter));
- }
- }
- );
+ if (data != null)
+ data.sort(new OsmPrimitiveComparator());
}
public void setPrimitives(List<OsmPrimitive> data) {
diff --git a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
index eb4fda2..99fb347 100644
--- a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
@@ -1166,7 +1166,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
img = applyImageProcessors((BufferedImage) img);
Rectangle2D sourceRect = coordinateConverter.getRectangleForTile(tile);
- if (borderRect != null && !sourceRect.intersects(borderRect)) {
+ if (!sourceRect.intersects(borderRect)) {
continue;
}
drawImageInside(g, img, sourceRect, borderRect);
diff --git a/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java b/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java
index faecbfc..a8ebf63 100644
--- a/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java
+++ b/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java
@@ -82,12 +82,10 @@ public class AlignImageryPanel extends JPanel {
*/
public static void addNagPanelIfNeeded(ImageryInfo infoToAdd) {
BooleanProperty showAgain = new BooleanProperty("message.imagery.nagPanel." + infoToAdd.getUrl(), true);
- if (Main.isDisplayingMapView() && showAgain.get() && !infoToAdd.isGeoreferenceValid()) {
- if (Main.map.getTopPanel(AlignImageryPanel.class) == null) {
- double w = GuiHelper.getScreenSize().getWidth();
- AlignImageryPanel p = new AlignImageryPanel(w > 1300, showAgain, infoToAdd);
- Main.map.addTopPanel(p);
- }
+ if (Main.isDisplayingMapView() && showAgain.get() && !infoToAdd.isGeoreferenceValid()
+ && Main.map.getTopPanel(AlignImageryPanel.class) == null) {
+ double w = GuiHelper.getScreenSize().getWidth();
+ Main.map.addTopPanel(new AlignImageryPanel(w > 1300, showAgain, infoToAdd));
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/layer/GpxLayer.java b/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
index 1b75382..ba6ce9c 100644
--- a/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
@@ -279,6 +279,8 @@ public class GpxLayer extends Layer {
@Override
public void mergeFrom(Layer from) {
+ if (!(from instanceof GpxLayer))
+ throw new IllegalArgumentException("not a GpxLayer: " + from);
data.mergeFrom(((GpxLayer) from).data);
drawHelper.dataChanged();
}
diff --git a/src/org/openstreetmap/josm/gui/layer/LayerManager.java b/src/org/openstreetmap/josm/gui/layer/LayerManager.java
index ec5ee97..88a440b 100644
--- a/src/org/openstreetmap/josm/gui/layer/LayerManager.java
+++ b/src/org/openstreetmap/josm/gui/layer/LayerManager.java
@@ -191,7 +191,7 @@ public class LayerManager {
protected synchronized void realAddLayer(Layer layer) {
if (containsLayer(layer)) {
- throw new IllegalArgumentException("Cannot add a layer twice.");
+ throw new IllegalArgumentException("Cannot add a layer twice: " + layer);
}
LayerPositionStrategy positionStrategy = layer.getDefaultLayerPosition();
int position = positionStrategy.getPosition(this);
diff --git a/src/org/openstreetmap/josm/gui/layer/NativeScaleLayer.java b/src/org/openstreetmap/josm/gui/layer/NativeScaleLayer.java
index 7c7d6a8..8677a9d 100644
--- a/src/org/openstreetmap/josm/gui/layer/NativeScaleLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/NativeScaleLayer.java
@@ -173,13 +173,11 @@ public interface NativeScaleLayer {
Scale previous = null;
for (int i = 0; i < size; i++) {
Scale current = this.scales.get(i);
- if (previous != null) {
- if (scale <= previous.scale && scale >= current.scale) {
- if (floor || previous.scale / scale < scale / current.scale) {
- return new Scale(previous.scale, previous.isNative, i-1);
- } else {
- return new Scale(current.scale, current.isNative, i);
- }
+ if (previous != null && scale <= previous.scale && scale >= current.scale) {
+ if (floor || previous.scale / scale < scale / current.scale) {
+ return new Scale(previous.scale, previous.isNative, i-1);
+ } else {
+ return new Scale(current.scale, current.isNative, i);
}
}
previous = current;
diff --git a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
index 3b5fb9d..4f3532e 100644
--- a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
@@ -140,12 +140,7 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
private static final ColorProperty PROPERTY_OUTSIDE_COLOR = new ColorProperty(marktr("outside downloaded area"), Color.YELLOW);
/** List of recent relations */
- private final Map<Relation, Void> recentRelations = new LinkedHashMap<Relation, Void>(PROPERTY_RECENT_RELATIONS_NUMBER.get()+1, 1.1f, true) {
- @Override
- protected boolean removeEldestEntry(Map.Entry<Relation, Void> eldest) {
- return size() > PROPERTY_RECENT_RELATIONS_NUMBER.get();
- }
- };
+ private final Map<Relation, Void> recentRelations = new LruCache(PROPERTY_RECENT_RELATIONS_NUMBER.get()+1);
/**
* Returns list of recently closed relations or null if none.
@@ -214,6 +209,17 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
return tr("Data Layer {0}", arg);
}
+ static final class LruCache extends LinkedHashMap<Relation, Void> {
+ LruCache(int initialCapacity) {
+ super(initialCapacity, 1.1f, true);
+ }
+
+ @Override
+ protected boolean removeEldestEntry(Map.Entry<Relation, Void> eldest) {
+ return size() > PROPERTY_RECENT_RELATIONS_NUMBER.get();
+ }
+ }
+
public static final class DataCountVisitor extends AbstractVisitor {
public int nodes;
public int ways;
@@ -356,9 +362,13 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
data.addDataSetListener(new DataSetListenerAdapter(this));
data.addDataSetListener(MultipolygonCache.getInstance());
DataSet.addSelectionListener(this);
- if (name != null && name.startsWith(createLayerName(""))) {
+ if (name != null && name.startsWith(createLayerName("")) && Character.isDigit(
+ (name.substring(createLayerName("").length()) + "XX" /*avoid StringIndexOutOfBoundsException*/).charAt(1))) {
while (AlphanumComparator.getInstance().compare(createLayerName(dataLayerCounter), name) < 0) {
- dataLayerCounter.incrementAndGet();
+ final int i = dataLayerCounter.incrementAndGet();
+ if (i > 1_000_000) {
+ break; // to avoid looping in unforeseen case
+ }
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java b/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
index 76e2405..2f0b36d 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
@@ -37,6 +37,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
import java.util.zip.GZIPInputStream;
import javax.swing.AbstractAction;
@@ -407,9 +408,9 @@ public class CorrelateGpxWithImages extends AbstractAction {
for (String tzStr : tmp) {
TimeZone tz = TimeZone.getTimeZone(tzStr);
- String tzDesc = new StringBuilder(tzStr).append(" (")
- .append(new Timezone(tz.getRawOffset() / 3600000.0).formatTimezone())
- .append(')').toString();
+ String tzDesc = tzStr + " (" +
+ new Timezone(((double) tz.getRawOffset()) / TimeUnit.HOURS.toMillis(1)).formatTimezone() +
+ ')';
vtTimezones.add(tzDesc);
}
@@ -425,9 +426,9 @@ public class CorrelateGpxWithImages extends AbstractAction {
defaultTz = TimeZone.getTimeZone(tzId);
}
- cbTimezones.setSelectedItem(new StringBuilder(defaultTz.getID()).append(" (")
- .append(new Timezone(defaultTz.getRawOffset() / 3600000.0).formatTimezone())
- .append(')').toString());
+ cbTimezones.setSelectedItem(defaultTz.getID() + " (" +
+ new Timezone(((double) defaultTz.getRawOffset()) / TimeUnit.HOURS.toMillis(1)).formatTimezone() +
+ ')');
gc.gridx = 1;
gc.weightx = 1.0;
@@ -814,7 +815,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
if (selGpx == null)
return tr("No gpx selected");
- final long offsetMs = ((long) (timezone.getHours() * 3600 * 1000)) + delta.getMilliseconds(); // in milliseconds
+ final long offsetMs = ((long) (timezone.getHours() * TimeUnit.HOURS.toMillis(1))) + delta.getMilliseconds(); // in milliseconds
lastNumMatched = matchGpxTrack(dateImgLst, selGpx.data, offsetMs);
return trn("<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>",
@@ -845,7 +846,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
public void actionPerformed(ActionEvent arg0) {
final Offset offset = Offset.milliseconds(
- delta.getMilliseconds() + Math.round(timezone.getHours() * 60 * 60 * 1000));
+ delta.getMilliseconds() + Math.round(timezone.getHours() * TimeUnit.HOURS.toMillis(1)));
final int dayOffset = offset.getDayOffset();
final Pair<Timezone, Offset> timezoneOffsetPair = offset.withoutDayOffset().splitOutTimezone();
@@ -896,8 +897,8 @@ public class CorrelateGpxWithImages extends AbstractAction {
lblSeconds.setText(tr("Seconds: {0}", Offset.milliseconds(100L * sldSeconds.getValue()).formatOffset()));
delta = Offset.milliseconds(100L * sldSeconds.getValue()
- + 1000L * 60 * sldMinutes.getValue()
- + 1000L * 60 * 60 * 24 * dayOffset);
+ + TimeUnit.MINUTES.toMillis(sldMinutes.getValue())
+ + TimeUnit.DAYS.toMillis(dayOffset));
tfTimezone.getDocument().removeDocumentListener(statusBarUpdater);
tfOffset.getDocument().removeDocumentListener(statusBarUpdater);
@@ -1145,7 +1146,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
WayPoint curWp, long curWpTime, long offset) {
// Time between the track point and the previous one, 5 sec if first point, i.e. photos take
// 5 sec before the first track point can be assumed to be take at the starting position
- long interval = prevWpTime > 0 ? Math.abs(curWpTime - prevWpTime) : 5*1000;
+ long interval = prevWpTime > 0 ? Math.abs(curWpTime - prevWpTime) : TimeUnit.SECONDS.toMillis(5);
int ret = 0;
// i is the index of the timewise last photo that has the same or earlier EXIF time
@@ -1431,24 +1432,22 @@ public class CorrelateGpxWithImages extends AbstractAction {
}
int getDayOffset() {
- final double diffInH = getMilliseconds() / 1000. / 60 / 60; // hours
-
// Find day difference
- return (int) Math.round(diffInH / 24);
+ return (int) Math.round(((double) getMilliseconds()) / TimeUnit.DAYS.toMillis(1));
}
Offset withoutDayOffset() {
- return milliseconds(getMilliseconds() - getDayOffset() * 24L * 60L * 60L * 1000L);
+ return milliseconds(getMilliseconds() - TimeUnit.DAYS.toMillis(getDayOffset()));
}
Pair<Timezone, Offset> splitOutTimezone() {
// In hours
- double tz = withoutDayOffset().getSeconds() / 3600.0;
+ final double tz = ((double) withoutDayOffset().getSeconds()) / TimeUnit.HOURS.toSeconds(1);
// Due to imprecise clocks we might get a "+3:28" timezone, which should obviously be 3:30 with
// -2 minutes offset. This determines the real timezone and finds offset.
final double timezone = (double) Math.round(tz * 2) / 2; // hours, rounded to one decimal place
- final long delta = Math.round(getMilliseconds() - timezone * 60 * 60 * 1000); // milliseconds
+ final long delta = Math.round(getMilliseconds() - timezone * TimeUnit.HOURS.toMillis(1));
return Pair.create(new Timezone(timezone), Offset.milliseconds(delta));
}
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
index 9924a41..e6e6a8d 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
@@ -191,9 +191,6 @@ public class GeoImageLayer extends AbstractModifiableLayer implements PropertyCh
progressMonitor.subTask(tr("Read photos..."));
progressMonitor.setTicksCount(files.size());
- progressMonitor.subTask(tr("Read photos..."));
- progressMonitor.setTicksCount(files.size());
-
// read the image files
List<ImageEntry> entries = new ArrayList<>(files.size());
@@ -400,6 +397,8 @@ public class GeoImageLayer extends AbstractModifiableLayer implements PropertyCh
@Override
public void mergeFrom(Layer from) {
+ if (!(from instanceof GeoImageLayer))
+ throw new IllegalArgumentException("not a GeoImageLayer: " + from);
GeoImageLayer l = (GeoImageLayer) from;
// Stop to load thumbnails on both layers. Thumbnail loading will continue the next time
@@ -501,9 +500,11 @@ public class GeoImageLayer extends AbstractModifiableLayer implements PropertyCh
Point p = mv.getPoint(e.getPos());
if (e.hasThumbnail()) {
Dimension d = scaledDimension(e.getThumbnail());
- Rectangle target = new Rectangle(p.x - d.width / 2, p.y - d.height / 2, d.width, d.height);
- if (clip.intersects(target)) {
- tempG.drawImage(e.getThumbnail(), target.x, target.y, target.width, target.height, null);
+ if (d != null) {
+ Rectangle target = new Rectangle(p.x - d.width / 2, p.y - d.height / 2, d.width, d.height);
+ if (clip.intersects(target)) {
+ tempG.drawImage(e.getThumbnail(), target.x, target.y, target.width, target.height, null);
+ }
}
} else { // thumbnail not loaded yet
icon.paintIcon(mv, tempG,
@@ -537,8 +538,13 @@ public class GeoImageLayer extends AbstractModifiableLayer implements PropertyCh
int imgHeight;
if (useThumbs && e.hasThumbnail()) {
Dimension d = scaledDimension(e.getThumbnail());
- imgWidth = d.width;
- imgHeight = d.height;
+ if (d != null) {
+ imgWidth = d.width;
+ imgHeight = d.height;
+ } else {
+ imgWidth = -1;
+ imgHeight = -1;
+ }
} else {
imgWidth = selectedIcon.getIconWidth();
imgHeight = selectedIcon.getIconHeight();
@@ -753,14 +759,17 @@ public class GeoImageLayer extends AbstractModifiableLayer implements PropertyCh
Rectangle r;
if (useThumbs && img.hasThumbnail()) {
Dimension d = scaledDimension(img.getThumbnail());
- r = new Rectangle(p.x - d.width / 2, p.y - d.height / 2, d.width, d.height);
+ if (d != null)
+ r = new Rectangle(p.x - d.width / 2, p.y - d.height / 2, d.width, d.height);
+ else
+ r = null;
} else {
r = new Rectangle(p.x - icon.getIconWidth() / 2,
p.y - icon.getIconHeight() / 2,
icon.getIconWidth(),
icon.getIconHeight());
}
- if (r.contains(evt.getPoint())) {
+ if (r != null && r.contains(evt.getPoint())) {
return img;
}
}
@@ -858,14 +867,17 @@ public class GeoImageLayer extends AbstractModifiableLayer implements PropertyCh
Rectangle r;
if (useThumbs && e.hasThumbnail()) {
Dimension d = scaledDimension(e.getThumbnail());
- r = new Rectangle(p.x - d.width / 2, p.y - d.height / 2, d.width, d.height);
+ if (d != null)
+ r = new Rectangle(p.x - d.width / 2, p.y - d.height / 2, d.width, d.height);
+ else
+ r = null;
} else {
r = new Rectangle(p.x - icon.getIconWidth() / 2,
p.y - icon.getIconHeight() / 2,
icon.getIconWidth(),
icon.getIconHeight());
}
- if (r.contains(ev.getPoint())) {
+ if (r != null && r.contains(ev.getPoint())) {
clearOtherCurrentPhotos();
currentPhoto = i;
ImageViewerDialog.showImage(GeoImageLayer.this, e);
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java
index ce141a9..b69d4c1 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java
@@ -191,12 +191,14 @@ public class ChooseTrackVisibilityAction extends AbstractAction {
return;
}
ListSelectionModel s = table.getSelectionModel();
+ s.setValueIsAdjusting(true);
s.clearSelection();
for (int i = 0; i < layer.trackVisibility.length; i++) {
if (layer.trackVisibility[i]) {
s.addSelectionInterval(i, i);
}
}
+ s.setValueIsAdjusting(false);
}
/** listens to selection changes in the table and redraws the map */
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
index bf4e07a..209bc1f 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
@@ -106,8 +106,12 @@ public abstract class ConvertToDataLayerAction<T extends Layer> extends Abstract
final DataSet ds = new DataSet();
for (Marker marker : layer.data) {
final Node node = new Node(marker.getCoor());
- final Collection<String> mapping = Main.pref.getCollection("gpx.to-osm-mapping",
- Arrays.asList("name", "name", "desc", "description", "cmt", "note", "sym", "gpxicon"));
+ final Collection<String> mapping = Main.pref.getCollection("gpx.to-osm-mapping", Arrays.asList(
+ GpxConstants.GPX_NAME, "name",
+ GpxConstants.GPX_DESC, "description",
+ GpxConstants.GPX_CMT, "note",
+ GpxConstants.GPX_SRC, "source",
+ GpxConstants.PT_SYM, "gpxicon"));
if (mapping.size() % 2 == 0) {
final Iterator<String> it = mapping.iterator();
while (it.hasNext()) {
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
index 7fb7c76..77b7292 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
@@ -40,6 +40,18 @@ import org.openstreetmap.josm.tools.Utils;
public class ImportAudioAction extends AbstractAction {
private final transient GpxLayer layer;
+ static final class AudioFileFilter extends FileFilter {
+ @Override
+ public boolean accept(File f) {
+ return f.isDirectory() || Utils.hasExtension(f, "wav");
+ }
+
+ @Override
+ public String getDescription() {
+ return tr("Wave Audio files (*.wav)");
+ }
+ }
+
private static class Markers {
public boolean timedMarkersOmitted;
public boolean untimedMarkersOmitted;
@@ -69,18 +81,7 @@ public class ImportAudioAction extends AbstractAction {
warnCantImportIntoServerLayer(layer);
return;
}
- FileFilter filter = new FileFilter() {
- @Override
- public boolean accept(File f) {
- return f.isDirectory() || Utils.hasExtension(f, "wav");
- }
-
- @Override
- public String getDescription() {
- return tr("Wave Audio files (*.wav)");
- }
- };
- AbstractFileChooser fc = DiskAccessAction.createAndOpenFileChooser(true, true, null, filter,
+ AbstractFileChooser fc = DiskAccessAction.createAndOpenFileChooser(true, true, null, new AudioFileFilter(),
JFileChooser.FILES_ONLY, "markers.lastaudiodirectory");
if (fc != null) {
File[] sel = fc.getSelectedFiles();
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
index 43c265b..846a674 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
@@ -146,12 +146,10 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
if (e.getButton() != MouseEvent.BUTTON1)
return;
boolean mousePressedInButton = false;
- if (e.getPoint() != null) {
- for (Marker mkr : data) {
- if (mkr.containsPoint(e.getPoint())) {
- mousePressedInButton = true;
- break;
- }
+ for (Marker mkr : data) {
+ if (mkr.containsPoint(e.getPoint())) {
+ mousePressedInButton = true;
+ break;
}
}
if (!mousePressedInButton)
@@ -169,11 +167,9 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
mousePressed = false;
if (!isVisible())
return;
- if (ev.getPoint() != null) {
- for (Marker mkr : data) {
- if (mkr.containsPoint(ev.getPoint())) {
- mkr.actionPerformed(new ActionEvent(this, 0, null));
- }
+ for (Marker mkr : data) {
+ if (mkr.containsPoint(ev.getPoint())) {
+ mkr.actionPerformed(new ActionEvent(this, 0, null));
}
}
invalidate();
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
index 10df3fb..3bb5577 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
@@ -63,10 +63,7 @@ public final class PlayHeadMarker extends Marker {
if (Main.isDisplayingMapView()) {
Main.map.mapView.addMouseListener(new MouseAdapter() {
@Override public void mousePressed(MouseEvent ev) {
- Point p = ev.getPoint();
- if (ev.getButton() != MouseEvent.BUTTON1 || p == null)
- return;
- if (playHead.containsPoint(p)) {
+ if (ev.getButton() == MouseEvent.BUTTON1 && playHead.containsPoint(ev.getPoint())) {
/* when we get a click on the marker, we need to switch mode to avoid
* getting confused with other drag operations (like select) */
oldMode = Main.map.mapMode;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/Cascade.java b/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
index 3f22c55..b44c84a 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
@@ -18,14 +18,29 @@ import org.openstreetmap.josm.tools.Utils;
/**
* Simple map of properties with dynamic typing.
*/
-public final class Cascade implements Cloneable {
+public final class Cascade {
- private Map<String, Object> prop = new HashMap<>();
+ private final Map<String, Object> prop;
private boolean defaultSelectedHandling = true;
private static final Pattern HEX_COLOR_PATTERN = Pattern.compile("#([0-9a-fA-F]{3}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})");
+ /**
+ * Constructs a new {@code Cascade}.
+ */
+ public Cascade() {
+ this.prop = new HashMap<>();
+ }
+
+ /**
+ * Constructs a new {@code Cascade} from existing one.
+ * @param other other Cascade
+ */
+ public Cascade(Cascade other) {
+ this.prop = new HashMap<>(other.prop);
+ }
+
public <T> T get(String key, T def, Class<T> klass) {
return get(key, def, klass, false);
}
@@ -195,19 +210,6 @@ public final class Cascade implements Cloneable {
}
@Override
- public Cascade clone() {
- try {
- Cascade c = (Cascade) super.clone();
- @SuppressWarnings({ "unchecked", "rawtypes" })
- Map<String, Object> clonedProp = (Map<String, Object>) ((HashMap) this.prop).clone();
- c.prop = clonedProp;
- return c;
- } catch (CloneNotSupportedException e) {
- throw new IllegalStateException(e);
- }
- }
-
- @Override
public String toString() {
StringBuilder res = new StringBuilder("Cascade{ ");
// List properties in alphabetical order to be deterministic, without changing "prop" to a TreeMap
diff --git a/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java b/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
index d98dd11..0ca4915 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
@@ -51,17 +51,19 @@ import org.openstreetmap.josm.tools.Utils;
* </ol>
* The results are cached with respect to the current scale.
*
- * Use {@link #setStyleSources(Collection)} to select the StyleSources that are
- * applied.
+ * Use {@link #setStyleSources(Collection)} to select the StyleSources that are applied.
*/
public class ElemStyles implements PreferenceChangedListener {
private final List<StyleSource> styleSources;
private boolean drawMultipolygon;
- private int cacheIdx = 1;
+ private short cacheIdx = 1;
- private boolean defaultNodes, defaultLines;
- private int defaultNodesIdx, defaultLinesIdx;
+ private boolean defaultNodes;
+ private boolean defaultLines;
+
+ private short defaultNodesIdx;
+ private short defaultLinesIdx;
private final Map<String, String> preferenceCache = new HashMap<>();
@@ -111,7 +113,7 @@ public class ElemStyles implements PreferenceChangedListener {
* @return pair containing style list and range
*/
public Pair<StyleElementList, Range> getStyleCacheWithRange(OsmPrimitive osm, double scale, NavigatableComponent nc) {
- if (osm.mappaintStyle == null || osm.mappaintCacheIdx != cacheIdx || scale <= 0) {
+ if (osm.mappaintStyle == null || osm.getMappaintCacheIdx() != cacheIdx || scale <= 0) {
osm.mappaintStyle = StyleCache.EMPTY_STYLECACHE;
} else {
Pair<StyleElementList, Range> lst = osm.mappaintStyle.getWithRange(scale, osm.isSelected());
@@ -140,10 +142,8 @@ public class ElemStyles implements PreferenceChangedListener {
}
if (!hasNonModifier) {
p.a = new StyleElementList(p.a, NodeElement.SIMPLE_NODE_ELEMSTYLE);
- if (!hasText) {
- if (TextLabel.AUTO_LABEL_COMPOSITION_STRATEGY.compose(osm) != null) {
- p.a = new StyleElementList(p.a, BoxTextElement.SIMPLE_NODE_TEXT_ELEMSTYLE);
- }
+ if (!hasText && TextLabel.AUTO_LABEL_COMPOSITION_STRATEGY.compose(osm) != null) {
+ p.a = new StyleElementList(p.a, BoxTextElement.SIMPLE_NODE_TEXT_ELEMSTYLE);
}
}
}
@@ -169,7 +169,7 @@ public class ElemStyles implements PreferenceChangedListener {
+ " (object: " + osm.getPrimitiveId() + ", current style: "+osm.mappaintStyle
+ ", scale: " + scale + ", new stylelist: " + p.a + ", new range: " + p.b + ')', e);
}
- osm.mappaintCacheIdx = cacheIdx;
+ osm.setMappaintCacheIdx(cacheIdx);
return p;
}
@@ -315,18 +315,17 @@ public class ElemStyles implements PreferenceChangedListener {
return p;
} else if (osm instanceof Relation) {
Pair<StyleElementList, Range> p = generateStyles(osm, scale, true);
- if (drawMultipolygon && ((Relation) osm).isMultipolygon()) {
- if (!Utils.exists(p.a, AreaElement.class) && Main.pref.getBoolean("multipolygon.deprecated.outerstyle", true)) {
- // look at outer ways to find area style
- Multipolygon multipolygon = MultipolygonCache.getInstance().get(nc, (Relation) osm);
- for (Way w : multipolygon.getOuterWays()) {
- Pair<StyleElementList, Range> wayStyles = generateStyles(w, scale, false);
- p.b = Range.cut(p.b, wayStyles.b);
- StyleElement area = Utils.find(wayStyles.a, AreaElement.class);
- if (area != null) {
- p.a = new StyleElementList(p.a, area);
- break;
- }
+ if (drawMultipolygon && ((Relation) osm).isMultipolygon()
+ && !Utils.exists(p.a, AreaElement.class) && Main.pref.getBoolean("multipolygon.deprecated.outerstyle", true)) {
+ // look at outer ways to find area style
+ Multipolygon multipolygon = MultipolygonCache.getInstance().get(nc, (Relation) osm);
+ for (Way w : multipolygon.getOuterWays()) {
+ Pair<StyleElementList, Range> wayStyles = generateStyles(w, scale, false);
+ p.b = Range.cut(p.b, wayStyles.b);
+ StyleElement area = Utils.find(wayStyles.a, AreaElement.class);
+ if (area != null) {
+ p.a = new StyleElementList(p.a, area);
+ break;
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
index 67eed00..2eb50ed 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
@@ -5,7 +5,6 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.File;
import java.io.IOException;
-import java.io.Reader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -16,7 +15,6 @@ import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.swing.ImageIcon;
-import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
import org.openstreetmap.josm.Main;
@@ -24,9 +22,7 @@ import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.Tag;
-import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
import org.openstreetmap.josm.gui.mappaint.styleelement.MapImage;
import org.openstreetmap.josm.gui.mappaint.styleelement.NodeElement;
@@ -35,7 +31,6 @@ import org.openstreetmap.josm.gui.preferences.SourceEntry;
import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference.MapPaintPrefHelper;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.io.CachedFile;
-import org.openstreetmap.josm.io.IllegalDataException;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Utils;
@@ -48,10 +43,6 @@ import org.openstreetmap.josm.tools.Utils;
*/
public final class MapPaintStyles {
- /** To remove in November 2016 */
- private static final String XML_STYLE_MIME_TYPES =
- "application/xml, text/xml, text/plain; q=0.8, application/zip, application/octet-stream; q=0.5";
-
private static final Collection<String> DEPRECATED_IMAGE_NAMES = Arrays.asList(
"presets/misc/deprecated.svg",
"misc/deprecated.png");
@@ -268,10 +259,7 @@ public final class MapPaintStyles {
Collection<? extends SourceEntry> sourceEntries = MapPaintPrefHelper.INSTANCE.get();
for (SourceEntry entry : sourceEntries) {
- StyleSource source = fromSourceEntry(entry);
- if (source != null) {
- styles.add(source);
- }
+ styles.add(fromSourceEntry(entry));
}
for (StyleSource source : styles.getStyleSources()) {
loadStyleForFirstTime(source);
@@ -301,53 +289,15 @@ public final class MapPaintStyles {
}
private static StyleSource fromSourceEntry(SourceEntry entry) {
- // TODO: Method to clean up in November 2016: remove XML detection completely
Set<String> mimes = new HashSet<>(Arrays.asList(MapCSSStyleSource.MAPCSS_STYLE_MIME_TYPES.split(", ")));
- mimes.addAll(Arrays.asList(XML_STYLE_MIME_TYPES.split(", ")));
try (CachedFile cf = new CachedFile(entry.url).setHttpAccept(Utils.join(", ", mimes))) {
String zipEntryPath = cf.findZipEntryPath("mapcss", "style");
if (zipEntryPath != null) {
entry.isZip = true;
entry.zipEntryPath = zipEntryPath;
- return new MapCSSStyleSource(entry);
- }
- zipEntryPath = cf.findZipEntryPath("xml", "style");
- if (zipEntryPath != null || Utils.hasExtension(entry.url, "xml"))
- throw new IllegalDataException("XML style");
- if (Utils.hasExtension(entry.url, "mapcss"))
- return new MapCSSStyleSource(entry);
- try (Reader reader = cf.getContentReader()) {
- WHILE: while (true) {
- int c = reader.read();
- switch (c) {
- case -1:
- break WHILE;
- case ' ':
- case '\t':
- case '\n':
- case '\r':
- continue;
- case '<':
- throw new IllegalDataException("XML style");
- default:
- return new MapCSSStyleSource(entry);
- }
- }
}
- Main.warn("Could not detect style type. Using default (mapcss).");
return new MapCSSStyleSource(entry);
- } catch (IOException e) {
- Main.warn(tr("Failed to load Mappaint styles from ''{0}''. Exception was: {1}", entry.url, e.toString()));
- Main.error(e);
- } catch (IllegalDataException e) {
- String msg = tr("JOSM does no longer support mappaint styles written in the old XML format.\nPlease update ''{0}'' to MapCSS",
- entry.url);
- Main.error(msg);
- Main.debug(e);
- HelpAwareOptionPane.showOptionDialog(Main.parent, msg, tr("Warning"), JOptionPane.WARNING_MESSAGE,
- HelpUtil.ht("/Styles/MapCSSImplementation"));
}
- return null;
}
/**
@@ -466,15 +416,13 @@ public final class MapPaintStyles {
*/
public static StyleSource addStyle(SourceEntry entry) {
StyleSource source = fromSourceEntry(entry);
- if (source != null) {
- styles.add(source);
- loadStyleForFirstTime(source);
- MapPaintPrefHelper.INSTANCE.put(styles.getStyleSources());
- fireMapPaintSylesUpdated();
- styles.clearCached();
- if (Main.isDisplayingMapView()) {
- Main.map.mapView.repaint();
- }
+ styles.add(source);
+ loadStyleForFirstTime(source);
+ MapPaintPrefHelper.INSTANCE.put(styles.getStyleSources());
+ fireMapPaintSylesUpdated();
+ styles.clearCached();
+ if (Main.isDisplayingMapView()) {
+ Main.map.mapView.repaint();
}
return source;
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java b/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java
index 520c4d1..689d195 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java
@@ -38,7 +38,7 @@ public class MultiCascade implements StyleKeys {
Cascade c = layers.get(layer);
if (c == null) {
if (layers.containsKey("*")) {
- c = layers.get("*").clone();
+ c = new Cascade(layers.get("*"));
} else {
c = new Cascade();
// Everything that is not on the default layer is assumed to
diff --git a/src/org/openstreetmap/josm/gui/mappaint/Range.java b/src/org/openstreetmap/josm/gui/mappaint/Range.java
index 2213832..dce2186 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/Range.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/Range.java
@@ -4,7 +4,7 @@ package org.openstreetmap.josm.gui.mappaint;
import java.util.Objects;
/**
- * An interval of the form "lower < x <= upper" where 0 <= lower < upper.
+ * A scale interval of the form "lower < x <= upper" where 0 <= lower < upper.
* (upper can be Double.POSITIVE_INFINITY)
* immutable class
*/
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java
index b4ac2b8..e6b6df3 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java
@@ -29,6 +29,7 @@ import org.openstreetmap.josm.gui.mappaint.Environment;
import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.Context;
import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.ToTagConvertable;
import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.Utils;
/**
@@ -818,7 +819,7 @@ public final class ConditionFactory {
try {
return not ^ (Boolean) method.invoke(null, e);
} catch (IllegalAccessException | InvocationTargetException ex) {
- throw new RuntimeException(ex);
+ throw new JosmRuntimeException(ex);
}
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
index 3f626a4..1d19f12 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
@@ -15,6 +15,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.Locale;
import java.util.Objects;
import java.util.TreeSet;
import java.util.function.Function;
@@ -26,6 +27,7 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.search.SearchCompiler;
import org.openstreetmap.josm.actions.search.SearchCompiler.Match;
import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
+import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
@@ -37,8 +39,10 @@ import org.openstreetmap.josm.io.XmlWriter;
import org.openstreetmap.josm.tools.AlphanumComparator;
import org.openstreetmap.josm.tools.ColorHelper;
import org.openstreetmap.josm.tools.Geometry;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
import org.openstreetmap.josm.tools.SubclassFilteredCollection;
+import org.openstreetmap.josm.tools.Territories;
import org.openstreetmap.josm.tools.Utils;
/**
@@ -93,7 +97,7 @@ public final class ExpressionFactory {
parameterFunctions.add(Math.class.getMethod("tan", double.class));
parameterFunctions.add(Math.class.getMethod("tanh", double.class));
} catch (NoSuchMethodException | SecurityException ex) {
- throw new RuntimeException(ex);
+ throw new JosmRuntimeException(ex);
}
}
@@ -866,9 +870,7 @@ public final class ExpressionFactory {
* @since 7193
*/
public static boolean is_right_hand_traffic(Environment env) {
- if (env.osm instanceof Node)
- return RightAndLefthandTraffic.isRightHandTraffic(((Node) env.osm).getCoor());
- return RightAndLefthandTraffic.isRightHandTraffic(env.osm.getBBox().getCenter());
+ return RightAndLefthandTraffic.isRightHandTraffic(center(env));
}
/**
@@ -944,6 +946,43 @@ public final class ExpressionFactory {
public static Object setting(Environment env, String key) { // NO_UCD (unused code)
return env.source.settingValues.get(key);
}
+
+ /**
+ * Returns the center of the environment OSM primitive.
+ * @param env the environment
+ * @return the center of the environment OSM primitive
+ * @since 11247
+ */
+ public static LatLon center(Environment env) { // NO_UCD (unused code)
+ return env.osm instanceof Node ? ((Node) env.osm).getCoor() : env.osm.getBBox().getCenter();
+ }
+
+ /**
+ * Determines if the object is inside territories matching given ISO3166 codes.
+ * @param env the environment
+ * @param codes comma-separated list of ISO3166-1-alpha2 or ISO3166-2 country/subdivision codes
+ * @return {@code true} if the object is inside territory matching given ISO3166 codes
+ * @since 11247
+ */
+ public static boolean inside(Environment env, String codes) { // NO_UCD (unused code)
+ for (String code : codes.toUpperCase(Locale.ENGLISH).split(",")) {
+ if (Territories.isIso3166Code(code.trim(), center(env))) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Determines if the object is outside territories matching given ISO3166 codes.
+ * @param env the environment
+ * @param codes comma-separated list of ISO3166-1-alpha2 or ISO3166-2 country/subdivision codes
+ * @return {@code true} if the object is outside territory matching given ISO3166 codes
+ * @since 11247
+ */
+ public static boolean outside(Environment env, String codes) { // NO_UCD (unused code)
+ return !inside(env, codes);
+ }
}
/**
@@ -1201,7 +1240,7 @@ public final class ExpressionFactory {
try {
result = m.invoke(null, convertedArgs);
} catch (IllegalAccessException | IllegalArgumentException ex) {
- throw new RuntimeException(ex);
+ throw new JosmRuntimeException(ex);
} catch (InvocationTargetException ex) {
Main.error(ex);
return null;
@@ -1267,7 +1306,7 @@ public final class ExpressionFactory {
try {
result = m.invoke(null, convertedArgs);
} catch (IllegalAccessException | IllegalArgumentException ex) {
- throw new RuntimeException(ex);
+ throw new JosmRuntimeException(ex);
} catch (InvocationTargetException ex) {
Main.error(ex);
return null;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
index 2aa22e4..7a7082e 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
@@ -39,6 +39,7 @@ import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector;
import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.LinkSelector;
import org.openstreetmap.josm.gui.mappaint.mapcss.Subpart;
import org.openstreetmap.josm.tools.ColorHelper;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.Pair;
import org.openstreetmap.josm.tools.Utils;
@@ -65,18 +66,20 @@ public class MapCSSParser {
* Nicer way to refer to a lexical state.
*/
public static enum LexicalState {
- PREPROCESSOR(0), /* the preprocessor */
- DEFAULT(2); /* the main parser */
-
+ /** the preprocessor */
+ PREPROCESSOR(0),
+ /** the main parser */
+ DEFAULT(2);
+
int idx; // the integer, which javacc assigns to this state
-
+
LexicalState(int idx) {
if (!this.name().equals(MapCSSParserTokenManager.lexStateNames[idx])) {
- throw new RuntimeException();
+ throw new JosmRuntimeException("Wrong name for index " + idx);
}
this.idx = idx;
}
- };
+ }
/**
* Constructor which initializes the parser with a certain lexical state.
@@ -94,7 +97,7 @@ public class MapCSSParser {
try {
scs = new SimpleCharStream(in, encoding, 1, 1);
} catch (java.io.UnsupportedEncodingException e) {
- throw new RuntimeException(e);
+ throw new JosmRuntimeException(e);
}
return new MapCSSParserTokenManager(scs, initState.idx);
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
index 4f413e3..87457cb 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
@@ -59,6 +59,7 @@ import org.openstreetmap.josm.gui.mappaint.styleelement.LineElement;
import org.openstreetmap.josm.gui.preferences.SourceEntry;
import org.openstreetmap.josm.io.CachedFile;
import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.LanguageInfo;
import org.openstreetmap.josm.tools.Utils;
@@ -100,17 +101,17 @@ public class MapCSSStyleSource extends StyleSource {
/**
* Set of all supported MapCSS keys.
*/
- protected static final Set<String> SUPPORTED_KEYS = new HashSet<>();
+ static final Set<String> SUPPORTED_KEYS = new HashSet<>();
static {
Field[] declaredFields = StyleKeys.class.getDeclaredFields();
for (Field f : declaredFields) {
try {
SUPPORTED_KEYS.add((String) f.get(null));
if (!f.getName().toLowerCase(Locale.ENGLISH).replace('_', '-').equals(f.get(null))) {
- throw new RuntimeException(f.getName());
+ throw new JosmRuntimeException(f.getName());
}
} catch (IllegalArgumentException | IllegalAccessException ex) {
- throw new RuntimeException(ex);
+ throw new JosmRuntimeException(ex);
}
}
for (LineElement.LineType lt : LineElement.LineType.values()) {
@@ -467,7 +468,7 @@ public class MapCSSStyleSource extends StyleSource {
case "setting":
break;
default:
- final RuntimeException e = new RuntimeException(MessageFormat.format("Unknown MapCSS base selector {0}", base));
+ final RuntimeException e = new JosmRuntimeException(MessageFormat.format("Unknown MapCSS base selector {0}", base));
Main.warn(tr("Failed to parse Mappaint styles from ''{0}''. Error was: {1}", url, e.getMessage()));
Main.error(e);
logError(e);
@@ -620,7 +621,7 @@ public class MapCSSStyleSource extends StyleSource {
} else {
matchingRuleIndex = wayRules;
}
- } else {
+ } else if (osm instanceof Relation) {
if (((Relation) osm).isMultipolygon()) {
matchingRuleIndex = multipolygonRules;
} else if (osm.hasKey("#canvas")) {
@@ -628,10 +629,11 @@ public class MapCSSStyleSource extends StyleSource {
} else {
matchingRuleIndex = relationRules;
}
+ } else {
+ throw new IllegalArgumentException("Unsupported type: " + osm);
}
- // the declaration indices are sorted, so it suffices to save the
- // last used index
+ // the declaration indices are sorted, so it suffices to save the last used index
int lastDeclUsed = -1;
Iterator<MapCSSRule> candidates = matchingRuleIndex.getRuleCandidates(osm);
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
index f7481a3..7650268 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
@@ -7,9 +7,9 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.NoSuchElementException;
+import java.util.Set;
import java.util.function.IntFunction;
import java.util.function.IntSupplier;
-import java.util.Set;
import java.util.regex.PatternSyntaxException;
import org.openstreetmap.josm.Main;
@@ -56,8 +56,18 @@ public interface Selector {
*/
boolean matches(Environment env);
+ /**
+ * Returns the subpart, if supported. A subpart identifies different rendering layers (<code>::subpart</code> syntax).
+ * @return the subpart, if supported
+ * @throws UnsupportedOperationException if not supported
+ */
Subpart getSubpart();
+ /**
+ * Returns the scale range, an interval of the form "lower < x <= upper" where 0 <= lower < upper.
+ * @return the scale range, if supported
+ * @throws UnsupportedOperationException if not supported
+ */
Range getRange();
/**
@@ -74,6 +84,10 @@ public interface Selector {
*/
Selector optimizedBaseCheck();
+ /**
+ * The type of child of parent selector.
+ * @see ChildOrParentSelector
+ */
enum ChildOrParentSelectorType {
CHILD, PARENT, ELEMENT_OF, CROSSING, SIBLING
}
@@ -90,7 +104,8 @@ public interface Selector {
* selector_a < selector_b { ... } // the inverse notation (parent selector)
* node[traffic_calming] < way { ... } // example (way that has a traffic calming node)
* </pre>
- *
+ * <p>Child: see <a href="https://josm.openstreetmap.de/wiki/Help/Styles/MapCSSImplementation#Childselector">wiki</a>
+ * <br>Parent: see <a href="https://josm.openstreetmap.de/wiki/Help/Styles/MapCSSImplementation#Parentselector">wiki</a></p>
*/
class ChildOrParentSelector implements Selector {
public final Selector left;
@@ -481,6 +496,10 @@ public interface Selector {
}
}
+ /**
+ * In a child selector, conditions on the link between a parent and a child object.
+ * See <a href="https://josm.openstreetmap.de/wiki/Help/Styles/MapCSSImplementation#Linkselector">wiki</a>
+ */
class LinkSelector extends AbstractSelector {
public LinkSelector(List<Condition> conditions) {
@@ -510,10 +529,13 @@ public interface Selector {
@Override
public String toString() {
- return "LinkSelector{" + "conditions=" + conds + '}';
+ return "LinkSelector{conditions=" + conds + '}';
}
}
+ /**
+ * General selector. See <a href="https://josm.openstreetmap.de/wiki/Help/Styles/MapCSSImplementation#Selectors">wiki</a>
+ */
class GeneralSelector extends OptimizedGeneralSelector {
public GeneralSelector(String base, Pair<Integer, Integer> zoom, List<Condition> conds, Subpart subpart) {
@@ -535,6 +557,10 @@ public interface Selector {
}
}
+ /**
+ * Superclass of {@link GeneralSelector}. Used to create an "optimized" copy of this selector that omits the base check.
+ * @see Selector#optimizedBaseCheck
+ */
class OptimizedGeneralSelector extends AbstractSelector {
public final String base;
public final Range range;
@@ -650,7 +676,7 @@ public interface Selector {
@Override
public String toString() {
return base + (Range.ZERO_TO_INFINITY.equals(range) ? "" : range) + Utils.join("", conds)
- + (subpart != null && subpart != Subpart.DEFAULT_SUBPART ? "::" + subpart : "");
+ + (subpart != null && subpart != Subpart.DEFAULT_SUBPART ? ("::" + subpart) : "");
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java
index af12275..c30bddd 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java
@@ -18,6 +18,9 @@ import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.Utils;
+/**
+ * This is the style that defines how an area is filled.
+ */
public class AreaElement extends StyleElement {
/**
@@ -25,9 +28,31 @@ public class AreaElement extends StyleElement {
* an arbitrary color value sampled from the fillImage
*/
public Color color;
+
+ /**
+ * An image to cover this area. May be null to disable this feature.
+ */
public MapImage fillImage;
+
+ /**
+ * The text that should be written on this area.
+ */
public TextLabel text;
+
+ /**
+ * Fill the area only partially from the borders
+ * <p>
+ * Public access is discouraged.
+ * @see StyledMapRenderer#drawArea(Way, Color, MapImage, Float, Float, boolean, TextLabel)
+ */
public Float extent;
+
+ /**
+ * Areas smaller than this are filled no matter what value {@link #extent} has.
+ * <p>
+ * Public access is discouraged.
+ * @see StyledMapRenderer#drawArea(Way, Color, MapImage, Float, Float, boolean, TextLabel)
+ */
public Float extentThreshold;
protected AreaElement(Cascade c, Color color, MapImage fillImage, Float extent, Float extentThreshold, TextLabel text) {
@@ -40,6 +65,11 @@ public class AreaElement extends StyleElement {
this.text = text;
}
+ /**
+ * Create a new {@link AreaElement}
+ * @param env The current style definitions
+ * @return The area element or <code>null</code> if the area should not be filled.
+ */
public static AreaElement create(final Environment env) {
final Cascade c = env.mc.getCascade(env.layer);
MapImage fillImage = null;
diff --git a/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java b/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
index ff588ae..7b74e48 100644
--- a/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
+++ b/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
@@ -212,13 +212,13 @@ public class OsmOAuthAuthorizationClient {
for (String setCookie: setCookies) {
String[] kvPairs = setCookie.split(";");
- if (kvPairs == null || kvPairs.length == 0) {
+ if (kvPairs.length == 0) {
continue;
}
for (String kvPair : kvPairs) {
kvPair = kvPair.trim();
String[] kv = kvPair.split("=");
- if (kv == null || kv.length != 2) {
+ if (kv.length != 2) {
continue;
}
if ("_osm_session".equals(kv[0])) {
diff --git a/src/org/openstreetmap/josm/gui/preferences/PreferenceSettingFactory.java b/src/org/openstreetmap/josm/gui/preferences/PreferenceSettingFactory.java
index 7a31233..74c985c 100644
--- a/src/org/openstreetmap/josm/gui/preferences/PreferenceSettingFactory.java
+++ b/src/org/openstreetmap/josm/gui/preferences/PreferenceSettingFactory.java
@@ -1,8 +1,16 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences;
+/**
+ * Factory for {@link PreferenceSetting}.
+ * @since 1742
+ */
@FunctionalInterface
public interface PreferenceSettingFactory {
+ /**
+ * Creates preference settings.
+ * @return created preference settings
+ */
PreferenceSetting createPreferenceSetting();
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java b/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
index 773a669..1136b83 100644
--- a/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
+++ b/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
@@ -401,26 +401,28 @@ public final class PreferenceTabbedPane extends JTabbedPane implements MouseWhee
public void savePreferences() {
// create a task for downloading plugins if the user has activated, yet not downloaded, new plugins
final PluginPreference preference = getPluginPreference();
- final Set<PluginInformation> toDownload = preference.getPluginsScheduledForUpdateOrDownload();
- final PluginDownloadTask task;
- if (toDownload != null && !toDownload.isEmpty()) {
- task = new PluginDownloadTask(this, toDownload, tr("Download plugins"));
- } else {
- task = null;
- }
+ if (preference != null) {
+ final Set<PluginInformation> toDownload = preference.getPluginsScheduledForUpdateOrDownload();
+ final PluginDownloadTask task;
+ if (toDownload != null && !toDownload.isEmpty()) {
+ task = new PluginDownloadTask(this, toDownload, tr("Download plugins"));
+ } else {
+ task = null;
+ }
- // this is the task which will run *after* the plugins are downloaded
- final Runnable continuation = new PluginDownloadAfterTask(preference, task, toDownload);
-
- if (task != null) {
- // if we have to launch a plugin download task we do it asynchronously, followed
- // by the remaining "save preferences" activites run on the Swing EDT.
- Main.worker.submit(task);
- Main.worker.submit(() -> SwingUtilities.invokeLater(continuation));
- } else {
- // no need for asynchronous activities. Simply run the remaining "save preference"
- // activities on this thread (we are already on the Swing EDT
- continuation.run();
+ // this is the task which will run *after* the plugins are downloaded
+ final Runnable continuation = new PluginDownloadAfterTask(preference, task, toDownload);
+
+ if (task != null) {
+ // if we have to launch a plugin download task we do it asynchronously, followed
+ // by the remaining "save preferences" activites run on the Swing EDT.
+ Main.worker.submit(task);
+ Main.worker.submit(() -> SwingUtilities.invokeLater(continuation));
+ } else {
+ // no need for asynchronous activities. Simply run the remaining "save preference"
+ // activities on this thread (we are already on the Swing EDT
+ continuation.run();
+ }
}
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java b/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
index ac84ab9..65c734b 100644
--- a/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
+++ b/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
@@ -72,6 +72,7 @@ import javax.swing.filechooser.FileFilter;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableModel;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.ExtensionFileFilter;
@@ -96,21 +97,34 @@ import org.openstreetmap.josm.tools.LanguageInfo;
import org.openstreetmap.josm.tools.Utils;
import org.xml.sax.SAXException;
+/**
+ * Editor for JOSM extensions source entries.
+ * @since 1743
+ */
public abstract class SourceEditor extends JPanel {
+ /** the type of source entry **/
protected final SourceType sourceType;
+ /** determines if the entry type can be enabled (set as active) **/
protected final boolean canEnable;
+ /** the table of active sources **/
protected final JTable tblActiveSources;
+ /** the underlying model of active sources **/
protected final ActiveSourcesModel activeSourcesModel;
+ /** the list of available sources **/
protected final JList<ExtendedSourceEntry> lstAvailableSources;
+ /** the underlying model of available sources **/
protected final AvailableSourcesListModel availableSourcesModel;
+ /** the URL from which the available sources are fetched **/
protected final String availableSourcesUrl;
+ /** the list of source providers **/
protected final transient List<SourceProvider> sourceProviders;
private JTable tblIconPaths;
private IconPathTableModel iconPathsModel;
+ /** determines if the source providers have been initially loaded **/
protected boolean sourcesInitiallyLoaded;
/**
@@ -137,13 +151,7 @@ public abstract class SourceEditor extends JPanel {
selectionModel = new DefaultListSelectionModel();
activeSourcesModel = new ActiveSourcesModel(selectionModel);
- tblActiveSources = new JTable(activeSourcesModel) {
- // some kind of hack to prevent the table from scrolling slightly to the right when clicking on the text
- @Override
- public void scrollRectToVisible(Rectangle aRect) {
- super.scrollRectToVisible(new Rectangle(0, aRect.y, aRect.width, aRect.height));
- }
- };
+ tblActiveSources = new ScrollHackTable(activeSourcesModel);
tblActiveSources.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
tblActiveSources.setSelectionModel(selectionModel);
tblActiveSources.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
@@ -397,6 +405,12 @@ public abstract class SourceEditor extends JPanel {
*/
public abstract boolean finish();
+ /**
+ * Default implementation of {@link #finish}.
+ * @param prefHelper Helper class for specialized extensions preferences
+ * @param iconPref icons path preference
+ * @return true if restart is required
+ */
protected boolean doFinish(SourcePrefHelper prefHelper, String iconPref) {
boolean changed = prefHelper.put(activeSourcesModel.getSources());
@@ -421,6 +435,18 @@ public abstract class SourceEditor extends JPanel {
*/
protected abstract String getStr(I18nString ident);
+ static final class ScrollHackTable extends JTable {
+ ScrollHackTable(TableModel dm) {
+ super(dm);
+ }
+
+ // some kind of hack to prevent the table from scrolling slightly to the right when clicking on the text
+ @Override
+ public void scrollRectToVisible(Rectangle aRect) {
+ super.scrollRectToVisible(new Rectangle(0, aRect.y, aRect.width, aRect.height));
+ }
+ }
+
/**
* Identifiers for strings that need to be provided.
*/
@@ -500,6 +526,11 @@ public abstract class SourceEditor extends JPanel {
activeSourcesModel.removeIdxs(idxs);
}
+ /**
+ * Reload available sources.
+ * @param url the URL from which the available sources are fetched
+ * @param sourceProviders the list of source providers
+ */
protected void reloadAvailableSources(String url, List<SourceProvider> sourceProviders) {
Main.worker.submit(new SourceLoader(url, sourceProviders));
}
@@ -514,15 +545,26 @@ public abstract class SourceEditor extends JPanel {
sourcesInitiallyLoaded = true;
}
+ /**
+ * List model of available sources.
+ */
protected static class AvailableSourcesListModel extends DefaultListModel<ExtendedSourceEntry> {
private final transient List<ExtendedSourceEntry> data;
private final DefaultListSelectionModel selectionModel;
+ /**
+ * Constructs a new {@code AvailableSourcesListModel}
+ * @param selectionModel selection model
+ */
public AvailableSourcesListModel(DefaultListSelectionModel selectionModel) {
data = new ArrayList<>();
this.selectionModel = selectionModel;
}
+ /**
+ * Sets the source list.
+ * @param sources source list
+ */
public void setSources(List<ExtendedSourceEntry> sources) {
data.clear();
if (sources != null) {
@@ -542,6 +584,9 @@ public abstract class SourceEditor extends JPanel {
return data.size();
}
+ /**
+ * Deletes the selected sources.
+ */
public void deleteSelected() {
Iterator<ExtendedSourceEntry> it = data.iterator();
int i = 0;
@@ -555,6 +600,10 @@ public abstract class SourceEditor extends JPanel {
fireContentsChanged(this, 0, data.size());
}
+ /**
+ * Returns the selected sources.
+ * @return the selected sources
+ */
public List<ExtendedSourceEntry> getSelected() {
List<ExtendedSourceEntry> ret = new ArrayList<>();
for (int i = 0; i < data.size(); i++) {
@@ -566,10 +615,17 @@ public abstract class SourceEditor extends JPanel {
}
}
+ /**
+ * Table model of active sources.
+ */
protected class ActiveSourcesModel extends AbstractTableModel {
private transient List<SourceEntry> data;
private final DefaultListSelectionModel selectionModel;
+ /**
+ * Constructs a new {@code ActiveSourcesModel}.
+ * @param selectionModel selection model
+ */
public ActiveSourcesModel(DefaultListSelectionModel selectionModel) {
this.selectionModel = selectionModel;
this.data = new ArrayList<>();
@@ -614,6 +670,10 @@ public abstract class SourceEditor extends JPanel {
}
}
+ /**
+ * Sets active sources.
+ * @param sources active sources
+ */
public void setActiveSources(Collection<? extends SourceEntry> sources) {
data.clear();
if (sources != null) {
@@ -624,6 +684,10 @@ public abstract class SourceEditor extends JPanel {
fireTableDataChanged();
}
+ /**
+ * Adds an active source.
+ * @param entry source to add
+ */
public void addSource(SourceEntry entry) {
if (entry == null) return;
data.add(entry);
@@ -634,6 +698,9 @@ public abstract class SourceEditor extends JPanel {
}
}
+ /**
+ * Removes the selected sources.
+ */
public void removeSelected() {
Iterator<SourceEntry> it = data.iterator();
int i = 0;
@@ -647,6 +714,10 @@ public abstract class SourceEditor extends JPanel {
fireTableDataChanged();
}
+ /**
+ * Removes the sources at given indexes.
+ * @param idxs indexes to remove
+ */
public void removeIdxs(Collection<Integer> idxs) {
List<SourceEntry> newData = new ArrayList<>();
for (int i = 0; i < data.size(); ++i) {
@@ -658,12 +729,17 @@ public abstract class SourceEditor extends JPanel {
fireTableDataChanged();
}
+ /**
+ * Adds multiple sources.
+ * @param sources source entries
+ */
public void addExtendedSourceEntries(List<ExtendedSourceEntry> sources) {
if (sources == null) return;
for (ExtendedSourceEntry info: sources) {
data.add(new SourceEntry(info.url, info.name, info.getDisplayName(), true));
}
fireTableDataChanged();
+ selectionModel.setValueIsAdjusting(true);
selectionModel.clearSelection();
for (ExtendedSourceEntry info: sources) {
int pos = data.indexOf(info);
@@ -671,8 +747,13 @@ public abstract class SourceEditor extends JPanel {
selectionModel.addSelectionInterval(pos, pos);
}
}
+ selectionModel.setValueIsAdjusting(false);
}
+ /**
+ * Returns the active sources.
+ * @return the active sources
+ */
public List<SourceEntry> getSources() {
return new ArrayList<>(data);
}
@@ -698,13 +779,18 @@ public abstract class SourceEditor extends JPanel {
data.set(row, t2);
data.set(row + i, t1);
}
+ selectionModel.setValueIsAdjusting(true);
selectionModel.clearSelection();
for (int row: sel) {
selectionModel.addSelectionInterval(row + i, row + i);
}
+ selectionModel.setValueIsAdjusting(false);
}
}
+ /**
+ * Source entry with additional metadata.
+ */
public static class ExtendedSourceEntry extends SourceEntry implements Comparable<ExtendedSourceEntry> {
/** file name used for display */
public String simpleFileName;
@@ -813,12 +899,21 @@ public abstract class SourceEditor extends JPanel {
}
}
+ /**
+ * Dialog to edit a source entry.
+ */
protected class EditSourceEntryDialog extends ExtendedDialog {
private final JosmTextField tfTitle;
private final JosmTextField tfURL;
private JCheckBox cbActive;
+ /**
+ * Constructs a new {@code EditSourceEntryDialog}.
+ * @param parent parent component
+ * @param title dialog title
+ * @param e source entry to edit
+ */
public EditSourceEntryDialog(Component parent, String title, SourceEntry e) {
super(parent, title, new String[] {tr("Ok"), tr("Cancel")});
@@ -916,10 +1011,18 @@ public abstract class SourceEditor extends JPanel {
return tfTitle.getText();
}
+ /**
+ * Returns the entered URL / File.
+ * @return the entered URL / File
+ */
public String getURL() {
return tfURL.getText();
}
+ /**
+ * Determines if the active combobox is selected.
+ * @return {@code true} if the active combobox is selected
+ */
public boolean active() {
if (!canEnable)
throw new UnsupportedOperationException();
@@ -1141,10 +1244,17 @@ public abstract class SourceEditor extends JPanel {
}
}
+ /**
+ * Table model for icons paths.
+ */
protected static class IconPathTableModel extends AbstractTableModel {
private final List<String> data;
private final DefaultListSelectionModel selectionModel;
+ /**
+ * Constructs a new {@code IconPathTableModel}.
+ * @param selectionModel selection model
+ */
public IconPathTableModel(DefaultListSelectionModel selectionModel) {
this.selectionModel = selectionModel;
this.data = new ArrayList<>();
@@ -1175,6 +1285,10 @@ public abstract class SourceEditor extends JPanel {
updatePath(rowIndex, (String) aValue);
}
+ /**
+ * Sets the icons paths.
+ * @param paths icons paths
+ */
public void setIconPaths(Collection<String> paths) {
data.clear();
if (paths != null) {
@@ -1184,6 +1298,10 @@ public abstract class SourceEditor extends JPanel {
fireTableDataChanged();
}
+ /**
+ * Adds an icon path.
+ * @param path icon path to add
+ */
public void addPath(String path) {
if (path == null) return;
data.add(path);
@@ -1195,6 +1313,11 @@ public abstract class SourceEditor extends JPanel {
}
}
+ /**
+ * Updates icon path at given index.
+ * @param pos position
+ * @param path new path
+ */
public void updatePath(int pos, String path) {
if (path == null) return;
if (pos < 0 || pos >= getRowCount()) return;
@@ -1207,6 +1330,9 @@ public abstract class SourceEditor extends JPanel {
}
}
+ /**
+ * Removes the selected path.
+ */
public void removeSelected() {
Iterator<String> it = data.iterator();
int i = 0;
@@ -1221,6 +1347,9 @@ public abstract class SourceEditor extends JPanel {
selectionModel.clearSelection();
}
+ /**
+ * Sorts paths lexicographically.
+ */
protected void sort() {
data.sort((o1, o2) -> {
if (o1.isEmpty() && o2.isEmpty())
@@ -1231,6 +1360,10 @@ public abstract class SourceEditor extends JPanel {
});
}
+ /**
+ * Returns the icon paths.
+ * @return the icon paths
+ */
public List<String> getIconPaths() {
return new ArrayList<>(data);
}
@@ -1630,6 +1763,9 @@ public abstract class SourceEditor extends JPanel {
}
}
+ /**
+ * Helper class for specialized extensions preferences.
+ */
public abstract static class SourcePrefHelper {
private final String pref;
@@ -1670,7 +1806,7 @@ public abstract class SourceEditor extends JPanel {
Collection<Map<String, String>> src = Main.pref.getListOfStructs(pref, (Collection<Map<String, String>>) null);
if (src == null)
- return new ArrayList<SourceEntry>(getDefault());
+ return new ArrayList<>(getDefault());
List<SourceEntry> entries = new ArrayList<>();
for (Map<String, String> sourcePref : src) {
@@ -1724,6 +1860,11 @@ public abstract class SourceEditor extends JPanel {
});
}
+ /**
+ * Returns the title of the given source entry.
+ * @param entry source entry
+ * @return the title of the given source entry, or null if empty
+ */
protected String getTitleForSourceEntry(SourceEntry entry) {
return "".equals(entry.title) ? null : entry.title;
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java b/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
index 7571e04..3ae77a1 100644
--- a/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
+++ b/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
@@ -68,10 +68,17 @@ import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Shortcut;
+/**
+ * Toolbar preferences.
+ * @since 172
+ */
public class ToolbarPreferences implements PreferenceSettingFactory {
private static final String EMPTY_TOOLBAR_MARKER = "<!-empty-!>";
+ /**
+ * Action definition.
+ */
public static class ActionDefinition {
private final Action action;
private String name = "";
@@ -79,14 +86,26 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
private ImageIcon ico;
private final Map<String, Object> parameters = new ConcurrentHashMap<>();
+ /**
+ * Constructs a new {@code ActionDefinition}.
+ * @param action action
+ */
public ActionDefinition(Action action) {
this.action = action;
}
+ /**
+ * Returns action parameters.
+ * @return action parameters
+ */
public Map<String, Object> getParameters() {
return parameters;
}
+ /**
+ * Returns {@link ParameterizedActionDecorator}, if applicable.
+ * @return {@link ParameterizedActionDecorator}, if applicable
+ */
public Action getParametrizedAction() {
if (getAction() instanceof ParameterizedAction)
return new ParameterizedActionDecorator((ParameterizedAction) getAction(), parameters);
@@ -94,18 +113,34 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
return getAction();
}
+ /**
+ * Returns action.
+ * @return action
+ */
public Action getAction() {
return action;
}
+ /**
+ * Returns action name.
+ * @return action name
+ */
public String getName() {
return name;
}
+ /**
+ * Returns action display name.
+ * @return action display name
+ */
public String getDisplayName() {
return name.isEmpty() ? (String) action.getValue(Action.NAME) : name;
}
+ /**
+ * Returns display tooltip.
+ * @return display tooltip
+ */
public String getDisplayTooltip() {
if (!name.isEmpty())
return name;
@@ -117,6 +152,10 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
return (String) action.getValue(Action.SHORT_DESCRIPTION);
}
+ /**
+ * Returns display icon.
+ * @return display icon
+ */
public Icon getDisplayIcon() {
if (ico != null)
return ico;
@@ -126,27 +165,51 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
return (Icon) o;
}
+ /**
+ * Sets action name.
+ * @param name action name
+ */
public void setName(String name) {
this.name = name;
}
+ /**
+ * Returns icon name.
+ * @return icon name
+ */
public String getIcon() {
return icon;
}
+ /**
+ * Sets icon name.
+ * @param icon icon name
+ */
public void setIcon(String icon) {
this.icon = icon;
ico = ImageProvider.getIfAvailable("", icon);
}
+ /**
+ * Determines if this a separator.
+ * @return {@code true} if this a separator
+ */
public boolean isSeparator() {
return action == null;
}
+ /**
+ * Returns a new separator.
+ * @return new separator
+ */
public static ActionDefinition getSeparator() {
return new ActionDefinition(null);
}
+ /**
+ * Determines if this action has parameters.
+ * @return {@code true} if this action has parameters
+ */
public boolean hasParameters() {
if (!(getAction() instanceof ParameterizedAction)) return false;
for (Object o: parameters.values()) {
@@ -162,6 +225,10 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
private int index;
private char[] s;
+ /**
+ * Constructs a new {@code ActionParser}.
+ * @param actions actions map - can be null
+ */
public ActionParser(Map<String, Action> actions) {
this.actions = actions;
}
@@ -489,6 +556,9 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
return new Settings(rootActionsNode);
}
+ /**
+ * Toolbar preferences settings.
+ */
public class Settings extends DefaultTabPreferenceSetting {
private final class SelectedListTransferHandler extends TransferHandler {
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java b/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
index f7ca354..0991668 100644
--- a/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
@@ -276,10 +276,8 @@ public class ColorPreference implements SubPreferenceSetting {
}
for (int i = 0; i < colors.getRowCount(); ++i) {
String key = (String) colors.getValueAt(i, 0);
- if (Main.pref.putColor(key, (Color) colors.getValueAt(i, 1))) {
- if (key.startsWith("mappaint.")) {
- ret = true;
- }
+ if (Main.pref.putColor(key, (Color) colors.getValueAt(i, 1)) && key.startsWith("mappaint.")) {
+ ret = true;
}
}
OsmDataLayer.createHatchTexture();
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java b/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java
index b063242..0729d89 100644
--- a/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java
@@ -44,6 +44,16 @@ import org.openstreetmap.josm.tools.date.DateUtils;
*/
public class LafPreference implements SubPreferenceSetting {
+ static final class LafListCellRenderer implements ListCellRenderer<LookAndFeelInfo> {
+ private final DefaultListCellRenderer def = new DefaultListCellRenderer();
+
+ @Override
+ public Component getListCellRendererComponent(JList<? extends LookAndFeelInfo> list, LookAndFeelInfo value,
+ int index, boolean isSelected, boolean cellHasFocus) {
+ return def.getListCellRendererComponent(list, value.getName(), index, isSelected, cellHasFocus);
+ }
+ }
+
/**
* Factory used to create a new {@code LafPreference}.
*/
@@ -97,14 +107,7 @@ public class LafPreference implements SubPreferenceSetting {
}
}
- lafCombo.setRenderer(new ListCellRenderer<LookAndFeelInfo>() {
- private final DefaultListCellRenderer def = new DefaultListCellRenderer();
- @Override
- public Component getListCellRendererComponent(JList<? extends LookAndFeelInfo> list, LookAndFeelInfo value,
- int index, boolean isSelected, boolean cellHasFocus) {
- return def.getListCellRendererComponent(list, value.getName(), index, isSelected, cellHasFocus);
- }
- });
+ lafCombo.setRenderer(new LafListCellRenderer());
panel = new VerticallyScrollablePanel(new GridBagLayout());
panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java b/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java
index dd84ec8..16caeaa 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java
@@ -25,7 +25,7 @@ import org.openstreetmap.josm.gui.widgets.JosmTextField;
*/
public abstract class AddImageryPanel extends JPanel {
- protected final JosmTextArea rawUrl = new JosmTextArea(3, 40);
+ protected final JosmTextArea rawUrl = new JosmTextArea(3, 40).transferFocusOnTab();
protected final JosmTextField name = new JosmTextField();
protected final transient Collection<ContentValidationListener> listeners = new ArrayList<>();
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java b/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java
index 1a4436d..99ef083 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java
@@ -22,7 +22,7 @@ import org.openstreetmap.josm.tools.Utils;
public class AddTMSLayerPanel extends AddImageryPanel {
private final JosmTextField tmsZoom = new JosmTextField();
- private final JosmTextArea tmsUrl = new JosmTextArea(3, 40);
+ private final JosmTextArea tmsUrl = new JosmTextArea(3, 40).transferFocusOnTab();
private final transient KeyAdapter keyAdapter = new KeyAdapter() {
@Override
public void keyReleased(KeyEvent e) {
@@ -77,7 +77,10 @@ public class AddTMSLayerPanel extends AddImageryPanel {
@Override
public ImageryInfo getImageryInfo() {
- return new ImageryInfo(getImageryName(), getTmsUrl());
+ ImageryInfo ret = new ImageryInfo(getImageryName(), getTmsUrl());
+ ret.setImageryType(ImageryType.TMS);
+ return ret;
+
}
protected final String getTmsUrl() {
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java b/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java
index 049b36e..2ef9cd9 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java
@@ -18,6 +18,7 @@ import javax.swing.JScrollPane;
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.bbox.SlippyMapBBoxChooser;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.widgets.JosmTextArea;
@@ -36,7 +37,7 @@ public class AddWMSLayerPanel extends AddImageryPanel {
private final transient WMSLayerTree tree = new WMSLayerTree();
private final JComboBox<String> formats = new JComboBox<>();
private final JLabel wmsInstruction;
- private final JosmTextArea wmsUrl = new JosmTextArea(3, 40);
+ private final JosmTextArea wmsUrl = new JosmTextArea(3, 40).transferFocusOnTab();
private final JButton showBounds = new JButton(tr("Show bounds"));
/**
@@ -154,6 +155,7 @@ public class AddWMSLayerPanel extends AddImageryPanel {
} else {
info = wms.toImageryInfo(getImageryName(), tree.getSelectedLayers());
info.setUrl(getWmsUrl());
+ info.setImageryType(ImageryType.WMS);
}
return info;
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java b/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java
index 8f17ece..ab038e9 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java
@@ -35,6 +35,7 @@ public class AddWMTSLayerPanel extends AddImageryPanel {
@Override
protected ImageryInfo getImageryInfo() {
ImageryInfo ret = new ImageryInfo(getImageryName(), "wmts:" + sanitize(getImageryRawUrl(), ImageryType.WMTS));
+ ret.setImageryType(ImageryType.WMTS);
try {
new WMTSTileSource(ret); // check if constructor throws an error
} catch (IOException e) {
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/WMSSettingsPanel.java b/src/org/openstreetmap/josm/gui/preferences/imagery/WMSSettingsPanel.java
index dfe1e44..e3be631 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/WMSSettingsPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/WMSSettingsPanel.java
@@ -15,6 +15,7 @@ import javax.swing.SpinnerNumberModel;
import org.openstreetmap.josm.data.imagery.WMSCachedTileLoaderJob;
import org.openstreetmap.josm.gui.layer.WMSLayer;
import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
/**
* {@code JPanel} giving access to WMS settings.
@@ -22,6 +23,11 @@ import org.openstreetmap.josm.tools.GBC;
*/
public class WMSSettingsPanel extends JPanel {
+ private static final int IMAGE_SIZE_MIN = 1;
+ private static final int IMAGE_SIZE_MAX = 4096;
+ private static final int THREADS_MIN = 1;
+ private static final int THREADS_MAX = 30;
+
// WMS Settings
private final JCheckBox autozoomActive;
private final JSpinner spinSimConn;
@@ -42,7 +48,8 @@ public class WMSSettingsPanel extends JPanel {
// Simultaneous connections
add(Box.createHorizontalGlue(), GBC.eol().fill(GBC.HORIZONTAL));
JLabel labelSimConn = new JLabel(tr("Simultaneous connections:"));
- spinSimConn = new JSpinner(new SpinnerNumberModel(WMSCachedTileLoaderJob.THREAD_LIMIT.get().intValue(), 1, 30, 1));
+ int threadLimitValue = Utils.clamp(WMSCachedTileLoaderJob.THREAD_LIMIT.get(), THREADS_MIN, THREADS_MAX);
+ spinSimConn = new JSpinner(new SpinnerNumberModel(threadLimitValue, THREADS_MIN, THREADS_MAX, 1));
labelSimConn.setLabelFor(spinSimConn);
add(labelSimConn, GBC.std());
add(GBC.glue(5, 0), GBC.std());
@@ -50,7 +57,8 @@ public class WMSSettingsPanel extends JPanel {
// Tile size
JLabel labelTileSize = new JLabel(tr("Tile size:"));
- tileSize = new JSpinner(new SpinnerNumberModel(WMSLayer.PROP_IMAGE_SIZE.get().intValue(), 1, 4096, 128));
+ int tileSizeValue = Utils.clamp(WMSLayer.PROP_IMAGE_SIZE.get(), IMAGE_SIZE_MIN, IMAGE_SIZE_MAX);
+ tileSize = new JSpinner(new SpinnerNumberModel(tileSizeValue, IMAGE_SIZE_MIN, IMAGE_SIZE_MAX, 128));
labelTileSize.setLabelFor(tileSize);
add(labelTileSize, GBC.std());
add(GBC.glue(5, 0), GBC.std());
diff --git a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java
index 962e209..1025a19 100644
--- a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java
@@ -25,6 +25,19 @@ import org.openstreetmap.josm.tools.OpenBrowser;
* A panel displaying the list of known plugins.
*/
public class PluginListPanel extends VerticallyScrollablePanel {
+ static final class PluginCheckBoxMouseAdapter extends MouseAdapter {
+ private final PluginCheckBox cbPlugin;
+
+ PluginCheckBoxMouseAdapter(PluginCheckBox cbPlugin) {
+ this.cbPlugin = cbPlugin;
+ }
+
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ cbPlugin.doClick();
+ }
+ }
+
private transient PluginPreferencesModel model;
/**
@@ -128,12 +141,7 @@ public class PluginListPanel extends VerticallyScrollablePanel {
pluginText,
pi.getScaledIcon(),
SwingConstants.LEFT);
- lblPlugin.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent e) {
- cbPlugin.doClick();
- }
- });
+ lblPlugin.addMouseListener(new PluginCheckBoxMouseAdapter(cbPlugin));
gbc.gridx = 0;
gbc.gridy = ++row;
diff --git a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
index 0a4ba48..8d4028e 100644
--- a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
@@ -19,7 +19,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
@@ -429,13 +428,7 @@ public final class PluginPreference extends DefaultTabPreferenceSetting {
model.updateAvailablePlugins(pluginInfoDownloadTask.getAvailablePlugins());
// select plugins which actually have to be updated
//
- Iterator<PluginInformation> it = toUpdate.iterator();
- while (it.hasNext()) {
- PluginInformation pi = it.next();
- if (!pi.isUpdateRequired()) {
- it.remove();
- }
- }
+ toUpdate.removeIf(pi -> !pi.isUpdateRequired());
if (toUpdate.isEmpty()) {
alertNothingToUpdate();
return;
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java b/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java
index 487da11..9bb35b4 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java
@@ -36,6 +36,7 @@ import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
import org.openstreetmap.josm.gui.widgets.JosmComboBox;
import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
/**
* Projection preferences.
@@ -478,7 +479,7 @@ public class ProjectionPreference implements SubPreferenceSetting {
// If the ProjectionChoice from the preferences is not available, it
// should have been set to Mercator at JOSM start.
if (pc == null)
- throw new RuntimeException("Couldn't find the current projection in the list of available projections!");
+ throw new JosmRuntimeException("Couldn't find the current projection in the list of available projections!");
projectionCombo.addActionListener(e -> {
ProjectionChoice pc1 = (ProjectionChoice) projectionCombo.getSelectedItem();
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java b/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java
index dad6e01..895792c 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java
@@ -41,6 +41,17 @@ import org.openstreetmap.josm.tools.GBC;
*/
public class ProxyPreferencesPanel extends VerticallyScrollablePanel {
+ static final class AutoSizePanel extends JPanel {
+ AutoSizePanel() {
+ super(new GridBagLayout());
+ }
+
+ @Override
+ public Dimension getMinimumSize() {
+ return getPreferredSize();
+ }
+ }
+
/**
* The proxy policy is how JOSM will use proxy information.
*/
@@ -117,12 +128,7 @@ public class ProxyPreferencesPanel extends VerticallyScrollablePanel {
* @return panel with HTTP proxy configuration
*/
protected final JPanel buildHttpProxyConfigurationPanel() {
- JPanel pnl = new JPanel(new GridBagLayout()) {
- @Override
- public Dimension getMinimumSize() {
- return getPreferredSize();
- }
- };
+ JPanel pnl = new AutoSizePanel();
GridBagConstraints gc = new GridBagConstraints();
gc.anchor = GridBagConstraints.WEST;
@@ -193,12 +199,7 @@ public class ProxyPreferencesPanel extends VerticallyScrollablePanel {
* @return panel with SOCKS proxy configuration
*/
protected final JPanel buildSocksProxyConfigurationPanel() {
- JPanel pnl = new JPanel(new GridBagLayout()) {
- @Override
- public Dimension getMinimumSize() {
- return getPreferredSize();
- }
- };
+ JPanel pnl = new AutoSizePanel();
GridBagConstraints gc = new GridBagConstraints();
gc.anchor = GridBagConstraints.WEST;
gc.insets = new Insets(5, 5, 0, 0);
diff --git a/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java b/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java
index 3db67da..e394dbf 100644
--- a/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java
@@ -153,6 +153,7 @@ public class ValidatorTagCheckerRulesPreference implements SubPreferenceSetting
addDefault(def, "numeric", tr("Numeric values"), tr("Checks for wrong numeric values"));
addDefault(def, "religion", tr("Religion"), tr("Checks for errors on religious objects"));
addDefault(def, "relation", tr("Relations"), tr("Checks for errors on relations"));
+ addDefault(def, "territories", tr("Territories"), tr("Checks for territories-specific features"));
addDefault(def, "unnecessary", tr("Unnecessary tags"), tr("Checks for unnecessary tags"));
addDefault(def, "wikipedia", tr("Wikipedia"), tr("Checks for wrong wikipedia tags"));
// CHECKSTYLE.ON: SingleSpaceSeparator
diff --git a/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java b/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
index dfeb164..4f4871f 100644
--- a/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
+++ b/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
@@ -15,6 +15,7 @@ import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.MapStatus.BackgroundProgressMonitor;
import org.openstreetmap.josm.gui.PleaseWaitDialog;
import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.tools.bugreport.BugReport;
public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
@@ -51,10 +52,16 @@ public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
private boolean cancelable;
- private static void doInEDT(Runnable runnable) {
+ private void doInEDT(Runnable runnable) {
// This must be invoke later even if current thread is EDT because inside there is dialog.setVisible
// which freeze current code flow until modal dialog is closed
- SwingUtilities.invokeLater(runnable);
+ SwingUtilities.invokeLater(() -> {
+ try {
+ runnable.run();
+ } catch (RuntimeException e) {
+ throw BugReport.intercept(e).put("monitor", this);
+ }
+ });
}
private void setDialogVisible(boolean visible) {
@@ -171,8 +178,9 @@ public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
}
if (dialogParent != null && dialog == null) {
dialog = new PleaseWaitDialog(dialogParent);
- } else
+ } else {
throw new ProgressException("PleaseWaitDialog parent must be set");
+ }
if (windowTitle != null) {
dialog.setTitle(windowTitle);
@@ -325,4 +333,12 @@ public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
else
return parent;
}
+
+ @Override
+ public String toString() {
+ return "PleaseWaitProgressMonitor [currentProgressValue=" + currentProgressValue + ", customText=" + customText
+ + ", title=" + title + ", indeterminate=" + indeterminate + ", isInBackground=" + isInBackground
+ + ", windowTitle=" + windowTitle + ", taskId=" + taskId + ", cancelable=" + cancelable + ", state="
+ + state + "]";
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java b/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java
index ac039e3..e204eb0 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java
@@ -12,6 +12,8 @@ import javax.swing.UIManager;
import javax.swing.border.EmptyBorder;
import javax.swing.table.TableCellRenderer;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
+
/**
* This is the table cell renderer for cells for the table of tags
* in the tag editor dialog.
@@ -98,17 +100,13 @@ public class TagCellRenderer extends JLabel implements TableCellRenderer {
}
switch(vColIndex) {
- case 0: renderTagName((TagModel) value); break;
- case 1: renderTagValue((TagModel) value); break;
-
- default: throw new RuntimeException("unexpected index in switch statement");
+ case 0: renderTagName((TagModel) value); break;
+ case 1: renderTagValue((TagModel) value); break;
+ default: throw new JosmRuntimeException("unexpected index in switch statement");
}
- if (hasFocus && isSelected) {
- if (table.getSelectedColumnCount() == 1 && table.getSelectedRowCount() == 1) {
- if (table.getEditorComponent() != null) {
- table.getEditorComponent().requestFocusInWindow();
- }
- }
+ if (hasFocus && isSelected && table.getSelectedColumnCount() == 1 && table.getSelectedRowCount() == 1
+ && table.getEditorComponent() != null) {
+ table.getEditorComponent().requestFocusInWindow();
}
return this;
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
index c98a0df..b0ddcf1 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
@@ -40,6 +40,39 @@ public class AutoCompletingComboBox extends JosmComboBox<AutoCompletionListItem>
private final transient InputContext privateInputContext = InputContext.getInstance();
+ static final class InnerFocusListener implements FocusListener {
+ private final JTextComponent editorComponent;
+
+ InnerFocusListener(JTextComponent editorComponent) {
+ this.editorComponent = editorComponent;
+ }
+
+ @Override
+ public void focusLost(FocusEvent e) {
+ if (Main.map != null) {
+ Main.map.keyDetector.setEnabled(true);
+ }
+ }
+
+ @Override
+ public void focusGained(FocusEvent e) {
+ if (Main.map != null) {
+ Main.map.keyDetector.setEnabled(false);
+ }
+ // save unix system selection (middle mouse paste)
+ Clipboard sysSel = ClipboardUtils.getSystemSelection();
+ if (sysSel != null) {
+ Transferable old = ClipboardUtils.getClipboardContent(sysSel);
+ editorComponent.selectAll();
+ if (old != null) {
+ sysSel.setContents(old, null);
+ }
+ } else {
+ editorComponent.selectAll();
+ }
+ }
+ }
+
/**
* Auto-complete a JosmComboBox.
* <br>
@@ -184,34 +217,7 @@ public class AutoCompletingComboBox extends JosmComboBox<AutoCompletionListItem>
setRenderer(new AutoCompleteListCellRenderer());
final JTextComponent editorComponent = this.getEditorComponent();
editorComponent.setDocument(new AutoCompletingComboBoxDocument(this));
- editorComponent.addFocusListener(
- new FocusListener() {
- @Override
- public void focusLost(FocusEvent e) {
- if (Main.map != null) {
- Main.map.keyDetector.setEnabled(true);
- }
- }
-
- @Override
- public void focusGained(FocusEvent e) {
- if (Main.map != null) {
- Main.map.keyDetector.setEnabled(false);
- }
- // save unix system selection (middle mouse paste)
- Clipboard sysSel = ClipboardUtils.getSystemSelection();
- if (sysSel != null) {
- Transferable old = ClipboardUtils.getClipboardContent(sysSel);
- editorComponent.selectAll();
- if (old != null) {
- sysSel.setContents(old, null);
- }
- } else {
- editorComponent.selectAll();
- }
- }
- }
- );
+ editorComponent.addFocusListener(new InnerFocusListener(editorComponent));
}
/**
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
index eadb49a..0fec938 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
@@ -114,12 +114,12 @@ public class AutoCompletionManager implements DataSetListener {
/**
* the same as tagCache but for the preset keys and values can be accessed directly
*/
- protected static final MultiMap<String, String> PRESET_TAG_CACHE = new MultiMap<>();
+ static final MultiMap<String, String> PRESET_TAG_CACHE = new MultiMap<>();
/**
* Cache for tags that have been entered by the user.
*/
- protected static final Set<UserInputTag> USER_INPUT_TAG_CACHE = new LinkedHashSet<>();
+ static final Set<UserInputTag> USER_INPUT_TAG_CACHE = new LinkedHashSet<>();
/**
* the cached list of member roles
@@ -131,7 +131,7 @@ public class AutoCompletionManager implements DataSetListener {
/**
* the same as roleCache but for the preset roles can be accessed directly
*/
- protected static final Set<String> PRESET_ROLE_CACHE = new HashSet<>();
+ static final Set<String> PRESET_ROLE_CACHE = new HashSet<>();
/**
* Constructs a new {@code AutoCompletionManager}.
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java
index ad9de85..ea59de8 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java
@@ -279,10 +279,8 @@ public final class TaggingPresetReader {
all.getLast().data.add((TaggingPresetItem) o);
if (o instanceof ComboMultiSelect) {
((ComboMultiSelect) o).addListEntries(listEntries);
- } else if (o instanceof Key) {
- if (((Key) o).value == null) {
- ((Key) o).value = ""; // Fix #8530
- }
+ } else if (o instanceof Key && ((Key) o).value == null) {
+ ((Key) o).value = ""; // Fix #8530
}
listEntries = new LinkedList<>();
lastrole = null;
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java
index f5bf42b..55f50da 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java
@@ -93,10 +93,10 @@ public class TaggingPresetSelector extends SearchTextResultListPanel<TaggingPres
this.preset = preset;
TaggingPreset group = preset.group;
while (group != null) {
- Collections.addAll(groups, group.getLocaleName().toLowerCase(Locale.ENGLISH).split("\\s"));
+ addLocaleNames(groups, group);
group = group.group;
}
- Collections.addAll(names, preset.getLocaleName().toLowerCase(Locale.ENGLISH).split("\\s"));
+ addLocaleNames(names, preset);
for (TaggingPresetItem item: preset.data) {
if (item instanceof KeyedItem) {
tags.add(((KeyedItem) item).key);
@@ -117,6 +117,13 @@ public class TaggingPresetSelector extends SearchTextResultListPanel<TaggingPres
}
}
+ private static void addLocaleNames(Collection<String> collection, TaggingPreset preset) {
+ String locName = preset.getLocaleName();
+ if (locName != null) {
+ Collections.addAll(collection, locName.toLowerCase(Locale.ENGLISH).split("\\s"));
+ }
+ }
+
private static int isMatching(Collection<String> values, String ... searchString) {
int sum = 0;
for (String word: searchString) {
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java
index 262a83a..c87db5e 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java
@@ -126,11 +126,9 @@ public final class TaggingPresets {
* @param presets The tagging presets to add
*/
public static void addTaggingPresets(Collection<TaggingPreset> presets) {
- if (presets != null) {
- if (taggingPresets.addAll(presets)) {
- for (TaggingPresetListener listener : listeners) {
- listener.taggingPresetsModified();
- }
+ if (presets != null && taggingPresets.addAll(presets)) {
+ for (TaggingPresetListener listener : listeners) {
+ listener.taggingPresetsModified();
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java b/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
index 561ab37..73d088f 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
@@ -429,7 +429,7 @@ public abstract class ComboMultiSelect extends KeyedItem {
if (values_from != null) {
String[] classMethod = values_from.split("#");
- if (classMethod != null && classMethod.length == 2) {
+ if (classMethod.length == 2) {
try {
Method method = Class.forName(classMethod[0]).getMethod(classMethod[1]);
// Check method is public static String[] methodName()
@@ -516,7 +516,7 @@ public abstract class ComboMultiSelect extends KeyedItem {
if (display != null) {
for (Entry<String, PresetListEntry> entry : lhm.entrySet()) {
String k = entry.getValue().toString();
- if (k != null && k.equals(display)) {
+ if (k.equals(display)) {
value = entry.getKey();
break;
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/items/KeyedItem.java b/src/org/openstreetmap/josm/gui/tagging/presets/items/KeyedItem.java
index eb5003c..b7d749d 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/items/KeyedItem.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/items/KeyedItem.java
@@ -27,7 +27,7 @@ public abstract class KeyedItem extends TaggingPresetItem {
protected static final BooleanProperty PROP_FILL_DEFAULT = new BooleanProperty("taggingpreset.fill-default-for-tagged-primitives", false);
/** Last value of each key used in presets, used for prefilling corresponding fields */
- protected static final Map<String, String> LAST_VALUES = new HashMap<>();
+ static final Map<String, String> LAST_VALUES = new HashMap<>();
/** This specifies the property key that will be modified by the item. */
public String key; // NOSONAR
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/items/PresetLink.java b/src/org/openstreetmap/josm/gui/tagging/presets/items/PresetLink.java
index 0f2d9e2..c4d6f24 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/items/PresetLink.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/items/PresetLink.java
@@ -24,6 +24,19 @@ import org.openstreetmap.josm.tools.GBC;
*/
public class PresetLink extends TaggingPresetItem {
+ static final class TaggingPresetMouseAdapter extends MouseAdapter {
+ private final TaggingPreset t;
+
+ TaggingPresetMouseAdapter(TaggingPreset t) {
+ this.t = t;
+ }
+
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ t.actionPerformed(null);
+ }
+ }
+
/** The exact name of the preset to link to. Required. */
public String preset_name = ""; // NOSONAR
@@ -35,12 +48,7 @@ public class PresetLink extends TaggingPresetItem {
return false;
TaggingPreset t = found.get();
JLabel lbl = new TaggingPresetLabel(t);
- lbl.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent arg0) {
- t.actionPerformed(null);
- }
- });
+ lbl.addMouseListener(new TaggingPresetMouseAdapter(t));
p.add(lbl, GBC.eol().fill(GBC.HORIZONTAL));
return false;
}
diff --git a/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java b/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java
index d49f7d2..55a3a73 100644
--- a/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java
+++ b/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java
@@ -119,27 +119,23 @@ public class AdvancedKeyPressDetector implements AWTEventListener {
if (e.getID() == KeyEvent.KEY_PRESSED) {
if (timer.isRunning()) {
timer.stop();
- } else if (set.add(e.getKeyCode()) && enabled) {
- if (isFocusInMainWindow()) {
- for (KeyPressReleaseListener q: keyListeners) {
- if (Main.isTraceEnabled()) {
- Main.trace(q+" => doKeyPressed("+e+')');
- }
- q.doKeyPressed(e);
+ } else if (set.add(e.getKeyCode()) && enabled && isFocusInMainWindow()) {
+ for (KeyPressReleaseListener q: keyListeners) {
+ if (Main.isTraceEnabled()) {
+ Main.trace(q+" => doKeyPressed("+e+')');
}
+ q.doKeyPressed(e);
}
}
} else if (e.getID() == KeyEvent.KEY_RELEASED) {
if (timer.isRunning()) {
timer.stop();
- if (set.remove(e.getKeyCode()) && enabled) {
- if (isFocusInMainWindow()) {
- for (KeyPressReleaseListener q: keyListeners) {
- if (Main.isTraceEnabled()) {
- Main.trace(q+" => doKeyReleased("+e+')');
- }
- q.doKeyReleased(e);
+ if (set.remove(e.getKeyCode()) && enabled && isFocusInMainWindow()) {
+ for (KeyPressReleaseListener q: keyListeners) {
+ if (Main.isTraceEnabled()) {
+ Main.trace(q+" => doKeyReleased("+e+')');
}
+ q.doKeyReleased(e);
}
}
} else {
diff --git a/src/org/openstreetmap/josm/gui/util/GuiHelper.java b/src/org/openstreetmap/josm/gui/util/GuiHelper.java
index f16ab7e..5437e58 100644
--- a/src/org/openstreetmap/josm/gui/util/GuiHelper.java
+++ b/src/org/openstreetmap/josm/gui/util/GuiHelper.java
@@ -438,10 +438,8 @@ public final class GuiHelper {
int width = 0;
for (GraphicsDevice gd: GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices()) {
DisplayMode dm = gd.getDisplayMode();
- if (dm != null) {
- height = Math.max(height, dm.getHeight());
- width = Math.max(width, dm.getWidth());
- }
+ height = Math.max(height, dm.getHeight());
+ width = Math.max(width, dm.getWidth());
}
if (height == 0 || width == 0) {
return new Dimension(800, 600);
diff --git a/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java b/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java
index 344db9d..5612767 100644
--- a/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java
+++ b/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java
@@ -114,11 +114,8 @@ public abstract class AbstractTextComponentValidator implements ActionListener,
if (addDocumentListener) {
tc.getDocument().addDocumentListener(this);
}
- if (addActionListener) {
- if (tc instanceof JosmTextField) {
- JosmTextField tf = (JosmTextField) tc;
- tf.addActionListener(this);
- }
+ if (addActionListener && tc instanceof JosmTextField) {
+ ((JosmTextField) tc).addActionListener(this);
}
tc.addPropertyChangeListener("enabled", this);
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java b/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java
index 1e1a2a8..46f3643 100644
--- a/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java
+++ b/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java
@@ -1,6 +1,7 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.widgets;
+import java.awt.KeyboardFocusManager;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
@@ -89,6 +90,18 @@ public class JosmTextArea extends JTextArea implements FocusListener {
addFocusListener(this);
}
+ /**
+ * Restore default behaviour of focus transfer with TAB, overriden by {@link JTextArea}.
+ * @return {@code this}
+ * @since 11308
+ */
+ public JosmTextArea transferFocusOnTab() {
+ // http://stackoverflow.com/a/525867/2257172
+ setFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS, null);
+ setFocusTraversalKeys(KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS, null);
+ return this;
+ }
+
@Override
public void focusGained(FocusEvent e) {
if (Main.map != null) {
diff --git a/src/org/openstreetmap/josm/gui/widgets/UrlLabel.java b/src/org/openstreetmap/josm/gui/widgets/UrlLabel.java
index 6a5ac58..26e6207 100644
--- a/src/org/openstreetmap/josm/gui/widgets/UrlLabel.java
+++ b/src/org/openstreetmap/josm/gui/widgets/UrlLabel.java
@@ -73,7 +73,7 @@ public class UrlLabel extends JLabel implements MouseListener {
}
protected final void refresh() {
- if (url != null) {
+ if (url != null && !url.isEmpty()) {
setText("<html><a href=\""+url+"\">"+description+"</a></html>");
setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
setToolTipText(String.format("<html>%s<br/>%s</html>", url, tr("Right click = copy to clipboard")));
@@ -85,8 +85,8 @@ public class UrlLabel extends JLabel implements MouseListener {
}
/**
- * Sets the URL to be visited if the user clicks on this URL label. If null, the
- * label turns into a normal label without hyperlink.
+ * Sets the URL to be visited if the user clicks on this URL label.
+ * If null or empty, the label turns into a normal label without hyperlink.
*
* @param url the url. Can be null.
*/
@@ -108,10 +108,12 @@ public class UrlLabel extends JLabel implements MouseListener {
@Override
public void mouseClicked(MouseEvent e) {
- if (SwingUtilities.isLeftMouseButton(e)) {
- OpenBrowser.displayUrl(url);
- } else if (SwingUtilities.isRightMouseButton(e)) {
- ClipboardUtils.copyString(url);
+ if (url != null && !url.isEmpty()) {
+ if (SwingUtilities.isLeftMouseButton(e)) {
+ OpenBrowser.displayUrl(url);
+ } else if (SwingUtilities.isRightMouseButton(e)) {
+ ClipboardUtils.copyString(url);
+ }
}
}
diff --git a/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java b/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
index 6c7ee62..04fbfe2 100644
--- a/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
+++ b/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
@@ -93,7 +93,8 @@ public class BoundingBoxDownloader extends OsmServerReader {
if (crosses180th) {
// API 0.6 does not support requests crossing the 180th meridian, so make two requests
GpxData result = downloadRawGps(new Bounds(lat1, lon1, lat2, 180.0), progressMonitor);
- result.mergeFrom(downloadRawGps(new Bounds(lat1, -180.0, lat2, lon2), progressMonitor));
+ if (result != null)
+ result.mergeFrom(downloadRawGps(new Bounds(lat1, -180.0, lat2, lon2), progressMonitor));
return result;
} else {
// Simple request
diff --git a/src/org/openstreetmap/josm/io/CacheCustomContent.java b/src/org/openstreetmap/josm/io/CacheCustomContent.java
index 03734ed..ce43219 100644
--- a/src/org/openstreetmap/josm/io/CacheCustomContent.java
+++ b/src/org/openstreetmap/josm/io/CacheCustomContent.java
@@ -8,6 +8,7 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
+import java.util.concurrent.TimeUnit;
import org.openstreetmap.josm.Main;
@@ -24,13 +25,13 @@ public abstract class CacheCustomContent<T extends Throwable> {
/** Update interval meaning an update is always needed */
public static final int INTERVAL_ALWAYS = -1;
/** Update interval meaning an update is needed each hour */
- public static final int INTERVAL_HOURLY = 60*60;
+ public static final int INTERVAL_HOURLY = (int) TimeUnit.HOURS.toSeconds(1);
/** Update interval meaning an update is needed each day */
- public static final int INTERVAL_DAILY = INTERVAL_HOURLY * 24;
+ public static final int INTERVAL_DAILY = (int) TimeUnit.DAYS.toSeconds(1);
/** Update interval meaning an update is needed each week */
- public static final int INTERVAL_WEEKLY = INTERVAL_DAILY * 7;
+ public static final int INTERVAL_WEEKLY = (int) TimeUnit.DAYS.toSeconds(7);
/** Update interval meaning an update is needed each month */
- public static final int INTERVAL_MONTHLY = INTERVAL_WEEKLY * 4;
+ public static final int INTERVAL_MONTHLY = (int) TimeUnit.DAYS.toSeconds(28);
/** Update interval meaning an update is never needed */
public static final int INTERVAL_NEVER = Integer.MAX_VALUE;
@@ -87,7 +88,7 @@ public abstract class CacheCustomContent<T extends Throwable> {
if (isOffline()) {
return false;
}
- return Main.pref.getInteger("cache." + ident, 0) + updateInterval < System.currentTimeMillis()/1000
+ return Main.pref.getInteger("cache." + ident, 0) + updateInterval < TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())
|| !isCacheValid();
}
@@ -135,7 +136,7 @@ public abstract class CacheCustomContent<T extends Throwable> {
public byte[] updateForce() throws T {
this.data = updateData();
saveToDisk();
- Main.pref.putInteger("cache." + ident, (int) (System.currentTimeMillis()/1000));
+ Main.pref.putInteger("cache." + ident, (int) (TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())));
return data;
}
diff --git a/src/org/openstreetmap/josm/io/CachedFile.java b/src/org/openstreetmap/josm/io/CachedFile.java
index 113ce1e..9280f3b 100644
--- a/src/org/openstreetmap/josm/io/CachedFile.java
+++ b/src/org/openstreetmap/josm/io/CachedFile.java
@@ -23,6 +23,7 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -75,7 +76,7 @@ public class CachedFile implements Closeable {
protected boolean initialized;
public static final long DEFAULT_MAXTIME = -1L;
- public static final long DAYS = 24L*60L*60L; // factor to get caching time in days
+ public static final long DAYS = TimeUnit.DAYS.toSeconds(1); // factor to get caching time in days
private final Map<String, String> httpHeaders = new ConcurrentHashMap<>();
@@ -337,12 +338,9 @@ public class CachedFile implements Closeable {
Enumeration<? extends ZipEntry> entries = zipFile.entries();
while (entries.hasMoreElements()) {
ZipEntry entry = entries.nextElement();
- if (entry.getName().endsWith('.' + extension)) {
- /* choose any file with correct extension. When more than
- one file, prefer the one which matches namepart */
- if (resentry == null || entry.getName().indexOf(namepart) >= 0) {
- resentry = entry;
- }
+ // choose any file with correct extension. When more than one file, prefer the one which matches namepart
+ if (entry.getName().endsWith('.' + extension) && (resentry == null || entry.getName().indexOf(namepart) >= 0)) {
+ resentry = entry;
}
}
if (resentry != null) {
@@ -416,7 +414,7 @@ public class CachedFile implements Closeable {
String prefKey = getPrefKey(url, destDir);
String urlStr = url.toExternalForm();
long age = 0L;
- long lMaxAge = maxAge;
+ long maxAgeMillis = maxAge;
Long ifModifiedSince = null;
File localFile = null;
List<String> localPathEntry = new ArrayList<>(Main.pref.getCollection(prefKey));
@@ -435,10 +433,10 @@ public class CachedFile implements Closeable {
if (maxAge == DEFAULT_MAXTIME
|| maxAge <= 0 // arbitrary value <= 0 is deprecated
) {
- lMaxAge = Main.pref.getInteger("mirror.maxtime", 7*24*60*60); // one week
+ maxAgeMillis = TimeUnit.SECONDS.toMillis(Main.pref.getLong("mirror.maxtime", TimeUnit.DAYS.toSeconds(7)));
}
age = System.currentTimeMillis() - Long.parseLong(localPathEntry.get(0));
- if (offline || age < lMaxAge*1000) {
+ if (offline || age < maxAgeMillis) {
return localFile;
}
if (cachingStrategy == CachingStrategy.IfModifiedSince) {
@@ -497,7 +495,7 @@ public class CachedFile implements Closeable {
destDirFile.getPath(), localFile.getPath()));
}
} catch (IOException e) {
- if (age >= lMaxAge*1000 && age < lMaxAge*1000*2) {
+ if (age >= maxAgeMillis && age < maxAgeMillis*2) {
Main.warn(tr("Failed to load {0}, use cached file and retry next time: {1}", urlStr, e));
return localFile;
} else {
diff --git a/src/org/openstreetmap/josm/io/ChangesetQuery.java b/src/org/openstreetmap/josm/io/ChangesetQuery.java
index 9c6228d..5d943a7 100644
--- a/src/org/openstreetmap/josm/io/ChangesetQuery.java
+++ b/src/org/openstreetmap/josm/io/ChangesetQuery.java
@@ -392,7 +392,7 @@ public class ChangesetQuery {
protected Date[] parseTime(String value) throws ChangesetQueryUrlException {
String[] dates = value.split(",");
- if (dates == null || dates.length == 0 || dates.length > 2)
+ if (dates.length == 0 || dates.length > 2)
throw new ChangesetQueryUrlException(
tr("Unexpected value for ''{0}'' in changeset query url, got {1}", "time", value));
if (dates.length == 1)
diff --git a/src/org/openstreetmap/josm/io/GpxReader.java b/src/org/openstreetmap/josm/io/GpxReader.java
index 6bd30eb..4d945e4 100644
--- a/src/org/openstreetmap/josm/io/GpxReader.java
+++ b/src/org/openstreetmap/josm/io/GpxReader.java
@@ -398,10 +398,11 @@ public class GpxReader implements GpxConstants {
data.put(META_AUTHOR_LINK, currentLink);
} else if (currentState != State.LINK) {
Map<String, Object> attr = getAttr();
- if (!attr.containsKey(META_LINKS)) {
+ if (attr != null && !attr.containsKey(META_LINKS)) {
attr.put(META_LINKS, new LinkedList<GpxLink>());
}
- ((Collection<GpxLink>) attr.get(META_LINKS)).add(currentLink);
+ if (attr != null)
+ ((Collection<GpxLink>) attr.get(META_LINKS)).add(currentLink);
}
break;
case WPT:
diff --git a/src/org/openstreetmap/josm/io/GpxWriter.java b/src/org/openstreetmap/josm/io/GpxWriter.java
index 9a04d09..0da1cbd 100644
--- a/src/org/openstreetmap/josm/io/GpxWriter.java
+++ b/src/org/openstreetmap/josm/io/GpxWriter.java
@@ -26,6 +26,7 @@ import org.openstreetmap.josm.data.gpx.GpxTrack;
import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
import org.openstreetmap.josm.data.gpx.IWithAttributes;
import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
/**
* Writes GPX files from GPX data or OSM data.
@@ -290,7 +291,7 @@ public class GpxWriter extends XmlWriter implements GpxConstants {
type = "trkpt";
break;
default:
- throw new RuntimeException(tr("Unknown mode {0}.", mode));
+ throw new JosmRuntimeException(tr("Unknown mode {0}.", mode));
}
if (pnt != null) {
LatLon c = pnt.getCoor();
diff --git a/src/org/openstreetmap/josm/io/MessageNotifier.java b/src/org/openstreetmap/josm/io/MessageNotifier.java
index f72a16c..45e5f42 100644
--- a/src/org/openstreetmap/josm/io/MessageNotifier.java
+++ b/src/org/openstreetmap/josm/io/MessageNotifier.java
@@ -92,7 +92,7 @@ public final class MessageNotifier {
if (Main.isOffline(OnlineResource.OSM_API)) {
Main.info(tr("{0} not available (offline mode)", tr("Message notifier")));
} else if (!isRunning() && interval > 0 && isUserEnoughIdentified()) {
- task = EXECUTOR.scheduleAtFixedRate(WORKER, 0, interval * 60L, TimeUnit.SECONDS);
+ task = EXECUTOR.scheduleAtFixedRate(WORKER, 0, TimeUnit.MINUTES.toSeconds(interval), TimeUnit.SECONDS);
Main.info("Message notifier active (checks every "+interval+" minute"+(interval > 1 ? "s" : "")+')');
}
}
diff --git a/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java b/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
index 8fbde89..ac1b014 100644
--- a/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
+++ b/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
@@ -192,12 +192,10 @@ public class MultiFetchServerObjectReader extends OsmServerReader {
if (relation.isNew()) return this;
remember(relation.getPrimitiveId());
for (RelationMember member : !recursesDown() ? relation.getMembers() : Collections.<RelationMember>emptyList()) {
- if (OsmPrimitiveType.from(member.getMember()).equals(OsmPrimitiveType.RELATION)) {
- // avoid infinite recursion in case of cyclic dependencies in relations
- //
- if (relations.contains(member.getMember().getId())) {
- continue;
- }
+ // avoid infinite recursion in case of cyclic dependencies in relations
+ if (OsmPrimitiveType.from(member.getMember()).equals(OsmPrimitiveType.RELATION)
+ && relations.contains(member.getMember().getId())) {
+ continue;
}
if (!member.getMember().isIncomplete()) {
append(member.getMember());
diff --git a/src/org/openstreetmap/josm/io/NmeaReader.java b/src/org/openstreetmap/josm/io/NmeaReader.java
index 9c975d9..f9ab0ee 100644
--- a/src/org/openstreetmap/josm/io/NmeaReader.java
+++ b/src/org/openstreetmap/josm/io/NmeaReader.java
@@ -19,6 +19,7 @@ import org.openstreetmap.josm.data.gpx.GpxConstants;
import org.openstreetmap.josm.data.gpx.GpxData;
import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.date.DateUtils;
/**
@@ -115,7 +116,7 @@ public class NmeaReader {
d = rmcTimeFmtStd.parse(p, new ParsePosition(0));
}
if (d == null)
- throw new RuntimeException("Date is malformed"); // malformed
+ throw new JosmRuntimeException("Date is malformed");
return d;
}
diff --git a/src/org/openstreetmap/josm/io/OsmApi.java b/src/org/openstreetmap/josm/io/OsmApi.java
index 94d4af4..271db71 100644
--- a/src/org/openstreetmap/josm/io/OsmApi.java
+++ b/src/org/openstreetmap/josm/io/OsmApi.java
@@ -666,12 +666,10 @@ public class OsmApi extends OsmConnection {
Main.info(response.getResponseMessage());
int retCode = response.getResponseCode();
- if (retCode >= 500) {
- if (retries-- > 0) {
- sleepAndListen(retries, monitor);
- Main.info(tr("Starting retry {0} of {1}.", getMaxRetries() - retries, getMaxRetries()));
- continue;
- }
+ if (retCode >= 500 && retries-- > 0) {
+ sleepAndListen(retries, monitor);
+ Main.info(tr("Starting retry {0} of {1}.", getMaxRetries() - retries, getMaxRetries()));
+ continue;
}
final String responseBody = response.fetchContent();
@@ -826,7 +824,7 @@ public class OsmApi extends OsmConnection {
String encodedMessage = Utils.encodeUrl(closeMessage);
StringBuilder urlBuilder = noteStringBuilder(note)
.append("/close");
- if (encodedMessage != null && !encodedMessage.trim().isEmpty()) {
+ if (!encodedMessage.trim().isEmpty()) {
urlBuilder.append("?text=");
urlBuilder.append(encodedMessage);
}
@@ -848,7 +846,7 @@ public class OsmApi extends OsmConnection {
String encodedMessage = Utils.encodeUrl(reactivateMessage);
StringBuilder urlBuilder = noteStringBuilder(note)
.append("/reopen");
- if (encodedMessage != null && !encodedMessage.trim().isEmpty()) {
+ if (!encodedMessage.trim().isEmpty()) {
urlBuilder.append("?text=");
urlBuilder.append(encodedMessage);
}
diff --git a/src/org/openstreetmap/josm/io/OsmExporter.java b/src/org/openstreetmap/josm/io/OsmExporter.java
index 44c7c21..d3fcd8e 100644
--- a/src/org/openstreetmap/josm/io/OsmExporter.java
+++ b/src/org/openstreetmap/josm/io/OsmExporter.java
@@ -81,19 +81,16 @@ public class OsmExporter extends FileExporter {
private void save(File file, OsmDataLayer layer, boolean noBackup) {
File tmpFile = null;
try {
- // use a tmp file because if something errors out in the
- // process of writing the file, we might just end up with
- // a truncated file. That can destroy lots of work.
+ // use a tmp file because if something errors out in the process of writing the file,
+ // we might just end up with a truncated file. That can destroy lots of work.
if (file.exists()) {
tmpFile = new File(file.getPath() + '~');
Utils.copyFile(file, tmpFile);
}
doSave(file, layer);
- if (noBackup || !Main.pref.getBoolean("save.keepbackup", false)) {
- if (tmpFile != null) {
- Utils.deleteFile(tmpFile);
- }
+ if ((noBackup || !Main.pref.getBoolean("save.keepbackup", false)) && tmpFile != null) {
+ Utils.deleteFile(tmpFile);
}
layer.onPostSaveToFile();
} catch (IOException e) {
@@ -106,8 +103,7 @@ public class OsmExporter extends FileExporter {
);
try {
- // if the file save failed, then the tempfile will not
- // be deleted. So, restore the backup if we made one.
+ // if the file save failed, then the tempfile will not be deleted. So, restore the backup if we made one.
if (tmpFile != null && tmpFile.exists()) {
Utils.copyFile(tmpFile, file);
}
diff --git a/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java b/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java
index 537e310..b807b5d 100644
--- a/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java
@@ -60,11 +60,9 @@ public class OsmServerHistoryReader extends OsmServerReader {
progressMonitor.beginTask("");
try {
progressMonitor.indeterminateSubTask(tr("Contacting OSM Server..."));
- StringBuilder sb = new StringBuilder();
- sb.append(primitiveType.getAPIName())
- .append('/').append(id).append("/history");
+ final String urlStr = primitiveType.getAPIName() + '/' + id + "/history";
- try (InputStream in = getInputStream(sb.toString(), progressMonitor.createSubTaskMonitor(1, true))) {
+ try (InputStream in = getInputStream(urlStr, progressMonitor.createSubTaskMonitor(1, true))) {
if (in == null)
return null;
progressMonitor.indeterminateSubTask(tr("Downloading history..."));
diff --git a/src/org/openstreetmap/josm/io/OsmServerWriter.java b/src/org/openstreetmap/josm/io/OsmServerWriter.java
index fec25f0..d44a8b8 100644
--- a/src/org/openstreetmap/josm/io/OsmServerWriter.java
+++ b/src/org/openstreetmap/josm/io/OsmServerWriter.java
@@ -10,6 +10,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -63,10 +64,6 @@ public class OsmServerWriter {
private final OsmApi api = OsmApi.getOsmApi();
private boolean canceled;
- private static final int MSECS_PER_SECOND = 1000;
- private static final int SECONDS_PER_MINUTE = 60;
- private static final int MSECS_PER_MINUTE = MSECS_PER_SECOND * SECONDS_PER_MINUTE;
-
private long uploadStartTime;
protected String timeLeft(int progress, int listSize) {
@@ -78,8 +75,8 @@ public class OsmServerWriter {
double uploadsPerMs = (double) progress / elapsed;
double uploadsLeft = (double) listSize - progress;
long msLeft = (long) (uploadsLeft / uploadsPerMs);
- long minutesLeft = msLeft / MSECS_PER_MINUTE;
- long secondsLeft = (msLeft / MSECS_PER_SECOND) % SECONDS_PER_MINUTE;
+ long minutesLeft = msLeft / TimeUnit.MINUTES.toMillis(1);
+ long secondsLeft = (msLeft / TimeUnit.SECONDS.toMillis(1)) % TimeUnit.MINUTES.toSeconds(1);
StringBuilder timeLeftStr = new StringBuilder().append(minutesLeft).append(':');
if (secondsLeft < 10) {
timeLeftStr.append('0');
diff --git a/src/org/openstreetmap/josm/io/OverpassDownloadReader.java b/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
index cb4f8bc..64c67a6 100644
--- a/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
+++ b/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
@@ -8,6 +8,7 @@ import java.io.InputStream;
import java.util.EnumMap;
import java.util.List;
import java.util.NoSuchElementException;
+import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -32,6 +33,19 @@ import org.openstreetmap.josm.tools.Utils;
*/
public class OverpassDownloadReader extends BoundingBoxDownloader {
+ static final class OverpassOsmReader extends OsmReader {
+ @Override
+ protected void parseUnknown(boolean printWarning) throws XMLStreamException {
+ if ("remark".equals(parser.getLocalName()) && parser.getEventType() == XMLStreamConstants.START_ELEMENT) {
+ final String text = parser.getElementText();
+ if (text.contains("runtime error")) {
+ throw new XMLStreamException(text);
+ }
+ }
+ super.parseUnknown(printWarning);
+ }
+ }
+
final String overpassServer;
final String overpassQuery;
@@ -131,9 +145,9 @@ public class OverpassDownloadReader extends BoundingBoxDownloader {
final Matcher timeoutMatcher = Pattern.compile("\\[timeout:(\\d+)\\]").matcher(overpassQuery);
final int timeout;
if (timeoutMatcher.find()) {
- timeout = 1000 * Integer.parseInt(timeoutMatcher.group(1));
+ timeout = (int) TimeUnit.SECONDS.toMillis(Integer.parseInt(timeoutMatcher.group(1)));
} else {
- timeout = 180_000;
+ timeout = (int) TimeUnit.MINUTES.toMillis(3);
}
request.setConnectTimeout(timeout);
request.setReadTimeout(timeout);
@@ -146,18 +160,7 @@ public class OverpassDownloadReader extends BoundingBoxDownloader {
@Override
protected DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException {
- return new OsmReader() {
- @Override
- protected void parseUnknown(boolean printWarning) throws XMLStreamException {
- if ("remark".equals(parser.getLocalName()) && parser.getEventType() == XMLStreamConstants.START_ELEMENT) {
- final String text = parser.getElementText();
- if (text.contains("runtime error")) {
- throw new XMLStreamException(text);
- }
- }
- super.parseUnknown(printWarning);
- }
- }.doParseDataSet(source, progressMonitor);
+ return new OverpassOsmReader().doParseDataSet(source, progressMonitor);
}
@Override
diff --git a/src/org/openstreetmap/josm/io/imagery/ImageryReader.java b/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
index 690fd3b..bd3540b 100644
--- a/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
+++ b/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
@@ -21,6 +21,7 @@ import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
import org.openstreetmap.josm.data.imagery.Shape;
import org.openstreetmap.josm.io.CachedFile;
import org.openstreetmap.josm.tools.HttpClient;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.LanguageInfo;
import org.openstreetmap.josm.tools.MultiMap;
import org.openstreetmap.josm.tools.Utils;
@@ -272,7 +273,7 @@ public class ImageryReader implements Closeable {
public void endElement(String namespaceURI, String qName, String rqName) {
switch (states.pop()) {
case INIT:
- throw new RuntimeException("parsing error: more closing than opening elements");
+ throw new JosmRuntimeException("parsing error: more closing than opening elements");
case ENTRY:
if ("entry".equals(qName)) {
entry.setNoTileHeaders(noTileHeaders);
@@ -289,11 +290,9 @@ public class ImageryReader implements Closeable {
}
break;
case MIRROR:
- if ("mirror".equals(qName)) {
- if (mirrorEntry != null) {
- entry.addMirror(mirrorEntry);
- mirrorEntry = null;
- }
+ if ("mirror".equals(qName) && mirrorEntry != null) {
+ entry.addMirror(mirrorEntry);
+ mirrorEntry = null;
}
break;
case MIRROR_ATTRIBUTE:
diff --git a/src/org/openstreetmap/josm/io/imagery/WMSImagery.java b/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
index b21afa3..01113ef 100644
--- a/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
+++ b/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
@@ -242,7 +242,7 @@ public class WMSImagery {
child = getChild(child, "OnlineResource");
if (child != null) {
String baseURL = child.getAttribute("xlink:href");
- if (baseURL != null && !baseURL.equals(serviceUrlStr)) {
+ if (!baseURL.equals(serviceUrlStr)) {
Main.info("GetCapabilities specifies a different service URL: " + baseURL);
serviceUrl = new URL(baseURL);
}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java b/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
index 84de074..0e2a326 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
@@ -52,6 +52,19 @@ public class AddTagsDialog extends ExtendedDialog {
private final String sender;
private static final Set<String> trustedSenders = new HashSet<>();
+ static final class PropertyTableModel extends DefaultTableModel {
+ private final Class<?>[] types = {Boolean.class, String.class, Object.class, ExistingValues.class};
+
+ PropertyTableModel(int rowCount) {
+ super(new String[] {tr("Assume"), tr("Key"), tr("Value"), tr("Existing values")}, rowCount);
+ }
+
+ @Override
+ public Class<?> getColumnClass(int c) {
+ return types[c];
+ }
+ }
+
/**
* Class for displaying "delete from ... objects" in the table
*/
@@ -130,14 +143,7 @@ public class AddTagsDialog extends ExtendedDialog {
this.sender = senderName;
- final DefaultTableModel tm = new DefaultTableModel(new String[] {tr("Assume"), tr("Key"), tr("Value"), tr("Existing values")},
- tags.length) {
- private final Class<?>[] types = {Boolean.class, String.class, Object.class, ExistingValues.class};
- @Override
- public Class<?> getColumnClass(int c) {
- return types[c];
- }
- };
+ final DefaultTableModel tm = new PropertyTableModel(tags.length);
sel = primitives;
count = new int[tags.length];
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
index 031417b..455b439 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
@@ -5,6 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.marktr;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.math.BigInteger;
import java.net.ServerSocket;
import java.net.Socket;
@@ -236,7 +237,9 @@ public class RemoteControlHttpsServer extends Thread {
char[] entryPassword = KEYENTRY_PASSWORD.get().toCharArray();
ks.setKeyEntry(ENTRY_ALIAS, pair.getPrivate(), entryPassword, new Certificate[]{cert});
- ks.store(Files.newOutputStream(path, StandardOpenOption.CREATE), storePassword);
+ try (OutputStream out = Files.newOutputStream(path, StandardOpenOption.CREATE)) {
+ ks.store(out, storePassword);
+ }
}
return path;
}
@@ -380,16 +383,14 @@ public class RemoteControlHttpsServer extends Thread {
this.server = factory.createServerSocket(port, 1, ipv6 ?
RemoteControl.getInet6Address() : RemoteControl.getInet4Address());
- if (Main.isTraceEnabled()) {
- if (server instanceof SSLServerSocket) {
- SSLServerSocket sslServer = (SSLServerSocket) server;
- Main.trace("SSL server - Enabled Cipher suites: "+Arrays.toString(sslServer.getEnabledCipherSuites()));
- Main.trace("SSL server - Enabled Protocols: "+Arrays.toString(sslServer.getEnabledProtocols()));
- Main.trace("SSL server - Enable Session Creation: "+sslServer.getEnableSessionCreation());
- Main.trace("SSL server - Need Client Auth: "+sslServer.getNeedClientAuth());
- Main.trace("SSL server - Want Client Auth: "+sslServer.getWantClientAuth());
- Main.trace("SSL server - Use Client Mode: "+sslServer.getUseClientMode());
- }
+ if (Main.isTraceEnabled() && server instanceof SSLServerSocket) {
+ SSLServerSocket sslServer = (SSLServerSocket) server;
+ Main.trace("SSL server - Enabled Cipher suites: "+Arrays.toString(sslServer.getEnabledCipherSuites()));
+ Main.trace("SSL server - Enabled Protocols: "+Arrays.toString(sslServer.getEnabledProtocols()));
+ Main.trace("SSL server - Enable Session Creation: "+sslServer.getEnableSessionCreation());
+ Main.trace("SSL server - Need Client Auth: "+sslServer.getNeedClientAuth());
+ Main.trace("SSL server - Want Client Auth: "+sslServer.getWantClientAuth());
+ Main.trace("SSL server - Use Client Mode: "+sslServer.getUseClientMode());
}
}
diff --git a/src/org/openstreetmap/josm/io/session/SessionReader.java b/src/org/openstreetmap/josm/io/session/SessionReader.java
index ac5359e..c97b427 100644
--- a/src/org/openstreetmap/josm/io/session/SessionReader.java
+++ b/src/org/openstreetmap/josm/io/session/SessionReader.java
@@ -42,6 +42,7 @@ 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.JosmRuntimeException;
import org.openstreetmap.josm.tools.MultiMap;
import org.openstreetmap.josm.tools.Utils;
import org.w3c.dom.Document;
@@ -98,7 +99,7 @@ public class SessionReader {
try {
importer = importerClass.getConstructor().newInstance();
} catch (ReflectiveOperationException e) {
- throw new RuntimeException(e);
+ throw new JosmRuntimeException(e);
}
return importer;
}
@@ -378,7 +379,7 @@ public class SessionReader {
String activeAtt = layersEl.getAttribute("active");
try {
- active = (activeAtt != null && !activeAtt.isEmpty()) ? Integer.parseInt(activeAtt)-1 : -1;
+ active = !activeAtt.isEmpty() ? (Integer.parseInt(activeAtt)-1) : -1;
} catch (NumberFormatException e) {
Main.warn("Unsupported value for 'active' layer attribute. Ignoring it. Error was: "+e.getMessage());
active = -1;
@@ -405,15 +406,14 @@ public class SessionReader {
}
if (idx == null) {
error(tr("unexpected format of attribute ''index'' for element ''layer''"));
- }
- if (elems.containsKey(idx)) {
+ } else if (elems.containsKey(idx)) {
error(tr("attribute ''index'' ({0}) for element ''layer'' must be unique", Integer.toString(idx)));
}
elems.put(idx, e);
deps.putVoid(idx);
String depStr = e.getAttribute("depends");
- if (depStr != null && !depStr.isEmpty()) {
+ if (!depStr.isEmpty()) {
for (String sd : depStr.split(",")) {
Integer d = null;
try {
@@ -573,7 +573,7 @@ public class SessionReader {
cancel = dlg.getValue() != 2;
});
} catch (InvocationTargetException | InterruptedException ex) {
- throw new RuntimeException(ex);
+ throw new JosmRuntimeException(ex);
}
}
diff --git a/src/org/openstreetmap/josm/io/session/SessionWriter.java b/src/org/openstreetmap/josm/io/session/SessionWriter.java
index 5f002b1..f220938 100644
--- a/src/org/openstreetmap/josm/io/session/SessionWriter.java
+++ b/src/org/openstreetmap/josm/io/session/SessionWriter.java
@@ -39,6 +39,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.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.MultiMap;
import org.openstreetmap.josm.tools.Utils;
import org.w3c.dom.Document;
@@ -96,7 +97,7 @@ public class SessionWriter {
try {
return exporterClass.getConstructor(layerClass).newInstance(layer);
} catch (ReflectiveOperationException e) {
- throw new RuntimeException(e);
+ throw new JosmRuntimeException(e);
}
}
@@ -173,7 +174,7 @@ public class SessionWriter {
* @throws IOException if any I/O error occurs
*/
public OutputStream getOutputStreamZip(String zipPath) throws IOException {
- if (!isZip()) throw new RuntimeException();
+ if (!isZip()) throw new JosmRuntimeException("not zip");
ZipEntry entry = new ZipEntry(zipPath);
zipOut.putNextEntry(entry);
return zipOut;
@@ -276,7 +277,7 @@ public class SessionWriter {
DOMSource source = new DOMSource(doc);
trans.transform(source, result);
} catch (TransformerException e) {
- throw new RuntimeException(e);
+ throw new JosmRuntimeException(e);
}
}
diff --git a/src/org/openstreetmap/josm/plugins/PluginHandler.java b/src/org/openstreetmap/josm/plugins/PluginHandler.java
index 19f301b..bc12b19 100644
--- a/src/org/openstreetmap/josm/plugins/PluginHandler.java
+++ b/src/org/openstreetmap/josm/plugins/PluginHandler.java
@@ -36,6 +36,7 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
import java.util.jar.JarFile;
import java.util.stream.Collectors;
@@ -223,6 +224,9 @@ public final class PluginHandler {
* List of unmaintained plugins. Not really up-to-date as the vast majority of plugins are not maintained after a few months, sadly...
*/
static final List<String> UNMAINTAINED_PLUGINS = Collections.unmodifiableList(Arrays.asList(
+ "NanoLog", // See https://trac.openstreetmap.org/changeset/29404/subversion
+ "irsrectify", // See https://trac.openstreetmap.org/changeset/29404/subversion
+ "surveyor2", // See https://trac.openstreetmap.org/changeset/29404/subversion
"gpsbabelgui",
"Intersect_way",
"ContourOverlappingMerge", // See #11202, #11518, https://github.com/bularcasergiu/ContourOverlappingMerge/issues/1
@@ -383,7 +387,7 @@ public final class PluginHandler {
long tim = System.currentTimeMillis();
long last = Main.pref.getLong("pluginmanager.lastupdate", 0);
Integer maxTime = Main.pref.getInteger("pluginmanager.time-based-update.interval", DEFAULT_TIME_BASED_UPDATE_INTERVAL);
- long d = (tim - last) / (24 * 60 * 60 * 1000L);
+ long d = TimeUnit.MILLISECONDS.toDays(tim - last);
if ((last <= 0) || (maxTime <= 0)) {
Main.pref.put("pluginmanager.lastupdate", Long.toString(tim));
} else if (d > maxTime) {
@@ -545,12 +549,7 @@ public final class PluginHandler {
Main.worker.submit(() -> {
// Build list of plugins to download
Set<PluginInformation> toDownload = new HashSet<>(pluginInfoDownloadTask.getAvailablePlugins());
- for (Iterator<PluginInformation> it = toDownload.iterator(); it.hasNext();) {
- PluginInformation info = it.next();
- if (!missingRequiredPlugin.contains(info.getName())) {
- it.remove();
- }
- }
+ toDownload.removeIf(info -> !missingRequiredPlugin.contains(info.getName()));
// Check if something has still to be downloaded
if (!toDownload.isEmpty()) {
// download plugins
@@ -891,11 +890,13 @@ public final class PluginHandler {
}
Map<String, PluginInformation> infos = loadLocallyAvailablePluginInformation(monitor.createSubTaskMonitor(1, false));
List<PluginInformation> ret = new LinkedList<>();
- for (Iterator<String> it = plugins.iterator(); it.hasNext();) {
- String plugin = it.next();
- if (infos.containsKey(plugin)) {
- ret.add(infos.get(plugin));
- it.remove();
+ if (infos != null) {
+ for (Iterator<String> it = plugins.iterator(); it.hasNext();) {
+ String plugin = it.next();
+ if (infos.containsKey(plugin)) {
+ ret.add(infos.get(plugin));
+ it.remove();
+ }
}
}
if (!plugins.isEmpty()) {
diff --git a/src/org/openstreetmap/josm/plugins/PluginListParser.java b/src/org/openstreetmap/josm/plugins/PluginListParser.java
index a208146..7155e8d 100644
--- a/src/org/openstreetmap/josm/plugins/PluginListParser.java
+++ b/src/org/openstreetmap/josm/plugins/PluginListParser.java
@@ -94,14 +94,12 @@ public class PluginListParser {
try {
if (name != null) {
PluginInformation info = createInfo(name, url, manifest);
- if (info != null) {
- for (PluginProxy plugin : PluginHandler.pluginList) {
- if (plugin.getPluginInformation().name.equals(info.getName())) {
- info.localversion = plugin.getPluginInformation().localversion;
- }
+ for (PluginProxy plugin : PluginHandler.pluginList) {
+ if (plugin.getPluginInformation().name.equals(info.getName())) {
+ info.localversion = plugin.getPluginInformation().localversion;
}
- ret.add(info);
}
+ ret.add(info);
}
} catch (PluginListParseException ex) {
Main.error(ex);
diff --git a/src/org/openstreetmap/josm/plugins/PluginPreferenceFactory.java b/src/org/openstreetmap/josm/plugins/PluginPreferenceFactory.java
index 4b92b9a..31f97b8 100644
--- a/src/org/openstreetmap/josm/plugins/PluginPreferenceFactory.java
+++ b/src/org/openstreetmap/josm/plugins/PluginPreferenceFactory.java
@@ -4,10 +4,18 @@ package org.openstreetmap.josm.plugins;
import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
+/**
+ * Preference settings factory for plugins.
+ * @since 1742
+ */
public class PluginPreferenceFactory implements PreferenceSettingFactory {
private final PluginProxy plugin;
+ /**
+ * Constructs a new {@code PluginPreferenceFactory}.
+ * @param plugin plugin proxy
+ */
public PluginPreferenceFactory(PluginProxy plugin) {
this.plugin = plugin;
}
diff --git a/src/org/openstreetmap/josm/tools/AudioPlayer.java b/src/org/openstreetmap/josm/tools/AudioPlayer.java
index 31c0334..1ae4d81 100644
--- a/src/org/openstreetmap/josm/tools/AudioPlayer.java
+++ b/src/org/openstreetmap/josm/tools/AudioPlayer.java
@@ -123,7 +123,9 @@ public final class AudioPlayer extends Thread {
* @throws Exception audio fault exception, e.g. can't open stream, unhandleable audio format
*/
public static void play(URL url) throws Exception {
- AudioPlayer.getInstance().command.play(url, 0.0, 1.0);
+ AudioPlayer instance = AudioPlayer.getInstance();
+ if (instance != null)
+ instance.command.play(url, 0.0, 1.0);
}
/**
@@ -133,7 +135,9 @@ public final class AudioPlayer extends Thread {
* @throws Exception audio fault exception, e.g. can't open stream, unhandleable audio format
*/
public static void play(URL url, double seconds) throws Exception {
- AudioPlayer.getInstance().command.play(url, seconds, 1.0);
+ AudioPlayer instance = AudioPlayer.getInstance();
+ if (instance != null)
+ instance.command.play(url, seconds, 1.0);
}
/**
@@ -144,7 +148,9 @@ public final class AudioPlayer extends Thread {
* @throws Exception audio fault exception, e.g. can't open stream, unhandleable audio format
*/
public static void play(URL url, double seconds, double speed) throws Exception {
- AudioPlayer.getInstance().command.play(url, seconds, speed);
+ AudioPlayer instance = AudioPlayer.getInstance();
+ if (instance != null)
+ instance.command.play(url, seconds, speed);
}
/**
@@ -152,7 +158,9 @@ public final class AudioPlayer extends Thread {
* @throws Exception audio fault exception, e.g. can't open stream, unhandleable audio format
*/
public static void pause() throws Exception {
- AudioPlayer.getInstance().command.pause();
+ AudioPlayer instance = AudioPlayer.getInstance();
+ if (instance != null)
+ instance.command.pause();
}
/**
@@ -160,7 +168,8 @@ public final class AudioPlayer extends Thread {
* @return url - could be null
*/
public static URL url() {
- return AudioPlayer.getInstance().playingUrl;
+ AudioPlayer instance = AudioPlayer.getInstance();
+ return instance == null ? null : instance.playingUrl;
}
/**
@@ -168,7 +177,8 @@ public final class AudioPlayer extends Thread {
* @return boolean whether or not paused
*/
public static boolean paused() {
- return AudioPlayer.getInstance().state == State.PAUSED;
+ AudioPlayer instance = AudioPlayer.getInstance();
+ return instance == null ? false : (instance.state == State.PAUSED);
}
/**
@@ -176,7 +186,8 @@ public final class AudioPlayer extends Thread {
* @return boolean whether or not playing
*/
public static boolean playing() {
- return AudioPlayer.getInstance().state == State.PLAYING;
+ AudioPlayer instance = AudioPlayer.getInstance();
+ return instance == null ? false : (instance.state == State.PLAYING);
}
/**
@@ -184,7 +195,8 @@ public final class AudioPlayer extends Thread {
* @return double seconds
*/
public static double position() {
- return AudioPlayer.getInstance().position;
+ AudioPlayer instance = AudioPlayer.getInstance();
+ return instance == null ? -1 : instance.position;
}
/**
@@ -192,7 +204,8 @@ public final class AudioPlayer extends Thread {
* @return double, speed multiplier
*/
public static double speed() {
- return AudioPlayer.getInstance().speed;
+ AudioPlayer instance = AudioPlayer.getInstance();
+ return instance == null ? -1 : instance.speed;
}
/**
diff --git a/src/org/openstreetmap/josm/tools/DefaultGeoProperty.java b/src/org/openstreetmap/josm/tools/DefaultGeoProperty.java
new file mode 100644
index 0000000..41fb120
--- /dev/null
+++ b/src/org/openstreetmap/josm/tools/DefaultGeoProperty.java
@@ -0,0 +1,62 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import java.awt.geom.Area;
+import java.awt.geom.Path2D;
+import java.util.Collection;
+
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.BBox;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
+
+/**
+ * Implementation of simple boolean {@link GeoProperty}.
+ */
+public class DefaultGeoProperty implements GeoProperty<Boolean> {
+
+ private final Area area;
+
+ /**
+ * Create DefaultGeoProperty based on a collection of closed ways.
+ *
+ * @param ways the ways forming the area
+ */
+ public DefaultGeoProperty(Collection<Way> ways) {
+ Path2D path = new Path2D.Double();
+ path.setWindingRule(Path2D.WIND_EVEN_ODD);
+ for (Way w : ways) {
+ Geometry.buildPath2DLatLon(w.getNodes(), path);
+ }
+ this.area = new Area(path);
+ }
+
+ /**
+ * Create DefaultGeoProperty based on a multipolygon relation.
+ *
+ * @param multipolygon the multipolygon
+ */
+ public DefaultGeoProperty(Relation multipolygon) {
+ this.area = Geometry.getAreaLatLon(multipolygon);
+ }
+
+ @Override
+ public Boolean get(LatLon ll) {
+ return area.contains(ll.lon(), ll.lat());
+ }
+
+ @Override
+ public Boolean get(BBox box) {
+ Area abox = new Area(box.toRectangle());
+ Geometry.PolygonIntersection is = Geometry.polygonIntersection(abox, area, 1e-10 /* using deg and not meters */);
+ switch (is) {
+ case FIRST_INSIDE_SECOND:
+ return Boolean.TRUE;
+ case OUTSIDE:
+ return Boolean.FALSE;
+ default:
+ return null;
+ }
+ }
+
+}
diff --git a/src/org/openstreetmap/josm/tools/Diff.java b/src/org/openstreetmap/josm/tools/Diff.java
index 0f254cf..d0f857e 100644
--- a/src/org/openstreetmap/josm/tools/Diff.java
+++ b/src/org/openstreetmap/josm/tools/Diff.java
@@ -811,7 +811,7 @@ public class Diff {
if (end != iEnd && equivs[start] == equivs[end] && !otherChanged[1+j]
&& !((preceding >= 0 && start == preceding) || (otherPreceding >= 0 && otherStart == otherPreceding))) {
- changed[1+end++] = true;
+ changed[1+end] = true;
changed[1+start++] = false;
++i;
/* Since one line-that-matches is now before this run
diff --git a/src/org/openstreetmap/josm/tools/ExceptionUtil.java b/src/org/openstreetmap/josm/tools/ExceptionUtil.java
index cda0a7e..789b650 100644
--- a/src/org/openstreetmap/josm/tools/ExceptionUtil.java
+++ b/src/org/openstreetmap/josm/tools/ExceptionUtil.java
@@ -509,7 +509,8 @@ public final class ExceptionUtil {
Main.error(e);
return tr("<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>", e.getUrl(),
+ + "Details (untranslated): {1}</html>",
+ e != null ? e.getUrl() : "null",
ioe != null ? ioe.getMessage() : "null");
}
diff --git a/src/org/openstreetmap/josm/tools/ExifReader.java b/src/org/openstreetmap/josm/tools/ExifReader.java
index 7f428db..4cc55a4 100644
--- a/src/org/openstreetmap/josm/tools/ExifReader.java
+++ b/src/org/openstreetmap/josm/tools/ExifReader.java
@@ -5,6 +5,7 @@ import java.awt.geom.AffineTransform;
import java.io.File;
import java.io.IOException;
import java.util.Date;
+import java.util.concurrent.TimeUnit;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.coor.LatLon;
@@ -69,7 +70,7 @@ public final class ExifReader {
final Date date = DateUtils.fromString(dateStr);
if (subSeconds != null) {
try {
- date.setTime(date.getTime() + (long) (1000L * Double.parseDouble("0." + subSeconds)));
+ date.setTime(date.getTime() + (long) (TimeUnit.SECONDS.toMillis(1) * Double.parseDouble("0." + subSeconds)));
} catch (NumberFormatException e) {
Main.warn("Failed parsing sub seconds from [{0}]", subSeconds);
Main.warn(e);
diff --git a/src/org/openstreetmap/josm/tools/FontsManager.java b/src/org/openstreetmap/josm/tools/FontsManager.java
index fc7b0d8..6f4504f 100644
--- a/src/org/openstreetmap/josm/tools/FontsManager.java
+++ b/src/org/openstreetmap/josm/tools/FontsManager.java
@@ -40,7 +40,7 @@ public final class FontsManager {
try (CachedFile cf = new CachedFile(url); InputStream i = cf.getInputStream()) {
ge.registerFont(Font.createFont(Font.TRUETYPE_FONT, i));
} catch (IOException | FontFormatException ex) {
- throw new RuntimeException(ex);
+ throw new JosmRuntimeException(ex);
}
}
}
diff --git a/src/org/openstreetmap/josm/tools/GeoProperty.java b/src/org/openstreetmap/josm/tools/GeoProperty.java
new file mode 100644
index 0000000..63236c9
--- /dev/null
+++ b/src/org/openstreetmap/josm/tools/GeoProperty.java
@@ -0,0 +1,30 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.BBox;
+
+/**
+ * A method to look up a property of the earth surface.
+ *
+ * User input for the {@link GeoPropertyIndex}.
+ * @param <T> the property
+ */
+public interface GeoProperty<T> {
+
+ /**
+ * Look up the property for a point.
+ * @param ll the point coordinates
+ * @return property value at that point. Must not be null.
+ */
+ T get(LatLon ll);
+
+ /**
+ * Look up the property for a coordinate rectangle.
+ * @param box the rectangle
+ * @return the property, if it is the same in the entire rectangle;
+ * null otherwise
+ */
+ T get(BBox box);
+
+}
diff --git a/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java b/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java
index 18680a2..eda510e 100644
--- a/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java
+++ b/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java
@@ -19,28 +19,6 @@ import org.openstreetmap.josm.data.osm.BBox;
*/
public class GeoPropertyIndex<T> {
- /**
- * A method to look up a property of the earth surface.
- * (User input for the index.)
- * @param <T> the property
- */
- public interface GeoProperty<T> {
- /**
- * Look up the property for a point.
- * @param ll the point coordinates
- * @return property value at that point. Must not be null.
- */
- T get(LatLon ll);
-
- /**
- * Look up the property for a coordinate rectangle.
- * @param box the rectangle
- * @return the property, if it is the same in the entire rectangle;
- * null otherwise
- */
- T get(BBox box);
- }
-
private final int maxLevel;
private final GeoProperty<T> geoProp;
private final GPLevel<T> root;
@@ -169,5 +147,15 @@ public class GeoPropertyIndex<T> {
(ll.lat() < bbox.getTopLeftLat() || (ll.lat() == 90.0 && bbox.getTopLeftLat() == 90.0));
}
+ @Override
+ public String toString() {
+ return "GPLevel [val=" + val + ", level=" + level + ", bbox=" + bbox + ']';
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "GeoPropertyIndex [maxLevel=" + maxLevel + ", geoProp=" + geoProp + ", root=" + root + ", lastLevelUsed="
+ + lastLevelUsed + ']';
}
}
diff --git a/src/org/openstreetmap/josm/tools/GeoUrlToBounds.java b/src/org/openstreetmap/josm/tools/GeoUrlToBounds.java
index 63a412d..e9aa2d6 100644
--- a/src/org/openstreetmap/josm/tools/GeoUrlToBounds.java
+++ b/src/org/openstreetmap/josm/tools/GeoUrlToBounds.java
@@ -11,6 +11,8 @@ import org.openstreetmap.josm.data.Bounds;
/**
* Parses a Geo URL (as specified in <a href="https://tools.ietf.org/html/rfc5870">RFC 5870</a>) into {@link Bounds}.
+ *
+ * Note that Geo URLs are also handled by {@link OsmUrlToBounds}.
*/
public final class GeoUrlToBounds {
diff --git a/src/org/openstreetmap/josm/tools/Geometry.java b/src/org/openstreetmap/josm/tools/Geometry.java
index 7cafef3..a362af3 100644
--- a/src/org/openstreetmap/josm/tools/Geometry.java
+++ b/src/org/openstreetmap/josm/tools/Geometry.java
@@ -23,6 +23,7 @@ import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.BBox;
+import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.MultipolygonBuilder;
import org.openstreetmap.josm.data.osm.MultipolygonBuilder.JoinedPolygon;
import org.openstreetmap.josm.data.osm.Node;
@@ -34,6 +35,7 @@ import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
import org.openstreetmap.josm.data.projection.Projection;
import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
/**
* Some tools for geometry related tasks.
@@ -84,6 +86,9 @@ public final class Geometry {
changedWays[pos] = false;
}
+ OsmDataLayer layer = Main.getLayerManager().getEditLayer();
+ DataSet dataset = ways.iterator().next().getDataSet();
+
//iterate over all way pairs and introduce the intersections
Comparator<Node> coordsComparator = new NodePositionComparator();
for (int seg1Way = 0; seg1Way < n; seg1Way++) {
@@ -188,7 +193,7 @@ public final class Geometry {
intersectionNodes.add(intNode);
if (intNode == newNode) {
- cmds.add(new AddCommand(intNode));
+ cmds.add(layer != null ? new AddCommand(layer, intNode) : new AddCommand(dataset, intNode));
}
}
} else if (test && !intersectionNodes.isEmpty())
@@ -472,8 +477,8 @@ public final class Geometry {
/**
* Returns the Area of a polygon, from its list of nodes.
- * @param polygon List of nodes forming polygon (EastNorth coordinates)
- * @return Area for the given list of nodes
+ * @param polygon List of nodes forming polygon
+ * @return Area for the given list of nodes (EastNorth coordinates)
* @since 6841
*/
public static Area getArea(List<Node> polygon) {
@@ -499,14 +504,13 @@ public final class Geometry {
}
/**
- * Returns the Area of a polygon, from its list of nodes.
- * @param polygon List of nodes forming polygon (LatLon coordinates)
- * @return Area for the given list of nodes
- * @since 6841
+ * Builds a path from a list of nodes
+ * @param polygon Nodes, forming a closed polygon
+ * @param path2d path to add to; can be null, then a new path is created
+ * @return the path (LatLon coordinates)
*/
- public static Area getAreaLatLon(List<Node> polygon) {
- Path2D path = new Path2D.Double();
-
+ public static Path2D buildPath2DLatLon(List<Node> polygon, Path2D path2d) {
+ Path2D path = path2d != null ? path2d : new Path2D.Double();
boolean begin = true;
for (Node n : polygon) {
if (begin) {
@@ -519,7 +523,26 @@ public final class Geometry {
if (!begin) {
path.closePath();
}
+ return path;
+ }
+ /**
+ * Returns the Area of a polygon, from the multipolygon relation.
+ * @param multipolygon the multipolygon relation
+ * @return Area for the multipolygon (LatLon coordinates)
+ */
+ public static Area getAreaLatLon(Relation multipolygon) {
+ final Multipolygon mp = Main.map == null || Main.map.mapView == null
+ ? new Multipolygon(multipolygon)
+ : MultipolygonCache.getInstance().get(Main.map.mapView, multipolygon);
+ Path2D path = new Path2D.Double();
+ path.setWindingRule(Path2D.WIND_EVEN_ODD);
+ for (Multipolygon.PolyData pd : mp.getCombinedPolygons()) {
+ buildPath2DLatLon(pd.getNodes(), path);
+ for (Multipolygon.PolyData pdInner : pd.getInners()) {
+ buildPath2DLatLon(pdInner.getNodes(), path);
+ }
+ }
return new Area(path);
}
diff --git a/src/org/openstreetmap/josm/tools/HttpClient.java b/src/org/openstreetmap/josm/tools/HttpClient.java
index c58bf02..30e50f1 100644
--- a/src/org/openstreetmap/josm/tools/HttpClient.java
+++ b/src/org/openstreetmap/josm/tools/HttpClient.java
@@ -5,6 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -19,6 +20,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Scanner;
import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.zip.GZIPInputStream;
@@ -41,8 +43,8 @@ public final class HttpClient {
private URL url;
private final String requestMethod;
- private int connectTimeout = Main.pref.getInteger("socket.timeout.connect", 15) * 1000;
- private int readTimeout = Main.pref.getInteger("socket.timeout.read", 30) * 1000;
+ private int connectTimeout = (int) TimeUnit.SECONDS.toMillis(Main.pref.getInteger("socket.timeout.connect", 15));
+ private int readTimeout = (int) TimeUnit.SECONDS.toMillis(Main.pref.getInteger("socket.timeout.read", 30));
private byte[] requestBody;
private long ifModifiedSince;
private final Map<String, String> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
@@ -189,6 +191,7 @@ public final class HttpClient {
private final String responseMessage;
private boolean uncompress;
private boolean uncompressAccordingToContentDisposition;
+ private String responseData;
private Response(HttpURLConnection connection, ProgressMonitor monitor) throws IOException {
CheckParameterUtil.ensureParameterNotNull(connection, "connection");
@@ -197,6 +200,24 @@ public final class HttpClient {
this.monitor = monitor;
this.responseCode = connection.getResponseCode();
this.responseMessage = connection.getResponseMessage();
+ if (this.responseCode >= 300) {
+ String contentType = getContentType();
+ if (contentType == null || (
+ contentType.contains("text") ||
+ contentType.contains("html") ||
+ contentType.contains("xml"))
+ ) {
+ String content = this.fetchContent();
+ if (content.isEmpty()) {
+ Main.debug("Server did not return any body");
+ } else {
+ Main.debug("Response body: ");
+ Main.debug(this.fetchContent());
+ }
+ } else {
+ Main.debug("Server returned content: {0} of length: {1}. Not printing.", contentType, this.getContentLength());
+ }
+ }
}
/**
@@ -263,27 +284,28 @@ public final class HttpClient {
} catch (IOException ioe) {
Main.debug(ioe);
in = connection.getErrorStream();
- }
- if (in != null) {
- in = new ProgressInputStream(in, getContentLength(), monitor);
- in = "gzip".equalsIgnoreCase(getContentEncoding()) ? new GZIPInputStream(in) : in;
- Compression compression = Compression.NONE;
- if (uncompress) {
- final String contentType = getContentType();
- Main.debug("Uncompressing input stream according to Content-Type header: {0}", contentType);
- compression = Compression.forContentType(contentType);
+ if (in == null) {
+ in = new ByteArrayInputStream(new byte[]{});
}
- if (uncompressAccordingToContentDisposition && Compression.NONE.equals(compression)) {
- final String contentDisposition = getHeaderField("Content-Disposition");
- final Matcher matcher = Pattern.compile("filename=\"([^\"]+)\"").matcher(
- contentDisposition != null ? contentDisposition : "");
- if (matcher.find()) {
- Main.debug("Uncompressing input stream according to Content-Disposition header: {0}", contentDisposition);
- compression = Compression.byExtension(matcher.group(1));
- }
+ }
+ in = new ProgressInputStream(in, getContentLength(), monitor);
+ in = "gzip".equalsIgnoreCase(getContentEncoding()) ? new GZIPInputStream(in) : in;
+ Compression compression = Compression.NONE;
+ if (uncompress) {
+ final String contentType = getContentType();
+ Main.debug("Uncompressing input stream according to Content-Type header: {0}", contentType);
+ compression = Compression.forContentType(contentType);
+ }
+ if (uncompressAccordingToContentDisposition && Compression.NONE.equals(compression)) {
+ final String contentDisposition = getHeaderField("Content-Disposition");
+ final Matcher matcher = Pattern.compile("filename=\"([^\"]+)\"").matcher(
+ contentDisposition != null ? contentDisposition : "");
+ if (matcher.find()) {
+ Main.debug("Uncompressing input stream according to Content-Disposition header: {0}", contentDisposition);
+ compression = Compression.byExtension(matcher.group(1));
}
- in = compression.getUncompressedInputStream(in);
}
+ in = compression.getUncompressedInputStream(in);
return in;
}
@@ -305,11 +327,13 @@ public final class HttpClient {
* @return the response
* @throws IOException if any I/O error occurs
*/
- @SuppressWarnings("resource")
- public String fetchContent() throws IOException {
- try (Scanner scanner = new Scanner(getContentReader()).useDelimiter("\\A")) {
- return scanner.hasNext() ? scanner.next() : "";
+ public synchronized String fetchContent() throws IOException {
+ if (responseData == null) {
+ try (Scanner scanner = new Scanner(getContentReader()).useDelimiter("\\A")) { // \A - beginning of input
+ responseData = scanner.hasNext() ? scanner.next() : "";
+ }
}
+ return responseData;
}
/**
diff --git a/src/org/openstreetmap/josm/tools/ImageProvider.java b/src/org/openstreetmap/josm/tools/ImageProvider.java
index 68320bf..33626b0 100644
--- a/src/org/openstreetmap/josm/tools/ImageProvider.java
+++ b/src/org/openstreetmap/josm/tools/ImageProvider.java
@@ -636,7 +636,7 @@ public class ImageProvider {
if (ir == null) {
if (!optional) {
String ext = name.indexOf('.') != -1 ? "" : ".???";
- throw new RuntimeException(
+ throw new JosmRuntimeException(
tr("Fatal: failed to locate image ''{0}''. This is a serious configuration problem. JOSM will stop working.",
name + ext));
} else {
@@ -903,9 +903,8 @@ public class ImageProvider {
* @return the requested image or null if the request failed
*/
private static ImageResource getIfAvailableHttp(String url, ImageType type) {
- CachedFile cf = new CachedFile(url)
- .setDestDir(new File(Main.pref.getCacheDirectory(), "images").getPath());
- try (InputStream is = cf.getInputStream()) {
+ try (CachedFile cf = new CachedFile(url).setDestDir(new File(Main.pref.getCacheDirectory(), "images").getPath());
+ InputStream is = cf.getInputStream()) {
switch (type) {
case SVG:
SVGDiagram svg = null;
@@ -923,13 +922,11 @@ public class ImageProvider {
}
return img == null ? null : new ImageResource(img);
default:
- throw new AssertionError();
+ throw new AssertionError("Unsupported type: " + type);
}
} catch (IOException e) {
Main.debug(e);
return null;
- } finally {
- cf.close();
}
}
@@ -1225,12 +1222,10 @@ public class ImageProvider {
parser.setEntityResolver((publicId, systemId) -> new InputSource(new ByteArrayInputStream(new byte[0])));
- CachedFile cf = new CachedFile(base + fn).setDestDir(
- new File(Main.pref.getUserDataDirectory(), "images").getPath());
- try (InputStream is = cf.getInputStream()) {
+ try (CachedFile cf = new CachedFile(base + fn).setDestDir(new File(Main.pref.getUserDataDirectory(), "images").getPath());
+ InputStream is = cf.getInputStream()) {
parser.parse(new InputSource(is));
}
- cf.close();
} catch (SAXReturnException r) {
Main.trace(r);
return r.getResult();
diff --git a/src/org/openstreetmap/josm/tools/JosmRuntimeException.java b/src/org/openstreetmap/josm/tools/JosmRuntimeException.java
new file mode 100644
index 0000000..05a2a9c
--- /dev/null
+++ b/src/org/openstreetmap/josm/tools/JosmRuntimeException.java
@@ -0,0 +1,54 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+/**
+ * JOSM runtime exception.
+ * @since 11374
+ */
+public class JosmRuntimeException extends RuntimeException {
+
+ /**
+ * Constructs a new {@code JosmRuntimeException} with the specified detail message.
+ * The cause is not initialized, and may subsequently be initialized by a call to {@link #initCause}.
+ *
+ * @param message the detail message. The detail message is saved for later retrieval by the {@link #getMessage()} method.
+ */
+ public JosmRuntimeException(String message) {
+ super(message);
+ }
+
+ /**
+ * Constructs a new {@code JosmRuntimeException} with the specified cause and a detail message of
+ * <tt>(cause==null ? null : cause.toString())</tt> (which typically contains the class and detail message of <tt>cause</tt>).
+ * This constructor is useful for runtime exceptions that are little more than wrappers for other throwables.
+ *
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
+ */
+ public JosmRuntimeException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * Constructs a new {@code JosmRuntimeException} with the specified detail message and cause.<p>
+ * Note that the detail message associated with {@code cause} is <i>not</i> automatically incorporated in this exception's detail message.
+ *
+ * @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).
+ */
+ public JosmRuntimeException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ /**
+ * Constructs a new runtime exception with the specified detail message, cause,
+ * suppression enabled or disabled, and writable stack trace enabled or disabled.
+ *
+ * @param message the detail message
+ * @param cause the cause
+ * @param enableSuppression whether or not suppression is enabled or disabled
+ * @param writableStackTrace whether or not the stack trace should be writable
+ */
+ public JosmRuntimeException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+ super(message, cause, enableSuppression, writableStackTrace);
+ }
+}
diff --git a/src/org/openstreetmap/josm/tools/ListenerList.java b/src/org/openstreetmap/josm/tools/ListenerList.java
index a78aa4a..a58f6af 100644
--- a/src/org/openstreetmap/josm/tools/ListenerList.java
+++ b/src/org/openstreetmap/josm/tools/ListenerList.java
@@ -79,12 +79,13 @@ public class ListenerList<T> {
* @param listener The listener.
*/
public synchronized void addWeakListener(T listener) {
- ensureNotInList(listener);
- // clean the weak listeners, just to be sure...
- while (weakListeners.remove(new WeakListener<T>(null))) {
- // continue
+ if (ensureNotInList(listener)) {
+ // clean the weak listeners, just to be sure...
+ while (weakListeners.remove(new WeakListener<T>(null))) {
+ // continue
+ }
+ weakListeners.add(new WeakListener<>(listener));
}
- weakListeners.add(new WeakListener<>(listener));
}
/**
@@ -92,14 +93,18 @@ public class ListenerList<T> {
* @param listener The listener to add.
*/
public synchronized void addListener(T listener) {
- ensureNotInList(listener);
- listeners.add(listener);
+ if (ensureNotInList(listener)) {
+ listeners.add(listener);
+ }
}
- private void ensureNotInList(T listener) {
+ private boolean ensureNotInList(T listener) {
CheckParameterUtil.ensureParameterNotNull(listener, "listener");
if (containsListener(listener)) {
failAdd(listener);
+ return false;
+ } else {
+ return true;
}
}
@@ -216,6 +221,20 @@ public class ListenerList<T> {
}
}
+ private static class UncheckedListenerList<T> extends ListenerList<T> {
+ @Override
+ protected void failAdd(T listener) {
+ Logging.warn("Listener was alreaady added: {0}", listener);
+ // ignore
+ }
+
+ @Override
+ protected void failRemove(T listener) {
+ Logging.warn("Listener was removed twice or not added: {0}", listener);
+ // ignore
+ }
+ }
+
/**
* Create a new listener list
* @param <T> The listener type the list should hold.
@@ -228,4 +247,16 @@ public class ListenerList<T> {
return new ListenerList<>();
}
}
+
+ /**
+ * Creates a new listener list that does not fail if listeners are added ore removed twice.
+ * <p>
+ * Use of this list is discouraged. You should always use {@link #create()} in new implementations and check your listeners.
+ * @param <T> The listener type
+ * @return A new list.
+ * @since 11224
+ */
+ public static <T> ListenerList<T> createUnchecked() {
+ return new UncheckedListenerList<>();
+ }
}
diff --git a/src/org/openstreetmap/josm/tools/Logging.java b/src/org/openstreetmap/josm/tools/Logging.java
index d7e7fd7..510a4ea 100644
--- a/src/org/openstreetmap/josm/tools/Logging.java
+++ b/src/org/openstreetmap/josm/tools/Logging.java
@@ -260,8 +260,10 @@ public final class Logging {
private static String getErrorLogWithStack(String message, Throwable t) {
StringWriter sb = new StringWriter();
sb.append(getErrorLog(message, t));
- sb.append('\n');
- t.printStackTrace(new PrintWriter(sb));
+ if (t != null) {
+ sb.append('\n');
+ t.printStackTrace(new PrintWriter(sb));
+ }
return sb.toString();
}
diff --git a/src/org/openstreetmap/josm/tools/MultiLineFlowLayout.java b/src/org/openstreetmap/josm/tools/MultiLineFlowLayout.java
index 85f9b46..723dfe7 100644
--- a/src/org/openstreetmap/josm/tools/MultiLineFlowLayout.java
+++ b/src/org/openstreetmap/josm/tools/MultiLineFlowLayout.java
@@ -74,7 +74,7 @@ public class MultiLineFlowLayout extends FlowLayout {
if (x != 0) {
x += getHgap();
}
- x += size.getWidth();
+ x += size.width;
if (x > containerWidth) {
totalHeight += rowHeight + getVgap();
rowHeight = 0;
diff --git a/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java b/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java
index 34c6ac7..142d36e 100644
--- a/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java
+++ b/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java
@@ -32,10 +32,27 @@ public final class MultikeyActionsHandler {
private final Map<MultikeyShortcutAction, MyAction> myActions = new HashMap<>();
- private static final class ShowLayersPopupWorker implements Runnable {
+ static final class ShowLayersPopupWorker implements Runnable {
+ static final class StatusLinePopupMenuListener implements PopupMenuListener {
+ @Override
+ public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+ // Do nothing
+ }
+
+ @Override
+ public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+ Main.map.statusLine.resetHelpText(STATUS_BAR_ID);
+ }
+
+ @Override
+ public void popupMenuCanceled(PopupMenuEvent e) {
+ // Do nothing
+ }
+ }
+
private final MyAction action;
- private ShowLayersPopupWorker(MyAction action) {
+ ShowLayersPopupWorker(MyAction action) {
this.action = action;
}
@@ -76,27 +93,10 @@ public final class MultikeyActionsHandler {
layers.add(repeateItem);
}
}
- layers.addPopupMenuListener(new PopupMenuListener() {
-
- @Override
- public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
- // Do nothing
- }
-
- @Override
- public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
- Main.map.statusLine.resetHelpText(STATUS_BAR_ID);
- }
-
- @Override
- public void popupMenuCanceled(PopupMenuEvent e) {
- // Do nothing
- }
- });
-
+ layers.addPopupMenuListener(new StatusLinePopupMenuListener());
layers.show(Main.parent, Integer.MAX_VALUE, Integer.MAX_VALUE);
layers.setLocation(Main.parent.getX() + Main.parent.getWidth() - layers.getWidth(),
- Main.parent.getY() + Main.parent.getHeight() - layers.getHeight());
+ Main.parent.getY() + Main.parent.getHeight() - layers.getHeight());
}
}
diff --git a/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java b/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
index 9aa91b8..683d4c6 100644
--- a/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
+++ b/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
@@ -9,10 +9,16 @@ import java.util.Map;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.projection.Ellipsoid;
+import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.Projections;
import org.openstreetmap.josm.gui.util.GuiHelper;
+/**
+ * Parses various URL used in OpenStreetMap projects into {@link Bounds}.
+ */
public final class OsmUrlToBounds {
private static final String SHORTLINK_PREFIX = "http://osm.org/go/";
@@ -20,7 +26,15 @@ public final class OsmUrlToBounds {
// Hide default constructor for utils classes
}
+ /**
+ * Parses an URL into {@link Bounds}
+ * @param url the URL to be parsed
+ * @return the parsed {@link Bounds}, or {@code null}
+ */
public static Bounds parse(String url) {
+ if (url.startsWith("geo:")) {
+ return GeoUrlToBounds.parse(url);
+ }
try {
// a percent sign indicates an encoded URL (RFC 1738).
if (url.contains("%")) {
@@ -32,12 +46,11 @@ public final class OsmUrlToBounds {
Bounds b = parseShortLink(url);
if (b != null)
return b;
- int i = url.indexOf("#map");
- if (i >= 0) {
+ if (url.contains("#map")) {
// probably it's a URL following the new scheme?
return parseHashURLs(url);
}
- i = url.indexOf('?');
+ final int i = url.indexOf('?');
if (i == -1) {
return null;
}
@@ -188,44 +201,26 @@ public final class OsmUrlToBounds {
zoom - 8 - (zoomOffset % 3) - 2);
}
- public static Bounds positionToBounds(final double lat, final double lon, final int zoom) {
- int tileSizeInPixels = 256;
- Dimension screenSize = GuiHelper.getScreenSize();
- int height = screenSize.height;
- int width = screenSize.width;
+ private static Dimension getScreenSize() {
if (Main.isDisplayingMapView()) {
- height = Main.map.mapView.getHeight();
- width = Main.map.mapView.getWidth();
+ return new Dimension(Main.map.mapView.getWidth(), Main.map.mapView.getHeight());
+ } else {
+ return GuiHelper.getScreenSize();
}
- double scale = (1 << zoom) * tileSizeInPixels / (2 * Math.PI * Ellipsoid.WGS84.a);
- double deltaX = width / 2.0 / scale;
- double deltaY = height / 2.0 / scale;
- double x = Math.toRadians(lon) * Ellipsoid.WGS84.a;
- double y = mercatorY(lat);
- return new Bounds(
- invMercatorY(y - deltaY), Math.toDegrees(x - deltaX) / Ellipsoid.WGS84.a,
- invMercatorY(y + deltaY), Math.toDegrees(x + deltaX) / Ellipsoid.WGS84.a);
- }
-
- public static double mercatorY(double lat) {
- return Math.log(Math.tan(Math.PI/4 + Math.toRadians(lat)/2)) * Ellipsoid.WGS84.a;
}
- public static double invMercatorY(double north) {
- return Math.toDegrees(Math.atan(Math.sinh(north / Ellipsoid.WGS84.a)));
- }
+ private static final int TILE_SIZE_IN_PIXELS = 256;
- public static Pair<Double, Double> getTileOfLatLon(double lat, double lon, double zoom) {
- double x = Math.floor((lon + 180) / 360 * Math.pow(2.0, zoom));
- double y = Math.floor((1 - Math.log(Math.tan(Math.toRadians(lat)) + 1 / Math.cos(Math.toRadians(lat))) / Math.PI)
- / 2 * Math.pow(2.0, zoom));
- return new Pair<>(x, y);
- }
-
- public static LatLon getLatLonOfTile(double x, double y, double zoom) {
- double lon = x / Math.pow(2.0, zoom) * 360.0 - 180;
- double lat = Math.toDegrees(Math.atan(Math.sinh(Math.PI - (2.0 * Math.PI * y) / Math.pow(2.0, zoom))));
- return new LatLon(lat, lon);
+ public static Bounds positionToBounds(final double lat, final double lon, final int zoom) {
+ final Dimension screenSize = getScreenSize();
+ double scale = (1 << zoom) * TILE_SIZE_IN_PIXELS / (2 * Math.PI * Ellipsoid.WGS84.a);
+ double deltaX = screenSize.getWidth() / 2.0 / scale;
+ double deltaY = screenSize.getHeight() / 2.0 / scale;
+ final Projection mercator = Projections.getProjectionByCode("EPSG:3857");
+ final EastNorth projected = mercator.latlon2eastNorth(new LatLon(lat, lon));
+ return new Bounds(
+ mercator.eastNorth2latlon(projected.add(-deltaX, -deltaY)),
+ mercator.eastNorth2latlon(projected.add(deltaX, deltaY)));
}
/**
@@ -235,19 +230,13 @@ public final class OsmUrlToBounds {
* @return matching zoom level for area
*/
public static int getZoom(Bounds b) {
- // convert to mercator (for calculation of zoom only)
- double latMin = Math.log(Math.tan(Math.PI/4.0+b.getMinLat()/180.0*Math.PI/2.0))*180.0/Math.PI;
- double latMax = Math.log(Math.tan(Math.PI/4.0+b.getMaxLat()/180.0*Math.PI/2.0))*180.0/Math.PI;
- double size = Math.max(Math.abs(latMax-latMin), Math.abs(b.getMaxLon()-b.getMinLon()));
- int zoom = 0;
- while (zoom <= 20) {
- if (size >= 180) {
- break;
- }
- size *= 2;
- zoom++;
- }
- return zoom;
+ final Projection mercator = Projections.getProjectionByCode("EPSG:3857");
+ final EastNorth min = mercator.latlon2eastNorth(b.getMin());
+ final EastNorth max = mercator.latlon2eastNorth(b.getMax());
+ final double deltaX = max.getX() - min.getX();
+ final double scale = getScreenSize().getWidth() / deltaX;
+ final double x = scale * (2 * Math.PI * Ellipsoid.WGS84.a) / TILE_SIZE_IN_PIXELS;
+ return (int) Math.round(Math.log(x) / Math.log(2));
}
/**
diff --git a/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java b/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java
index 27ba9c3..d813efd 100644
--- a/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java
+++ b/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java
@@ -1,53 +1,46 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
-import java.awt.geom.Area;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JoinAreasAction;
+import org.openstreetmap.josm.actions.JoinAreasAction.JoinAreasResult;
+import org.openstreetmap.josm.actions.JoinAreasAction.Multipolygon;
+import org.openstreetmap.josm.actions.PurgeAction;
import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.BBox;
import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.io.CachedFile;
import org.openstreetmap.josm.io.IllegalDataException;
import org.openstreetmap.josm.io.OsmReader;
-import org.openstreetmap.josm.tools.GeoPropertyIndex.GeoProperty;
-import org.openstreetmap.josm.tools.Geometry.PolygonIntersection;
+import org.openstreetmap.josm.io.OsmWriter;
+import org.openstreetmap.josm.io.OsmWriterFactory;
/**
* Look up, if there is right- or left-hand traffic at a certain place.
*/
public final class RightAndLefthandTraffic {
- private static class RLTrafficGeoProperty implements GeoProperty<Boolean> {
+ private static final String DRIVING_SIDE = "driving_side";
+ private static final String LEFT = "left";
+ private static final String RIGHT = "right";
- @Override
- public Boolean get(LatLon ll) {
- for (Area a : leftHandTrafficPolygons) {
- if (a.contains(ll.lon(), ll.lat()))
- return Boolean.TRUE;
- }
- return Boolean.FALSE;
- }
-
- @Override
- public Boolean get(BBox box) {
- Area abox = new Area(box.toRectangle());
- for (Area a : leftHandTrafficPolygons) {
- PolygonIntersection is = Geometry.polygonIntersection(abox, a, 1e-10 /* using deg and not meters */);
- if (is == PolygonIntersection.FIRST_INSIDE_SECOND)
- return Boolean.TRUE;
- if (is != PolygonIntersection.OUTSIDE)
- return null;
- }
- return Boolean.FALSE;
- }
- }
-
- private static volatile Collection<Area> leftHandTrafficPolygons;
private static volatile GeoPropertyIndex<Boolean> rlCache;
private RightAndLefthandTraffic() {
@@ -57,29 +50,126 @@ public final class RightAndLefthandTraffic {
/**
* Check if there is right-hand traffic at a certain location.
*
- * TODO: Synchronization can be refined inside the {@link GeoPropertyIndex}
- * as most look-ups are read-only.
* @param ll the coordinates of the point
* @return true if there is right-hand traffic, false if there is left-hand traffic
*/
public static synchronized boolean isRightHandTraffic(LatLon ll) {
- if (leftHandTrafficPolygons == null) {
- initialize();
- }
return !rlCache.get(ll);
}
- private static void initialize() {
- leftHandTrafficPolygons = new ArrayList<>();
- try (CachedFile cf = new CachedFile("resource://data/left-right-hand-traffic.osm");
- InputStream is = cf.getInputStream()) {
- DataSet data = OsmReader.parseDataSet(is, null);
- for (Way w : data.getWays()) {
- leftHandTrafficPolygons.add(Geometry.getAreaLatLon(w.getNodes()));
+ /**
+ * Initializes Right and lefthand traffic data.
+ * TODO: Synchronization can be refined inside the {@link GeoPropertyIndex} as most look-ups are read-only.
+ */
+ public static synchronized void initialize() {
+ Collection<Way> optimizedWays = loadOptimizedBoundaries();
+ if (optimizedWays.isEmpty()) {
+ optimizedWays = computeOptimizedBoundaries();
+ saveOptimizedBoundaries(optimizedWays);
+ }
+ rlCache = new GeoPropertyIndex<>(new DefaultGeoProperty(optimizedWays), 24);
+ }
+
+ private static Collection<Way> computeOptimizedBoundaries() {
+ Collection<Way> ways = new ArrayList<>();
+ Collection<OsmPrimitive> toPurge = new ArrayList<>();
+ // Find all outer ways of left-driving countries. Many of them are adjacent (African and Asian states)
+ DataSet data = Territories.getDataSet();
+ Collection<Relation> allRelations = data.getRelations();
+ Collection<Way> allWays = data.getWays();
+ for (Way w : allWays) {
+ if (LEFT.equals(w.get(DRIVING_SIDE))) {
+ addWayIfNotInner(ways, w);
+ }
+ }
+ for (Relation r : allRelations) {
+ if (r.isMultipolygon() && LEFT.equals(r.get(DRIVING_SIDE))) {
+ for (RelationMember rm : r.getMembers()) {
+ if (rm.isWay() && "outer".equals(rm.getRole()) && !RIGHT.equals(rm.getMember().get(DRIVING_SIDE))) {
+ addWayIfNotInner(ways, (Way) rm.getMember());
+ }
+ }
+ }
+ }
+ toPurge.addAll(allRelations);
+ toPurge.addAll(allWays);
+ toPurge.removeAll(ways);
+ // Remove ways from parent relations for following optimizations
+ for (Relation r : OsmPrimitive.getParentRelations(ways)) {
+ r.setMembers(null);
+ }
+ // Remove all tags to avoid any conflict
+ for (Way w : ways) {
+ w.removeAll();
+ }
+ // Purge all other ways and relations so dataset only contains lefthand traffic data
+ new PurgeAction().getPurgeCommand(toPurge).executeCommand();
+ // Combine adjacent countries into a single polygon
+ Collection<Way> optimizedWays = new ArrayList<>();
+ List<Multipolygon> areas = JoinAreasAction.collectMultipolygons(ways);
+ if (areas != null) {
+ try {
+ JoinAreasResult result = new JoinAreasAction().joinAreas(areas);
+ if (result.hasChanges()) {
+ for (Multipolygon mp : result.getPolygons()) {
+ optimizedWays.add(mp.getOuterWay());
+ }
+ }
+ } catch (UserCancelException ex) {
+ Main.warn(ex);
+ } catch (JosmRuntimeException ex) {
+ // Workaround to #10511 / #14185. To remove when #10511 is solved
+ Main.error(ex);
+ }
+ }
+ if (optimizedWays.isEmpty()) {
+ // Problem: don't optimize
+ Main.warn("Unable to join left-driving countries polygons");
+ optimizedWays.addAll(ways);
+ }
+ return optimizedWays;
+ }
+
+ /**
+ * Adds w to ways, except if it is an inner way of another lefthand driving multipolygon,
+ * as Lesotho in South Africa and Cyprus village in British Cyprus base.
+ * @param ways ways
+ * @param w way
+ */
+ private static void addWayIfNotInner(Collection<Way> ways, Way w) {
+ Set<Way> s = Collections.singleton(w);
+ for (Relation r : OsmPrimitive.getParentRelations(s)) {
+ if (r.isMultipolygon() && LEFT.equals(r.get(DRIVING_SIDE)) &&
+ "inner".equals(r.getMembersFor(s).iterator().next().getRole())) {
+ if (Main.isDebugEnabled()) {
+ Main.debug("Skipping " + w.get("name:en") + " because inner part of " + r.get("name:en"));
+ }
+ return;
}
- } catch (IOException | IllegalDataException ex) {
- throw new RuntimeException(ex);
}
- rlCache = new GeoPropertyIndex<>(new RLTrafficGeoProperty(), 24);
+ ways.add(w);
+ }
+
+ private static void saveOptimizedBoundaries(Collection<Way> optimizedWays) {
+ DataSet ds = optimizedWays.iterator().next().getDataSet();
+ File file = new File(Main.pref.getCacheDirectory(), "left-right-hand-traffic.osm");
+ try (Writer writer = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8);
+ OsmWriter w = OsmWriterFactory.createOsmWriter(new PrintWriter(writer), false, ds.getVersion())
+ ) {
+ w.header(false);
+ w.writeContent(ds);
+ w.footer();
+ } catch (IOException ex) {
+ throw new JosmRuntimeException(ex);
+ }
+ }
+
+ private static Collection<Way> loadOptimizedBoundaries() {
+ try (InputStream is = new FileInputStream(new File(Main.pref.getCacheDirectory(), "left-right-hand-traffic.osm"))) {
+ return OsmReader.parseDataSet(is, null).getWays();
+ } catch (IllegalDataException | IOException ex) {
+ Main.trace(ex);
+ return Collections.emptyList();
+ }
}
}
diff --git a/src/org/openstreetmap/josm/tools/Shortcut.java b/src/org/openstreetmap/josm/tools/Shortcut.java
index 79d3f29..2719fb3 100644
--- a/src/org/openstreetmap/josm/tools/Shortcut.java
+++ b/src/org/openstreetmap/josm/tools/Shortcut.java
@@ -204,8 +204,8 @@ public final class Shortcut {
}
public boolean isEvent(KeyEvent e) {
- return getKeyStroke() != null && getKeyStroke().equals(
- KeyStroke.getKeyStroke(e.getKeyCode(), e.getModifiers()));
+ KeyStroke ks = getKeyStroke();
+ return ks != null && ks.equals(KeyStroke.getKeyStroke(e.getKeyCode(), e.getModifiers()));
}
/**
@@ -283,7 +283,7 @@ public final class Shortcut {
return super.add(shortcut);
}
- public void replace(Shortcut newShortcut) {
+ void replace(Shortcut newShortcut) {
final Optional<Shortcut> existing = findShortcutByKeyOrShortText(-1, NONE, newShortcut.shortText);
if (existing.isPresent()) {
replaceAll(sc -> existing.get() == sc ? newShortcut : sc);
@@ -313,6 +313,7 @@ public final class Shortcut {
final Predicate<Shortcut> sameShortText = sc -> sc.getShortText().equals(shortText);
return shortcuts.stream()
.filter(sameKey.or(sameShortText))
+ .sorted(Comparator.comparingInt(sc -> sameShortText.test(sc) ? 0 : 1))
.findAny();
}
diff --git a/src/org/openstreetmap/josm/tools/Territories.java b/src/org/openstreetmap/josm/tools/Territories.java
new file mode 100644
index 0000000..894e7b8
--- /dev/null
+++ b/src/org/openstreetmap/josm/tools/Territories.java
@@ -0,0 +1,109 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.io.CachedFile;
+import org.openstreetmap.josm.io.IllegalDataException;
+import org.openstreetmap.josm.io.OsmReader;
+
+/**
+ * Look up territories ISO3166 codes at a certain place.
+ */
+public final class Territories {
+
+ private static final String ISO3166_1 = "ISO3166-1:alpha2";
+ private static final String ISO3166_2 = "ISO3166-2";
+
+ private static DataSet dataSet;
+
+ private static volatile Map<String, GeoPropertyIndex<Boolean>> iso3166Cache;
+
+ private Territories() {
+ // Hide implicit public constructor for utility classes
+ }
+
+ /**
+ * Get all known ISO3166-1 and ISO3166-2 codes.
+ *
+ * @return the ISO3166-1 and ISO3166-2 codes for the given location
+ */
+ public static synchronized Set<String> getKnownIso3166Codes() {
+ return iso3166Cache.keySet();
+ }
+
+ /**
+ * Determine, if a point is inside a territory with the given the ISO3166-1
+ * or ISO3166-2 code.
+ *
+ * @param code the ISO3166-1 or ISO3166-2 code
+ * @param ll the coordinates of the point
+ * @return true, if the point is inside a territory with the given code
+ */
+ public static synchronized boolean isIso3166Code(String code, LatLon ll) {
+ GeoPropertyIndex<Boolean> gpi = iso3166Cache.get(code);
+ if (gpi == null) {
+ Main.warn(tr("Unknown territory id: {0}", code));
+ return false;
+ }
+ return gpi.get(ll);
+ }
+
+ /**
+ * Returns the territories dataset.
+ * @return the territories dataset
+ */
+ public static synchronized DataSet getDataSet() {
+ return new DataSet(dataSet);
+ }
+
+ /**
+ * Initializes territories.
+ * TODO: Synchronization can be refined inside the {@link GeoPropertyIndex} as most look-ups are read-only.
+ */
+ public static synchronized void initialize() {
+ iso3166Cache = new HashMap<>();
+ try (CachedFile cf = new CachedFile("resource://data/boundaries.osm");
+ InputStream is = cf.getInputStream()) {
+ dataSet = OsmReader.parseDataSet(is, null);
+ Collection<OsmPrimitive> candidates = new ArrayList<>(dataSet.getWays());
+ candidates.addAll(dataSet.getRelations());
+ for (OsmPrimitive osm : candidates) {
+ String iso1 = osm.get(ISO3166_1);
+ String iso2 = osm.get(ISO3166_2);
+ if (iso1 != null || iso2 != null) {
+ GeoProperty<Boolean> gp;
+ if (osm instanceof Way) {
+ gp = new DefaultGeoProperty(Collections.singleton((Way) osm));
+ } else {
+ gp = new DefaultGeoProperty((Relation) osm);
+ }
+ GeoPropertyIndex<Boolean> gpi = new GeoPropertyIndex<>(gp, 24);
+ if (iso1 != null) {
+ iso3166Cache.put(iso1, gpi);
+ }
+ if (iso2 != null) {
+ iso3166Cache.put(iso2, gpi);
+ }
+ }
+ }
+ } catch (IOException | IllegalDataException ex) {
+ throw new JosmRuntimeException(ex);
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/tools/Utils.java b/src/org/openstreetmap/josm/tools/Utils.java
index b0b5923..44ce97f 100644
--- a/src/org/openstreetmap/josm/tools/Utils.java
+++ b/src/org/openstreetmap/josm/tools/Utils.java
@@ -41,11 +41,11 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
-import java.util.Objects;
import java.util.concurrent.Executor;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.ForkJoinWorkerThread;
import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Function;
import java.util.function.Predicate;
@@ -78,10 +78,10 @@ public final class Utils {
/** Pattern matching white spaces */
public static final Pattern WHITE_SPACES_PATTERN = Pattern.compile("\\s+");
- private static final int MILLIS_OF_SECOND = 1000;
- private static final int MILLIS_OF_MINUTE = 60_000;
- private static final int MILLIS_OF_HOUR = 3_600_000;
- private static final int MILLIS_OF_DAY = 86_400_000;
+ private static final long MILLIS_OF_SECOND = TimeUnit.SECONDS.toMillis(1);
+ private static final long MILLIS_OF_MINUTE = TimeUnit.MINUTES.toMillis(1);
+ private static final long MILLIS_OF_HOUR = TimeUnit.HOURS.toMillis(1);
+ private static final long MILLIS_OF_DAY = TimeUnit.DAYS.toMillis(1);
/**
* A list of all characters allowed in URLs
@@ -525,26 +525,6 @@ public final class Utils {
}
/**
- * Determines if two collections are equal.
- * @param a first collection
- * @param b second collection
- * @return {@code true} if collections are equal, {@code false} otherwise
- * @since 9217
- */
- public static boolean equalCollection(Collection<?> a, Collection<?> b) {
- if (a == null) return b == null;
- if (b == null) return false;
- if (a.size() != b.size()) return false;
- Iterator<?> itA = a.iterator();
- Iterator<?> itB = b.iterator();
- while (itA.hasNext()) {
- if (!Objects.equals(itA.next(), itB.next()))
- return false;
- }
- return true;
- }
-
- /**
* Calculate MD5 hash of a string and output in hexadecimal format.
* @param data arbitrary String
* @return MD5 hash of data, string of length 32 with characters in range [0-9a-f]
@@ -554,7 +534,7 @@ public final class Utils {
try {
md = MessageDigest.getInstance("MD5");
} catch (NoSuchAlgorithmException e) {
- throw new RuntimeException(e);
+ throw new JosmRuntimeException(e);
}
byte[] byteData = data.getBytes(StandardCharsets.UTF_8);
byte[] byteDigest = md.digest(byteData);
@@ -619,14 +599,14 @@ public final class Utils {
break;
}
}
- if (parentless == null) throw new RuntimeException();
+ if (parentless == null) throw new JosmRuntimeException("parentless");
sorted.add(parentless);
deps.remove(parentless);
for (T key : deps.keySet()) {
deps.remove(key, parentless);
}
}
- if (sorted.size() != size) throw new RuntimeException();
+ if (sorted.size() != size) throw new JosmRuntimeException("Wrong size");
return sorted;
}
@@ -1364,10 +1344,13 @@ public final class Utils {
* Reads the input stream and closes the stream at the end of processing (regardless if an exception was thrown)
*
* @param stream input stream
- * @return byte array of data in input stream
+ * @return byte array of data in input stream (empty if stream is null)
* @throws IOException if any I/O error occurs
*/
public static byte[] readBytesFromStream(InputStream stream) throws IOException {
+ if (stream == null) {
+ return new byte[0];
+ }
try {
ByteArrayOutputStream bout = new ByteArrayOutputStream(stream.available());
byte[] buffer = new byte[2048];
@@ -1381,7 +1364,7 @@ public final class Utils {
}
} while (!finished);
if (bout.size() == 0)
- return null;
+ return new byte[0];
return bout.toByteArray();
} finally {
stream.close();
diff --git a/src/org/openstreetmap/josm/tools/WindowGeometry.java b/src/org/openstreetmap/josm/tools/WindowGeometry.java
index 91306ed..7b1332c 100644
--- a/src/org/openstreetmap/josm/tools/WindowGeometry.java
+++ b/src/org/openstreetmap/josm/tools/WindowGeometry.java
@@ -203,7 +203,7 @@ public class WindowGeometry {
protected final void initFromPreferences(String preferenceKey) throws WindowGeometryException {
String value = Main.pref.get(preferenceKey);
- if (value == null || value.isEmpty())
+ if (value.isEmpty())
throw new WindowGeometryException(
tr("Preference with key ''{0}'' does not exist. Cannot restore window geometry from preferences.", preferenceKey));
topLeft = new Point();
diff --git a/src/org/openstreetmap/josm/tools/XmlObjectParser.java b/src/org/openstreetmap/josm/tools/XmlObjectParser.java
index 4a0a070..2895b5b 100644
--- a/src/org/openstreetmap/josm/tools/XmlObjectParser.java
+++ b/src/org/openstreetmap/josm/tools/XmlObjectParser.java
@@ -257,8 +257,7 @@ public class XmlObjectParser implements Iterable<Object> {
queueIterator = queue.iterator();
return this;
} catch (ParserConfigurationException e) {
- // This should never happen ;-)
- throw new RuntimeException(e);
+ throw new JosmRuntimeException(e);
}
}
diff --git a/src/org/openstreetmap/josm/tools/date/DateUtils.java b/src/org/openstreetmap/josm/tools/date/DateUtils.java
index 68118a7..836ccaf 100644
--- a/src/org/openstreetmap/josm/tools/date/DateUtils.java
+++ b/src/org/openstreetmap/josm/tools/date/DateUtils.java
@@ -12,6 +12,7 @@ import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
@@ -144,7 +145,7 @@ public final class DateUtils {
* @return The formatted date
*/
public static synchronized String fromTimestamp(int timestamp) {
- final ZonedDateTime temporal = Instant.ofEpochMilli(timestamp * 1000L).atZone(ZoneOffset.UTC);
+ final ZonedDateTime temporal = Instant.ofEpochMilli(TimeUnit.SECONDS.toMillis(timestamp)).atZone(ZoneOffset.UTC);
return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(temporal);
}
diff --git a/styles/standard/elemstyles.mapcss b/styles/standard/elemstyles.mapcss
index 884f599..4dc87b2 100644
--- a/styles/standard/elemstyles.mapcss
+++ b/styles/standard/elemstyles.mapcss
@@ -1882,6 +1882,7 @@ area[shop=medical_supply],
area[shop=paint],
area[shop=pawnbroker],
area[shop=seafood],
+area[shop=dairy],
area[shop=shoes],
area[shop=sports],
area[shop=stationery],
@@ -2129,6 +2130,10 @@ node[shop=seafood] {
icon-image: "presets/shop/groceries/seafood.svg";
set icon_z17;
}
+node[shop=dairy] {
+ icon-image: "presets/shop/groceries/dairy.svg";
+ set icon_z17;
+}
node[shop=shoes] {
icon-image: "presets/shop/shoes.svg";
set icon_z17;
@@ -2723,7 +2728,8 @@ area[amenity=courthouse],
area[amenity=prison],
area[amenity=bank],
area[amenity=bureau_de_change],
-area[amenity=bbq] {
+area[amenity=bbq],
+area[amenity=watering_place] {
fill-color: amenity_light#f7efb7;
}
node[amenity=library] {
@@ -2798,6 +2804,10 @@ node[amenity=compressed_air] {
icon-image: "presets/vehicle/compressed_air.svg";
set icon_z17;
}
+node[amenity=watering_place] {
+ icon-image: "presets/misc/watering_place.svg";
+ set icon_z17;
+}
area[amenity=shelter],
area[amenity=marketplace],
area[amenity=wlan] {
@@ -2977,6 +2987,7 @@ node[craft=tiler] {
area[tourism=hotel],
area[tourism=motel],
area[tourism=guest_house],
+area[tourism=apartment],
area[tourism=hostel],
area[tourism=chalet],
area[tourism=alpine_hut],
@@ -2997,6 +3008,10 @@ node[tourism=guest_house] {
icon-image: "presets/accommodation/guest_house.svg";
set icon_z17;
}
+node[tourism=apartment] {
+ icon-image: "presets/accommodation/apartment.svg";
+ set icon_z17;
+}
node[tourism=hostel] {
icon-image: "presets/accommodation/hostel.svg";
set icon_z17;
@@ -4194,6 +4209,12 @@ way[waterway=canal] {
width: 2;
color: water#0000ff;
}
+way[waterway=river][lock=yes],
+way[waterway=canal][lock=yes] {
+ casing-width: 2;
+ casing-color: lock#303030;
+ casing-dashes: 5,20;
+}
way[waterway=stream] {
width: 1;
color: stream#6600cc;
@@ -4218,6 +4239,10 @@ node[waterway=dock] {
icon-image: "presets/nautical/boatyard.svg";
set icon_z17;
}
+way[waterway=lock_gate] {
+ width: 3;
+ color: lock_gate#303030;
+}
node[waterway=lock_gate] {
icon-image: "presets/nautical/lock_gate.svg";
set icon_z17;
@@ -4585,14 +4610,6 @@ node|z-15[note][FIXME][!setting("hide_icons")]::core_note_fixme {
icon-image: "presets/misc/note_fixme_annotation.svg";
}
-/* special display of unreviewed tiger data (USA) */
-way["tiger:reviewed"=no]::core_tiger {
- major-z-index: -10;
- width: 11;
- color: tiger_data#808000;
- opacity: 0.6;
-}
-
/****************************************/
/* zoom levels and general node display */
/****************************************/
diff --git a/test/data/wmts/bug13975-multiple-tile-matrices-for-one-layer-projection.xml b/test/data/wmts/bug13975-multiple-tile-matrices-for-one-layer-projection.xml
new file mode 100644
index 0000000..37b39d1
--- /dev/null
+++ b/test/data/wmts/bug13975-multiple-tile-matrices-for-one-layer-projection.xml
@@ -0,0 +1,377 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Capabilities xmlns="http://www.opengis.net/wmts/1.0" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml" xsi:schemaLocation="http://www.opengis.net/wmts/1.0 http://schemas.opengis.net/wmts/1.0/wmtsGetCapabilities_response.xsd" version="1.0.0">
+<!-- Service Identification --> <ows:ServiceIdentification>
+<ows:Title>Mashhad_BaseMap_1</ows:Title>
+<ows:ServiceType>OGC WMTS</ows:ServiceType>
+<ows:ServiceTypeVersion>1.0.0</ows:ServiceTypeVersion>
+</ows:ServiceIdentification> <!-- Operations Metadata --> <ows:OperationsMetadata>
+<ows:Operation name="GetCapabilities">
+<ows:DCP>
+<ows:HTTP>
+<ows:Get xlink:href="http://188.253.0.155:6080/arcgis/rest/services/Mashhad_BaseMap_1/MapServer/WMTS/1.0.0/WMTSCapabilities.xml">
+<ows:Constraint name="GetEncoding">
+<ows:AllowedValues>
+<ows:Value>RESTful</ows:Value>
+</ows:AllowedValues>
+</ows:Constraint>
+</ows:Get>
+<!-- add KVP binding in 10.1 -->
+<ows:Get xlink:href="http://188.253.0.155:6080/arcgis/rest/services/Mashhad_BaseMap_1/MapServer/WMTS?">
+<ows:Constraint name="GetEncoding">
+<ows:AllowedValues>
+<ows:Value>KVP</ows:Value>
+</ows:AllowedValues>
+</ows:Constraint>
+</ows:Get>
+</ows:HTTP>
+</ows:DCP>
+</ows:Operation>
+<ows:Operation name="GetTile">
+<ows:DCP>
+<ows:HTTP>
+<ows:Get xlink:href="http://188.253.0.155:6080/arcgis/rest/services/Mashhad_BaseMap_1/MapServer/WMTS/tile/1.0.0/">
+<ows:Constraint name="GetEncoding">
+<ows:AllowedValues>
+<ows:Value>RESTful</ows:Value>
+</ows:AllowedValues>
+</ows:Constraint>
+</ows:Get>
+<ows:Get xlink:href="http://188.253.0.155:6080/arcgis/rest/services/Mashhad_BaseMap_1/MapServer/WMTS?">
+<ows:Constraint name="GetEncoding">
+<ows:AllowedValues>
+<ows:Value>KVP</ows:Value>
+</ows:AllowedValues>
+</ows:Constraint>
+</ows:Get>
+</ows:HTTP>
+</ows:DCP>
+</ows:Operation>
+</ows:OperationsMetadata> <Contents>
+<!--Layer--> <Layer>
+<ows:Title>Mashhad_BaseMap_1</ows:Title> <ows:Identifier>Mashhad_BaseMap_1</ows:Identifier>
+<ows:BoundingBox crs="urn:ogc:def:crs:EPSG::3857">
+<ows:LowerCorner>6588340.738203676 4304495.929392335</ows:LowerCorner>
+<ows:UpperCorner>6678536.942362351 4378339.757654444</ows:UpperCorner>
+</ows:BoundingBox> <ows:WGS84BoundingBox crs="urn:ogc:def:crs:OGC:2:84">
+<ows:LowerCorner>59.184071821156536 36.028153408122506</ows:LowerCorner>
+<ows:UpperCorner>59.99431810880956 36.56279324540633</ows:UpperCorner>
+</ows:WGS84BoundingBox>
+<Style isDefault="true">
+<ows:Title>Default Style</ows:Title>
+<ows:Identifier>default</ows:Identifier>
+</Style>
+<Format>image/jpgpng</Format>
+<TileMatrixSetLink>
+<TileMatrixSet>default028mm</TileMatrixSet>
+</TileMatrixSetLink>
+<TileMatrixSetLink>
+<!--Only show this TileMatrixSet if the tiling scheme is compliant to Google Maps (and that happens with tile width = 256 px)-->
+<TileMatrixSet>GoogleMapsCompatible</TileMatrixSet>
+</TileMatrixSetLink>
+<ResourceURL format="image/jpgpng" resourceType="tile" template="http://188.253.0.155:6080/arcgis/rest/services/Mashhad_BaseMap_1/MapServer/WMTS/tile/1.0.0/Mashhad_BaseMap_1/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}"/>
+</Layer> <!--TileMatrixSet-->
+<TileMatrixSet>
+<ows:Title>TileMatrix using 0.28mm</ows:Title>
+<ows:Abstract>The tile matrix set that has scale values calculated based on the dpi defined by OGC specification (dpi assumes 0.28mm as the physical distance of a pixel).</ows:Abstract> <ows:Identifier>default028mm</ows:Identifier>
+<ows:SupportedCRS>urn:ogc:def:crs:EPSG::3857</ows:SupportedCRS>
+<TileMatrix>
+<ows:Identifier>0</ows:Identifier>
+<ScaleDenominator>5.590822640285016E8</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>1</MatrixWidth> <MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>1</ows:Identifier>
+<ScaleDenominator>2.7954113201425034E8</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>2</MatrixWidth> <MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>2</ows:Identifier>
+<ScaleDenominator>1.3977056600712562E8</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>3</MatrixWidth> <MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>3</ows:Identifier>
+<ScaleDenominator>6.988528300356235E7</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>6</MatrixWidth> <MatrixHeight>4</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>4</ows:Identifier>
+<ScaleDenominator>3.494264150178117E7</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>11</MatrixWidth> <MatrixHeight>7</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>5</ows:Identifier>
+<ScaleDenominator>1.7471320750890587E7</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>22</MatrixWidth> <MatrixHeight>13</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>6</ows:Identifier>
+<ScaleDenominator>8735660.375445293</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>43</MatrixWidth> <MatrixHeight>26</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>7</ows:Identifier>
+<ScaleDenominator>4367830.187722647</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>86</MatrixWidth> <MatrixHeight>51</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>8</ows:Identifier>
+<ScaleDenominator>2183915.0938617955</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>171</MatrixWidth> <MatrixHeight>101</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>9</ows:Identifier>
+<ScaleDenominator>1091957.5469304253</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>342</MatrixWidth> <MatrixHeight>202</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>10</ows:Identifier>
+<ScaleDenominator>545978.7734656851</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>683</MatrixWidth> <MatrixHeight>403</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>11</ows:Identifier>
+<ScaleDenominator>272989.38673237007</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>1366</MatrixWidth> <MatrixHeight>805</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>12</ows:Identifier>
+<ScaleDenominator>136494.69336618503</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>2731</MatrixWidth> <MatrixHeight>1609</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>13</ows:Identifier>
+<ScaleDenominator>68247.34668309252</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>5462</MatrixWidth> <MatrixHeight>3217</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>14</ows:Identifier>
+<ScaleDenominator>34123.67334154626</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>10923</MatrixWidth> <MatrixHeight>6433</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>15</ows:Identifier>
+<ScaleDenominator>17061.836671245605</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>21845</MatrixWidth> <MatrixHeight>12865</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>16</ows:Identifier>
+<ScaleDenominator>8530.918335622802</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>43690</MatrixWidth> <MatrixHeight>25729</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>17</ows:Identifier>
+<ScaleDenominator>4265.459167338929</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>87380</MatrixWidth> <MatrixHeight>51458</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>18</ows:Identifier>
+<ScaleDenominator>2132.729584141936</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>174759</MatrixWidth> <MatrixHeight>102915</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>19</ows:Identifier>
+<ScaleDenominator>1066.3647915984968</ScaleDenominator>
+<TopLeftCorner>-2.0037508342787E7 2.0037508342787E7</TopLeftCorner> <TileWidth>256</TileWidth> <TileHeight>256</TileHeight>
+<MatrixWidth>349518</MatrixWidth> <MatrixHeight>205830</MatrixHeight>
+</TileMatrix>
+</TileMatrixSet>
+<TileMatrixSet>
+<ows:Title>GoogleMapsCompatible</ows:Title>
+<ows:Abstract>the wellknown 'GoogleMapsCompatible' tile matrix set defined by OGC WMTS specification</ows:Abstract>
+<ows:Identifier>GoogleMapsCompatible</ows:Identifier>
+<ows:SupportedCRS>urn:ogc:def:crs:EPSG:6.18.3:3857</ows:SupportedCRS>
+<WellKnownScaleSet>urn:ogc:def:wkss:OGC:1.0:GoogleMapsCompatible</WellKnownScaleSet>
+<TileMatrix>
+<ows:Identifier>0</ows:Identifier>
+<ScaleDenominator>559082264.0287178</ScaleDenominator>
+<TopLeftCorner>-20037508.34278925 20037508.34278925</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>1</MatrixWidth>
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>1</ows:Identifier>
+<ScaleDenominator>279541132.0143589</ScaleDenominator>
+<TopLeftCorner>-20037508.34278925 20037508.34278925</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>2</MatrixWidth>
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>2</ows:Identifier>
+<ScaleDenominator>139770566.0071794</ScaleDenominator>
+<TopLeftCorner>-20037508.34278925 20037508.34278925</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>4</MatrixWidth>
+<MatrixHeight>4</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>3</ows:Identifier>
+<ScaleDenominator>69885283.00358972</ScaleDenominator>
+<TopLeftCorner>-20037508.34278925 20037508.34278925</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>8</MatrixWidth>
+<MatrixHeight>8</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>4</ows:Identifier>
+<ScaleDenominator>34942641.50179486</ScaleDenominator>
+<TopLeftCorner>-20037508.34278925 20037508.34278925</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>16</MatrixWidth>
+<MatrixHeight>16</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>5</ows:Identifier>
+<ScaleDenominator>17471320.75089743</ScaleDenominator>
+<TopLeftCorner>-20037508.34278925 20037508.34278925</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>32</MatrixWidth>
+<MatrixHeight>32</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>6</ows:Identifier>
+<ScaleDenominator>8735660.375448715</ScaleDenominator>
+<TopLeftCorner>-20037508.34278925 20037508.34278925</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>64</MatrixWidth>
+<MatrixHeight>64</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>7</ows:Identifier>
+<ScaleDenominator>4367830.187724357</ScaleDenominator>
+<TopLeftCorner>-20037508.34278925 20037508.34278925</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>128</MatrixWidth>
+<MatrixHeight>128</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>8</ows:Identifier>
+<ScaleDenominator>2183915.093862179</ScaleDenominator>
+<TopLeftCorner>-20037508.34278925 20037508.34278925</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>256</MatrixWidth>
+<MatrixHeight>256</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>9</ows:Identifier>
+<ScaleDenominator>1091957.546931089</ScaleDenominator>
+<TopLeftCorner>-20037508.34278925 20037508.34278925</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>512</MatrixWidth>
+<MatrixHeight>512</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>10</ows:Identifier>
+<ScaleDenominator>545978.7734655447</ScaleDenominator>
+<TopLeftCorner>-20037508.34278925 20037508.34278925</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>1024</MatrixWidth>
+<MatrixHeight>1024</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>11</ows:Identifier>
+<ScaleDenominator>272989.3867327723</ScaleDenominator>
+<TopLeftCorner>-20037508.34278925 20037508.34278925</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>2048</MatrixWidth>
+<MatrixHeight>2048</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>12</ows:Identifier>
+<ScaleDenominator>136494.6933663862</ScaleDenominator>
+<TopLeftCorner>-20037508.34278925 20037508.34278925</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>4096</MatrixWidth>
+<MatrixHeight>4096</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>13</ows:Identifier>
+<ScaleDenominator>68247.34668319309</ScaleDenominator>
+<TopLeftCorner>-20037508.34278925 20037508.34278925</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>8192</MatrixWidth>
+<MatrixHeight>8192</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>14</ows:Identifier>
+<ScaleDenominator>34123.67334159654</ScaleDenominator>
+<TopLeftCorner>-20037508.34278925 20037508.34278925</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>16384</MatrixWidth>
+<MatrixHeight>16384</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>15</ows:Identifier>
+<ScaleDenominator>17061.83667079827</ScaleDenominator>
+<TopLeftCorner>-20037508.34278925 20037508.34278925</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>32768</MatrixWidth>
+<MatrixHeight>32768</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>16</ows:Identifier>
+<ScaleDenominator>8530.918335399136</ScaleDenominator>
+<TopLeftCorner>-20037508.34278925 20037508.34278925</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>65536</MatrixWidth>
+<MatrixHeight>65536</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>17</ows:Identifier>
+<ScaleDenominator>4265.459167699568</ScaleDenominator>
+<TopLeftCorner>-20037508.34278925 20037508.34278925</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>131072</MatrixWidth>
+<MatrixHeight>131072</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>18</ows:Identifier>
+<ScaleDenominator>2132.729583849784</ScaleDenominator>
+<TopLeftCorner>-20037508.34278925 20037508.34278925</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>262144</MatrixWidth>
+<MatrixHeight>262144</MatrixHeight>
+</TileMatrix>
+</TileMatrixSet>
+</Contents>
+<ServiceMetadataURL xlink:href="http://188.253.0.155:6080/arcgis/rest/services/Mashhad_BaseMap_1/MapServer/WMTS/1.0.0/WMTSCapabilities.xml"/> </Capabilities>
\ No newline at end of file
diff --git a/test/functional/org/openstreetmap/josm/data/BoundariesTestIT.java b/test/functional/org/openstreetmap/josm/data/BoundariesTestIT.java
new file mode 100644
index 0000000..fab2189
--- /dev/null
+++ b/test/functional/org/openstreetmap/josm/data/BoundariesTestIT.java
@@ -0,0 +1,66 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.stream.Collectors;
+
+import org.junit.Test;
+import org.openstreetmap.josm.actions.search.SearchCompiler;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.io.OsmReader;
+
+/**
+ * Test of boundaries OSM file.
+ */
+public class BoundariesTestIT {
+
+ private static final List<String> RETIRED_ISO3166_1_CODES = Arrays.asList(
+ "AN", "BU", "CS", "NT", "TP", "YU", "ZR");
+
+ private static final List<String> EXCEPTIONNALY_RESERVED_ISO3166_1_CODES = Arrays.asList(
+ "AC", "CP", "DG", "EA", "EU", "EZ", "FX", "IC", "SU", "TA", "UK", "UN");
+
+ private static final List<String> ISO3166_2_CODES = Arrays.asList(
+ "AU-ACT", "AU-NSW", "AU-NT", "AU-QLD", "AU-SA", "AU-TAS", "AU-VIC", "AU-WA",
+ "CA-AB", "CA-BC", "CA-MB", "CA-NB", "CA-NL", "CA-NS", "CA-NT", "CA-NU", "CA-ON", "CA-PE", "CA-QC", "CA-SK", "CA-YT",
+ "US-AL", "US-AK", "US-AS", "US-AZ", "US-AR", "US-CA", "US-CO", "US-CT", "US-DE", "US-DC", "US-FL", "US-GA", "US-GU", "US-HI",
+ "US-ID", "US-IL", "US-IN", "US-IA", "US-KS", "US-KY", "US-LA", "US-ME", "US-MD", "US-MA", "US-MI", "US-MN", "US-MS", "US-MO",
+ "US-MT", "US-NE", "US-NV", "US-NH", "US-NJ", "US-NM", "US-NY", "US-NC", "US-ND", "US-MP", "US-OH", "US-OK", "US-OR", "US-PA",
+ "US-PR", "US-RI", "US-SC", "US-SD", "US-TN", "US-TX", "US-UM", "US-UT", "US-VT", "US-VA", "US-VI", "US-WA", "US-WV", "US-WI",
+ "US-WY");
+
+ /**
+ * Test of boundaries OSM file.
+ * @throws Exception if an error occurs
+ */
+ @Test
+ public void testBoundariesFile() throws Exception {
+ try (InputStream is = getClass().getResourceAsStream("/data/boundaries.osm")) {
+ DataSet ds = OsmReader.parseDataSet(is, null);
+ List<OsmPrimitive> tagged = ds.allPrimitives().stream().filter(OsmPrimitive::isTagged).collect(Collectors.toList());
+ List<String> iso31661a2 = Arrays.asList(Locale.getISOCountries());
+ // Check presence of all ISO-3166-1 alpha 2 codes
+ for (String code : iso31661a2) {
+ if (!RETIRED_ISO3166_1_CODES.contains(code)) {
+ assertEquals(code, 1, tagged.stream().filter(SearchCompiler.compile("ISO3166-1\\:alpha2="+code)).count());
+ }
+ }
+ // Check for unknown ISO-3166-1 alpha 2 codes
+ for (OsmPrimitive p : tagged.stream().filter(SearchCompiler.compile("ISO3166-1\\:alpha2")).collect(Collectors.toList())) {
+ String code = p.get("ISO3166-1:alpha2");
+ assertTrue(code, iso31661a2.contains(code) || EXCEPTIONNALY_RESERVED_ISO3166_1_CODES.contains(code));
+ }
+ // Check presence of all ISO-3166-2 codes for USA, Canada, Australia (for speed limits)
+ for (String code : ISO3166_2_CODES) {
+ assertEquals(code, 1, tagged.stream().filter(SearchCompiler.compile("ISO3166-2="+code)).count());
+ }
+ }
+ }
+}
diff --git a/test/functional/org/openstreetmap/josm/data/imagery/ImageryCompareTestIT.java b/test/functional/org/openstreetmap/josm/data/imagery/ImageryCompareTestIT.java
new file mode 100644
index 0000000..397efc7
--- /dev/null
+++ b/test/functional/org/openstreetmap/josm/data/imagery/ImageryCompareTestIT.java
@@ -0,0 +1,56 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.imagery;
+
+import static org.junit.Assert.fail;
+
+import java.net.URL;
+
+import org.junit.Test;
+import org.openstreetmap.josm.tools.HttpClient;
+
+/**
+ * Automatic test of imagery synchronization between JOSM and ELI.
+ * See <a href="https://josm.openstreetmap.de/wiki/ImageryCompare">JOSM wiki</a>
+ */
+public class ImageryCompareTestIT {
+
+ private static String BLACK_PREFIX = "<pre style=\"margin:3px;color:black\">";
+ private static String RED_PREFIX = "<pre style=\"margin:3px;color:red\">";
+
+ /**
+ * Test of imagery entries.
+ * @throws Exception if an error occurs
+ */
+ @Test
+ public void testImageryEntries() throws Exception {
+ System.out.println("Displaying only red entries. The test fails if at least one is found");
+ boolean rubricDisplayed = false;
+ boolean redFound = false;
+ String comparison = HttpClient.create(new URL("https://josm.openstreetmap.de/wiki/ImageryCompare")).connect().fetchContent();
+ String rubricLine = null;
+ for (String line : comparison.split("\n")) {
+ boolean black = line.startsWith(BLACK_PREFIX);
+ if (black) {
+ rubricLine = line;
+ rubricDisplayed = false;
+ } else {
+ boolean red = line.startsWith(RED_PREFIX);
+ if (red) {
+ if (!rubricDisplayed && rubricLine != null) {
+ System.out.println(rubricLine.replace(BLACK_PREFIX, "").replace("</pre>", ""));
+ rubricDisplayed = true;
+ }
+ System.out.println(line.replace(RED_PREFIX, "").replace("</pre>", ""));
+ if (!redFound && red) {
+ redFound = true;
+ }
+ }
+ }
+ }
+ if (redFound) {
+ fail("Error: at least a red line has been found, see https://josm.openstreetmap.de/wiki/ImageryCompare for details");
+ } else {
+ System.out.println("No error :)");
+ }
+ }
+}
diff --git a/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java b/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java
index 2ec4693..aab8b12 100644
--- a/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java
+++ b/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java
@@ -125,7 +125,7 @@ public class StyleCacheTest {
counter.put(sel, k + 1);
}
}
- int EXPECTED_NO_PRIMITIVES = 4298; // needs to be updated if data file or bbox changes
+ int EXPECTED_NO_PRIMITIVES = 4294; // needs to be updated if data file or bbox changes
Assert.assertEquals(
"The number of rendered primitives should be " + EXPECTED_NO_PRIMITIVES,
EXPECTED_NO_PRIMITIVES, noPrimitives);
diff --git a/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java b/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
index 85b3124..d9a48af 100644
--- a/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
+++ b/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
@@ -14,9 +14,11 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
+import java.security.SecureRandom;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Locale;
+import java.util.Random;
import java.util.logging.Logger;
import org.junit.Before;
@@ -38,9 +40,12 @@ import org.openstreetmap.josm.gui.io.UploadStrategy;
import org.openstreetmap.josm.gui.io.UploadStrategySpecification;
import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
/**
* Unit tests of {@link MultiFetchServerObjectReader}.
*/
+ at SuppressFBWarnings(value = "CRLF_INJECTION_LOGS")
public class MultiFetchServerObjectReaderTest {
private static Logger logger = Logger.getLogger(MultiFetchServerObjectReader.class.getName());
@@ -58,6 +63,7 @@ public class MultiFetchServerObjectReaderTest {
protected static DataSet buildTestDataSet() {
DataSet ds = new DataSet();
ds.setVersion("0.6");
+ Random rand = new SecureRandom();
int numNodes = 1000;
int numWays = 1000;
@@ -80,8 +86,8 @@ public class MultiFetchServerObjectReaderTest {
//
for (int i = 0; i < numWays; i++) {
Way w = new Way();
- int numNodesInWay = 2 + (int) Math.round(Math.random() * 5);
- int start = (int) Math.round(Math.random() * numNodes);
+ int numNodesInWay = 2 + (int) Math.round(rand.nextDouble() * 5);
+ int start = (int) Math.round(rand.nextDouble() * numNodes);
for (int j = 0; j < numNodesInWay; j++) {
int idx = (start + j) % numNodes;
Node n = nodes.get(idx);
@@ -97,15 +103,15 @@ public class MultiFetchServerObjectReaderTest {
for (int i = 0; i < numRelations; i++) {
Relation r = new Relation();
r.put("name", "relation-" +i);
- int numNodesInRelation = (int) Math.round(Math.random() * 10);
- int start = (int) Math.round(Math.random() * numNodes);
+ int numNodesInRelation = (int) Math.round(rand.nextDouble() * 10);
+ int start = (int) Math.round(rand.nextDouble() * numNodes);
for (int j = 0; j < numNodesInRelation; j++) {
int idx = (start + j) % 500;
Node n = nodes.get(idx);
r.addMember(new RelationMember("role-" + j, n));
}
- int numWaysInRelation = (int) Math.round(Math.random() * 10);
- start = (int) Math.round(Math.random() * numWays);
+ int numWaysInRelation = (int) Math.round(rand.nextDouble() * 10);
+ start = (int) Math.round(rand.nextDouble() * numWays);
for (int j = 0; j < numWaysInRelation; j++) {
int idx = (start + j) % 500;
Way w = ways.get(idx);
diff --git a/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java b/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
index 8b874eb..5cdf045 100644
--- a/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
+++ b/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
@@ -43,10 +43,13 @@ import org.openstreetmap.josm.gui.io.UploadStrategySpecification;
import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
import org.openstreetmap.josm.tools.Logging;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
/**
* Reads primitives referring to a particular primitive (ways including a node, relations referring to a relation)
* @since 1806
*/
+ at SuppressFBWarnings(value = "CRLF_INJECTION_LOGS")
public class OsmServerBackreferenceReaderTest {
private static final Logger logger = Logger.getLogger(OsmServerBackreferenceReader.class.getName());
diff --git a/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java b/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java
index 20e0f22..dc30228 100644
--- a/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java
+++ b/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java
@@ -12,6 +12,8 @@ import java.io.InputStream;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
+import java.util.logging.Handler;
+import java.util.logging.LogRecord;
import javax.json.JsonObject;
import javax.json.JsonReader;
@@ -39,9 +41,29 @@ public class HttpClientTest {
private ProgressMonitor progress;
+ private LogRecord captured;
+ private final Handler handler = new Handler() {
+
+ @Override
+ public void publish(LogRecord record) {
+ captured = record;
+ }
+
+ @Override
+ public void flush() {
+ }
+
+ @Override
+ public void close() throws SecurityException {
+ }
+ };
+
@Before
public void setUp() {
progress = TestUtils.newTestProgressMonitor();
+ captured = null;
+ Logging.getLogger().addHandler(handler);
+ Logging.getLogger().setLevel(Logging.LEVEL_DEBUG);
}
@Test
@@ -153,9 +175,72 @@ public class HttpClientTest {
assertThat(response.getResponseMessage(), is("I'M A TEAPOT"));
final String content = response.fetchContent();
assertThat(content, containsString("-=[ teapot ]=-"));
+ assertThat(captured.getMessage(), containsString("-=[ teapot ]=-"));
+ assertThat(captured.getLevel(), is(Logging.LEVEL_DEBUG));
+ }
+
+ @Test()
+ public void testHttp401() throws IOException {
+ // https://tools.ietf.org/html/rfc2324
+ final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/status/401")).connect(progress);
+ assertThat(response.getResponseCode(), is(401));
+ assertThat(response.getResponseMessage(), is("UNAUTHORIZED"));
+ final String content = response.fetchContent();
+ assertThat(content, is(""));
+ assertThat(captured.getMessage(), containsString("Server did not return any body"));
+ assertThat(captured.getLevel(), is(Logging.LEVEL_DEBUG));
+ }
+
+ @Test
+ public void testHttp402() throws IOException {
+ // https://tools.ietf.org/html/rfc2324
+ final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/status/402")).connect(progress);
+ assertThat(response.getResponseCode(), is(402));
+ assertThat(response.getResponseMessage(), is("PAYMENT REQUIRED"));
+ final String content = response.fetchContent();
+ assertThat(content, containsString("Fuck you, pay me!"));
+ assertThat(captured.getMessage(), containsString("Fuck you, pay me!"));
+ assertThat(captured.getLevel(), is(Logging.LEVEL_DEBUG));
}
@Test
+ public void testHttp403() throws IOException {
+ // https://tools.ietf.org/html/rfc2324
+ final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/status/403")).connect(progress);
+ assertThat(response.getResponseCode(), is(403));
+ assertThat(response.getResponseMessage(), is("FORBIDDEN"));
+ final String content = response.fetchContent();
+ assertThat(content, is(""));
+ assertThat(captured.getMessage(), containsString("Server did not return any body"));
+ assertThat(captured.getLevel(), is(Logging.LEVEL_DEBUG));
+ }
+
+ @Test
+ public void testHttp404() throws IOException {
+ // https://tools.ietf.org/html/rfc2324
+ final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/status/404")).connect(progress);
+ assertThat(response.getResponseCode(), is(404));
+ assertThat(response.getResponseMessage(), is("NOT FOUND"));
+ final String content = response.fetchContent();
+ assertThat(content, is(""));
+ assertThat(captured.getMessage(), containsString("Server did not return any body"));
+ assertThat(captured.getLevel(), is(Logging.LEVEL_DEBUG));
+ }
+
+ @Test
+ public void testHttp500() throws IOException {
+ // https://tools.ietf.org/html/rfc2324
+ final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/status/500")).connect(progress);
+ assertThat(response.getResponseCode(), is(500));
+ assertThat(response.getResponseMessage(), is("INTERNAL SERVER ERROR"));
+ final String content = response.fetchContent();
+ assertThat(content, containsString(""));
+ assertThat(captured.getMessage(), containsString("Server did not return any body"));
+ assertThat(captured.getLevel(), is(Logging.LEVEL_DEBUG));
+ }
+
+
+ @Test
public void testRequestInTime() throws IOException {
final HttpClient.Response response = HttpClient.create(new URL("https://httpbin.org/delay/3")).setReadTimeout(3500).connect(progress);
assertThat(response.getResponseCode(), is(200));
diff --git a/test/performance/org/openstreetmap/josm/PerformanceTestUtils.java b/test/performance/org/openstreetmap/josm/PerformanceTestUtils.java
index 7587cc6..da73d9b 100644
--- a/test/performance/org/openstreetmap/josm/PerformanceTestUtils.java
+++ b/test/performance/org/openstreetmap/josm/PerformanceTestUtils.java
@@ -111,6 +111,7 @@ public final class PerformanceTestUtils {
measurementPlotsPluginOutput(name, avg);
}
+ @SuppressFBWarnings(value = "DM_GC")
private static void cleanSystem() {
System.gc();
System.runFinalization();
diff --git a/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java b/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java
index 2c01dc4..bffe1f0 100644
--- a/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java
+++ b/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java
@@ -7,6 +7,7 @@ import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.Random;
@@ -124,7 +125,7 @@ public class KeyValuePerformanceTest {
@Before
public void generateTestStrings() {
testStrings.clear();
- random = new Random(123);
+ random = new SecureRandom();
for (int i = 0; i < TEST_STRING_COUNT; i++) {
testStrings.add(RandomStringUtils.random(10, 0, 0, true, true, null, random));
}
diff --git a/test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java b/test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java
index 5ce5f05..d4342c9 100644
--- a/test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java
+++ b/test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java
@@ -2,6 +2,7 @@
package org.openstreetmap.josm.data.osm;
import java.io.File;
+import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.Random;
@@ -40,7 +41,8 @@ public final class OsmDataGenerator {
* @param size The size of the list.
*/
public RandomStringList(int seed, int size) {
- random = new Random(seed);
+ random = new SecureRandom();
+ random.setSeed(seed);
strings = new String[size];
interned = new String[size];
for (int i = 0; i < size; i++) {
@@ -87,7 +89,7 @@ public final class OsmDataGenerator {
*/
protected DataGenerator(String datasetName) {
this.datasetName = datasetName;
- this.random = new Random(1234);
+ this.random = new SecureRandom();
}
/**
@@ -125,7 +127,7 @@ public final class OsmDataGenerator {
* @return A file path.
*/
public File getFile() {
- return new File(DATA_DIR + File.separator + datasetName + ".osm");
+ return new File(DATA_DIR, datasetName + ".osm");
}
/**
@@ -138,7 +140,7 @@ public final class OsmDataGenerator {
@Override
public String toString() {
- return "DataGenerator [datasetName=" + datasetName + "]";
+ return "DataGenerator [datasetName=" + datasetName + ']';
}
}
diff --git a/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java b/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java
index 8e5d8d5..63691c1 100644
--- a/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java
+++ b/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java
@@ -165,7 +165,6 @@ public class MapRendererPerformanceTest {
public int noWarmup = 3;
public int noIterations = 7;
public boolean dumpImage = DUMP_IMAGE;
- public boolean skipDraw = false;
public boolean clearStyleCache = true;
public String label = "";
public boolean mpGenerate = false;
@@ -263,7 +262,6 @@ public class MapRendererPerformanceTest {
PerformanceTester test = new PerformanceTester();
test.bounds = BOUNDS_CITY_ALL;
test.label = "big";
- test.skipDraw = true;
test.dumpImage = false;
test.noWarmup = 3;
test.noIterations = 10;
diff --git a/test/unit/org/openstreetmap/josm/TestUtils.java b/test/unit/org/openstreetmap/josm/TestUtils.java
index 31cbb85..2f6e290 100644
--- a/test/unit/org/openstreetmap/josm/TestUtils.java
+++ b/test/unit/org/openstreetmap/josm/TestUtils.java
@@ -9,6 +9,8 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
@@ -78,7 +80,7 @@ public final class TestUtils {
* @throws IOException if any I/O error occurs
*/
public static InputStream getRegressionDataStream(int ticketid, String filename) throws IOException {
- return Compression.getUncompressedFileInputStream(new File(getRegressionDataDir(ticketid) + '/' + filename));
+ return Compression.getUncompressedFileInputStream(new File(getRegressionDataDir(ticketid), filename));
}
/**
@@ -172,7 +174,10 @@ public final class TestUtils {
*/
public static Object getPrivateField(Object obj, String fieldName) throws ReflectiveOperationException {
Field f = obj.getClass().getDeclaredField(fieldName);
- f.setAccessible(true);
+ AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+ f.setAccessible(true);
+ return null;
+ });
return f.get(obj);
}
diff --git a/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java b/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java
index 7fd929d..be33b9c 100644
--- a/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java
@@ -4,10 +4,8 @@ package org.openstreetmap.josm.actions;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import java.awt.geom.Area;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -24,8 +22,8 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.GeoProperty;
import org.openstreetmap.josm.tools.GeoPropertyIndex;
-import org.openstreetmap.josm.tools.GeoPropertyIndex.GeoProperty;
import org.openstreetmap.josm.tools.Geometry;
import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
import org.openstreetmap.josm.tools.Utils;
@@ -42,7 +40,7 @@ public final class CreateCircleActionTest {
*/
@Rule
@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
- public JOSMTestRules test = new JOSMTestRules().platform();
+ public JOSMTestRules test = new JOSMTestRules().platform().projection().commands();
/**
* FIXME: Conveniance method to prevent Selection Change events.
@@ -151,31 +149,34 @@ public final class CreateCircleActionTest {
addSelected(n3, dataSet);
// Mock left/right hand traffic database
- Field leftHandTrafficPolygons = RightAndLefthandTraffic.class
- .getDeclaredField("leftHandTrafficPolygons");
Field rlCache = RightAndLefthandTraffic.class.getDeclaredField("rlCache");
- Utils.setObjectsAccessible(leftHandTrafficPolygons, rlCache);
- leftHandTrafficPolygons.set(null, new ArrayList<Area>());
+ Utils.setObjectsAccessible(rlCache);
+ Object origRlCache = rlCache.get(null);
rlCache.set(null, new GeoPropertyIndex<>(new ConstantTrafficHand(true), 24));
- CreateCircleAction action = new CreateCircleAction();
- action.setEnabled(true);
try {
- Main.getLayerManager().addLayer(layer);
- action.actionPerformed(null);
+ CreateCircleAction action = new CreateCircleAction();
+ action.setEnabled(true);
+ try {
+ Main.getLayerManager().addLayer(layer);
+ action.actionPerformed(null);
+ } finally {
+ // Ensure we clean the place before leaving, even if test fails.
+ Main.getLayerManager().removeLayer(layer);
+ }
+
+ // Expected result: Dataset contain one closed way, clockwise
+ Collection<Way> resultingWays = dataSet.getWays();
+ assertSame(String.format("Expect one way after perform action. %d found", resultingWays.size()),
+ resultingWays.size(), 1);
+ Way resultingWay = resultingWays.iterator().next();
+ assertTrue("Resulting way is not closed",
+ resultingWay.isClosed());
+ assertTrue("Found anti-clockwise way while traffic is left hand.",
+ Geometry.isClockwise(resultingWay));
} finally {
- // Ensure we clean the place before leaving, even if test fails.
- Main.getLayerManager().removeLayer(layer);
+ // Restore left/right hand traffic database
+ rlCache.set(null, origRlCache);
}
-
- // Expected result: Dataset contain one closed way, clockwise
- Collection<Way> resultingWays = dataSet.getWays();
- assertSame(String.format("Expect one way after perform action. %d found", resultingWays.size()),
- resultingWays.size(), 1);
- Way resultingWay = resultingWays.iterator().next();
- assertTrue("Resulting way is not closed",
- resultingWay.isClosed());
- assertTrue("Found anti-clockwise way while traffic is left hand.",
- Geometry.isClockwise(resultingWay));
}
}
diff --git a/test/unit/org/openstreetmap/josm/actions/ExpertToggleActionTest.java b/test/unit/org/openstreetmap/josm/actions/ExpertToggleActionTest.java
new file mode 100644
index 0000000..ab9442d
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/actions/ExpertToggleActionTest.java
@@ -0,0 +1,87 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.swing.JPanel;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.actions.ExpertToggleAction.ExpertModeChangeListener;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Test {@link ExpertToggleAction}
+ * @author Michael Zangl
+ * @since 11224
+ */
+public class ExpertToggleActionTest {
+ /**
+ * We need prefs to store expert mode state.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules().preferences().platform();
+
+ /**
+ * Test {@link ExpertToggleAction#addVisibilitySwitcher(java.awt.Component)}
+ * and {@link ExpertToggleAction#removeVisibilitySwitcher(java.awt.Component)}
+ */
+ @Test
+ public void testVisibilitySwitcher() {
+ ExpertToggleAction.getInstance().setExpert(false);
+ JPanel c = new JPanel();
+
+ ExpertToggleAction.addVisibilitySwitcher(c);
+ assertFalse(c.isVisible());
+
+ ExpertToggleAction.getInstance().setExpert(true);
+ assertTrue(c.isVisible());
+
+ ExpertToggleAction.removeVisibilitySwitcher(c);
+ ExpertToggleAction.getInstance().setExpert(false);
+ assertTrue(c.isVisible());
+
+ // null should not be a problem
+ ExpertToggleAction.addVisibilitySwitcher(null);
+ ExpertToggleAction.removeVisibilitySwitcher(null);
+ }
+
+ /**
+ * Test {@link ExpertToggleAction#addExpertModeChangeListener(ExpertModeChangeListener)}
+ * and {@link ExpertToggleAction#removeExpertModeChangeListener(ExpertModeChangeListener)}
+ */
+ @Test
+ public void testExpertModeListener() {
+ AtomicBoolean value = new AtomicBoolean(false);
+ ExpertToggleAction.getInstance().setExpert(true);
+ ExpertModeChangeListener listener = value::set;
+
+ ExpertToggleAction.addExpertModeChangeListener(listener);
+ assertFalse(value.get());
+
+ ExpertToggleAction.getInstance().setExpert(false);
+ ExpertToggleAction.getInstance().setExpert(true);
+ assertTrue(value.get());
+
+ ExpertToggleAction.getInstance().setExpert(false);
+ assertFalse(value.get());
+
+ ExpertToggleAction.removeExpertModeChangeListener(listener);
+ ExpertToggleAction.getInstance().setExpert(true);
+ assertFalse(value.get());
+
+ ExpertToggleAction.addExpertModeChangeListener(listener, true);
+ assertTrue(value.get());
+
+ // null should not be a problem
+ ExpertToggleAction.addExpertModeChangeListener(null);
+ ExpertToggleAction.removeExpertModeChangeListener(null);
+ }
+
+}
diff --git a/test/unit/org/openstreetmap/josm/actions/FullscreenToggleActionTest.java b/test/unit/org/openstreetmap/josm/actions/FullscreenToggleActionTest.java
new file mode 100644
index 0000000..09ce5b2
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/actions/FullscreenToggleActionTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Test {@link FullscreenToggleAction}
+ */
+public class FullscreenToggleActionTest {
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules().platform().commands();
+
+ /**
+ * Test {@link FullscreenToggleAction}
+ */
+ @Test
+ public void testFullscreenToggleAction() {
+ FullscreenToggleAction action = new FullscreenToggleAction();
+ // Cannot really test it in headless mode, but at least check we can toggle the action without error
+ action.actionPerformed(null);
+ action.actionPerformed(null);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/actions/SelectByInternalPointActionTest.java b/test/unit/org/openstreetmap/josm/actions/SelectByInternalPointActionTest.java
index 6e0a1b2..c5ff722 100644
--- a/test/unit/org/openstreetmap/josm/actions/SelectByInternalPointActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/SelectByInternalPointActionTest.java
@@ -19,6 +19,8 @@ import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.testutils.JOSMTestRules;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
/**
* Unit tests for class {@link SelectByInternalPointAction}.
*/
@@ -28,6 +30,7 @@ public final class SelectByInternalPointActionTest {
* Setup test.
*/
@Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
public JOSMTestRules rules = new JOSMTestRules().preferences().projection();
/**
diff --git a/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java b/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
index bb532dd..9cb785c 100644
--- a/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
@@ -26,6 +26,8 @@ import org.openstreetmap.josm.data.osm.WayData;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import org.openstreetmap.josm.tools.date.DateUtils;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
/**
* Unit tests for class {@link SearchCompiler}.
*/
@@ -35,6 +37,7 @@ public class SearchCompilerTest {
* We need prefs for this. We access preferences when creating OSM primitives.
*/
@Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
public JOSMTestRules test = new JOSMTestRules().preferences();
private static final class SearchContext {
diff --git a/test/unit/org/openstreetmap/josm/data/AutosaveTaskTest.java b/test/unit/org/openstreetmap/josm/data/AutosaveTaskTest.java
index c75d9af..d630a1e 100644
--- a/test/unit/org/openstreetmap/josm/data/AutosaveTaskTest.java
+++ b/test/unit/org/openstreetmap/josm/data/AutosaveTaskTest.java
@@ -7,10 +7,10 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.io.BufferedWriter;
import java.io.File;
-import java.io.FileWriter;
-import java.io.FilenameFilter;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.time.ZoneId;
@@ -142,12 +142,8 @@ public class AutosaveTaskTest {
}
private int countFiles() {
- return task.getAutosaveDir().toFile().list(new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {
- return name.endsWith(".osm");
- }
- }).length;
+ String[] files = task.getAutosaveDir().toFile().list((dir, name) -> name.endsWith(".osm"));
+ return files != null ? files.length : 0;
}
/**
@@ -193,7 +189,8 @@ public class AutosaveTaskTest {
@Test
public void testDiscardUnsavedLayersIgnoresCurrentInstance() throws IOException {
runAutosaveTaskSeveralTimes(1);
- try (FileWriter file = new FileWriter(new File(task.getAutosaveDir().toFile(), "any_other_file.osm"))) {
+ try (BufferedWriter file = Files.newBufferedWriter(
+ new File(task.getAutosaveDir().toFile(), "any_other_file.osm").toPath(), StandardCharsets.UTF_8)) {
file.append("");
}
assertEquals(2, countFiles());
@@ -236,7 +233,8 @@ public class AutosaveTaskTest {
@Test
public void testRecoverLayers() throws Exception {
runAutosaveTaskSeveralTimes(1);
- try (FileWriter file = new FileWriter(new File(task.getAutosaveDir().toFile(), "any_other_file.osm"))) {
+ try (BufferedWriter file = Files.newBufferedWriter(
+ new File(task.getAutosaveDir().toFile(), "any_other_file.osm").toPath(), StandardCharsets.UTF_8)) {
file.append("<?xml version=\"1.0\"?><osm version=\"0.6\"><node id=\"1\" lat=\"1\" lon=\"2\" version=\"1\"/></osm>");
}
diff --git a/test/unit/org/openstreetmap/josm/data/cache/JCSCacheManagerTest.java b/test/unit/org/openstreetmap/josm/data/cache/JCSCacheManagerTest.java
index 9a3d6a6..5c1c075 100644
--- a/test/unit/org/openstreetmap/josm/data/cache/JCSCacheManagerTest.java
+++ b/test/unit/org/openstreetmap/josm/data/cache/JCSCacheManagerTest.java
@@ -44,7 +44,9 @@ public class JCSCacheManagerTest {
// test only when using block cache
File cacheFile = new File("foobar/testUseBigDiskFile_BLOCK_v2.data");
if (!cacheFile.exists()) {
- cacheFile.createNewFile();
+ if (!cacheFile.createNewFile()) {
+ System.err.println("Unable to create " + cacheFile.getAbsolutePath());
+ }
}
try (FileOutputStream fileOutputStream = new FileOutputStream(cacheFile, false)) {
fileOutputStream.getChannel().truncate(0);
diff --git a/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java b/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java
index bdeafb1..55b065d 100644
--- a/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java
+++ b/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java
@@ -7,6 +7,8 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Collection;
import org.junit.Ignore;
import org.junit.Rule;
@@ -37,6 +39,8 @@ public class WMTSTileSourceTest {
private ImageryInfo testLotsOfLayers = getImagery(TestUtils.getTestDataRoot() + "wmts/getCapabilities-lots-of-layers.xml");
private ImageryInfo testDuplicateTags = getImagery(TestUtils.getTestDataRoot() + "wmts/bug12573-wmts-identifier.xml");
private ImageryInfo testMissingStyleIdentifer = getImagery(TestUtils.getTestDataRoot() + "wmts/bug12573-wmts-missing-style-identifier.xml");
+ private ImageryInfo testMultipleTileMatrixForLayer = getImagery(TestUtils.getTestDataRoot() +
+ "wmts/bug13975-multiple-tile-matrices-for-one-layer-projection.xml");
/**
* Setup test.
@@ -262,6 +266,22 @@ public class WMTSTileSourceTest {
testSource.initProjection(Main.getProjection());
}
+ @Test
+ public void testForMultipleTileMatricesForOneLayerProjection() throws Exception {
+ Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
+ ImageryInfo copy = new ImageryInfo(testMultipleTileMatrixForLayer);
+ Collection<DefaultLayer> defaultLayers = new ArrayList<>(1);
+ defaultLayers.add(new WMTSDefaultLayer("Mashhad_BaseMap_1", "default028mm"));
+ copy.setDefaultLayers(defaultLayers);
+ WMTSTileSource testSource = new WMTSTileSource(copy);
+ testSource.initProjection(Main.getProjection());
+ assertEquals(
+ "http://188.253.0.155:6080/arcgis/rest/services/Mashhad_BaseMap_1/MapServer/WMTS/tile/1.0.0/Mashhad_BaseMap_1"
+ + "/default/default028mm/1/3/2",
+ testSource.getTileUrl(1, 2, 3)
+ );
+ }
+
private void verifyTile(LatLon expected, WMTSTileSource source, int x, int y, int z) {
LatLon ll = new LatLon(source.tileXYToLatLon(x, y, z));
assertEquals("Latitude", expected.lat(), ll.lat(), 1e-05);
@@ -276,7 +296,6 @@ public class WMTSTileSourceTest {
TemplatedTMSTileSource verifier = new TemplatedTMSTileSource(testImageryTMS);
LatLon result = new LatLon(testSource.tileXYToLatLon(x, y, z));
LatLon expected = new LatLon(verifier.tileXYToLatLon(x, y, z + zoomOffset));
- //System.out.println(z + "/" + x + "/" + y + " - result: " + result.toDisplayString() + " osmMercator: " + expected.toDisplayString());
assertEquals("Longitude", LatLon.normalizeLon(expected.lon() - result.lon()), 0.0, 1e-04);
assertEquals("Latitude", expected.lat(), result.lat(), 1e-04);
}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java b/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java
index fcd9f64..20d7f00 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java
@@ -1,8 +1,12 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import org.junit.Rule;
import org.junit.Test;
+import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -30,4 +34,37 @@ public class BBoxTest {
.suppress(Warning.NONFINAL_FIELDS)
.verify();
}
+
+ /**
+ * Test LatLon constructor which might result in invalid bbox
+ */
+ @Test
+ public void testLatLonConstructor() {
+ LatLon latLon1 = new LatLon(10, 20);
+ LatLon latLon2 = new LatLon(20, 10);
+ BBox b1 = new BBox(latLon1, latLon2);
+ BBox b2 = new BBox(latLon2, latLon1);
+ assertTrue(b1.bounds(latLon1));
+ assertTrue(b2.bounds(latLon1));
+ assertTrue(b1.bounds(latLon2));
+ assertTrue(b2.bounds(latLon2));
+ assertTrue(b2.bounds(b1));
+ assertTrue(b1.bounds(b2));
+
+ // outside of world latlon values
+ LatLon outOfWorld = new LatLon(-190, 340);
+ BBox b3 = new BBox(outOfWorld, latLon1);
+ BBox b4 = new BBox(latLon1, outOfWorld);
+ BBox b5 = new BBox(outOfWorld, outOfWorld);
+
+ assertTrue(b3.isValid());
+ assertTrue(b4.isValid());
+ assertTrue(b3.bounds(latLon1));
+ assertTrue(b4.bounds(latLon1));
+ assertTrue(b5.isValid());
+ assertFalse(b3.isInWorld());
+ assertFalse(b4.isInWorld());
+ assertFalse(b5.isInWorld());
+ }
+
}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java b/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java
index 5fd188b..74c6dd9 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java
@@ -30,6 +30,7 @@ public class ChangesetTest {
* Unit test of method {@link Changeset#setKeys}.
*/
@Test
+ @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF_ALL_TARGETS_DANGEROUS")
public void testSetKeys() {
final Changeset cs = new Changeset();
// Cannot add null map => IllegalArgumentException
diff --git a/test/unit/org/openstreetmap/josm/data/osm/NodeDataTest.java b/test/unit/org/openstreetmap/josm/data/osm/NodeDataTest.java
index ed85328..599887f 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/NodeDataTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/NodeDataTest.java
@@ -14,8 +14,11 @@ import org.junit.Assert;
import org.junit.Test;
import org.openstreetmap.josm.data.coor.LatLon;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
public class NodeDataTest {
+ @SuppressFBWarnings(value = "OBJECT_DESERIALIZATION")
private static NodeData serializeUnserialize(NodeData data) throws IOException, ClassNotFoundException {
try (ByteArrayOutputStream bytes = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream(bytes)) {
diff --git a/test/unit/org/openstreetmap/josm/data/osm/NodeTest.java b/test/unit/org/openstreetmap/josm/data/osm/NodeTest.java
index 7c4ce2f..4c2d8b0 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/NodeTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/NodeTest.java
@@ -1,9 +1,11 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import org.junit.Rule;
import org.junit.Test;
@@ -42,4 +44,63 @@ public class NodeTest {
assertNull(n.getCoor());
assertFalse(n.isOutsideDownloadArea());
}
+
+ /**
+ * Test BBox calculation with Node
+ */
+ @Test
+ public void testBBox() {
+ DataSet ds = new DataSet();
+ Node n1 = new Node(1);
+ Node n2 = new Node(2);
+ Node n3 = new Node(3);
+ Node n4 = new Node(4);
+ n1.setIncomplete(true);
+ n2.setCoor(new LatLon(10, 10));
+ n3.setCoor(new LatLon(20, 20));
+ n4.setCoor(new LatLon(90, 180));
+ ds.addPrimitive(n1);
+ ds.addPrimitive(n2);
+ ds.addPrimitive(n3);
+ ds.addPrimitive(n4);
+
+ assertFalse(n1.getBBox().isValid());
+ assertTrue(n2.getBBox().isValid());
+ assertTrue(n3.getBBox().isValid());
+ assertTrue(n4.getBBox().isValid());
+ BBox box1 = n1.getBBox();
+ box1.add(n2.getCoor());
+ assertTrue(box1.isValid());
+ BBox box2 = n2.getBBox();
+ box2.add(n1.getCoor());
+ assertTrue(box2.isValid());
+ assertEquals(box1, box2);
+ box1.add(n3.getCoor());
+ assertTrue(box1.isValid());
+ assertEquals(box1.getCenter(), new LatLon(15, 15));
+ }
+
+ /**
+ * Test that {@link Node#cloneFrom} throws IAE for invalid arguments
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testCloneFromIAE() {
+ new Node().cloneFrom(new Way());
+ }
+
+ /**
+ * Test that {@link Node#mergeFrom} throws IAE for invalid arguments
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testMergeFromIAE() {
+ new Node().mergeFrom(new Way());
+ }
+
+ /**
+ * Test that {@link Node#load} throws IAE for invalid arguments
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testLoadIAE() {
+ new Node().load(new WayData());
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java b/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java
index 5b9d2a3..8455381 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java
@@ -3,11 +3,13 @@ package org.openstreetmap.josm.data.osm;
import java.io.FileInputStream;
import java.io.InputStream;
+import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import java.util.Random;
import org.fest.reflect.core.Reflection;
import org.fest.reflect.reference.TypeRef;
@@ -174,5 +176,78 @@ public class QuadBucketsTest {
Assert.assertEquals(count, qbWays.size());
}
Assert.assertEquals(0, qbWays.size());
+
+ }
+
+ /**
+ * Add more data so that quad buckets tree has a few leaves
+ */
+ @Test
+ public void testSplitsWithIncompleteData() {
+ DataSet ds = new DataSet();
+ long nodeId = 1;
+ long wayId = 1;
+ final int NUM_COMPLETE_WAYS = 300;
+ final int NUM_INCOMPLETE_WAYS = 10;
+ final int NUM_NODES_PER_WAY = 20;
+ final int NUM_INCOMPLETE_NODES = 10;
+
+ // force splits in quad buckets
+ Random random = new SecureRandom();
+ for (int i = 0; i < NUM_COMPLETE_WAYS; i++) {
+ Way w = new Way(wayId++);
+ List<Node> nodes = new ArrayList<>();
+ double center = random.nextDouble() * 10;
+ for (int j = 0; j < NUM_NODES_PER_WAY; j++) {
+ Node n = new Node(nodeId++);
+ double lat = random.nextDouble() * 0.001;
+ double lon = random.nextDouble() * 0.001;
+ n.setCoor(new LatLon(center + lat, center + lon));
+ nodes.add(n);
+ ds.addPrimitive(n);
+ }
+ w.setNodes(nodes);
+ ds.addPrimitive(w);
+ }
+ Assert.assertEquals(NUM_COMPLETE_WAYS, ds.getWays().size());
+ Assert.assertEquals(NUM_COMPLETE_WAYS * NUM_NODES_PER_WAY, ds.getNodes().size());
+
+ // add some incomplete nodes
+ for (int i = 0; i < NUM_INCOMPLETE_NODES; i++) {
+ Node n = new Node(nodeId++);
+ n.setIncomplete(true);
+ ds.addPrimitive(n);
+ }
+ Assert.assertEquals(NUM_COMPLETE_WAYS * NUM_NODES_PER_WAY + NUM_INCOMPLETE_NODES, ds.getNodes().size());
+ // add some incomplete ways
+ List<Way> incompleteWays = new ArrayList<>();
+ for (int i = 0; i < NUM_INCOMPLETE_WAYS; i++) {
+ Way w = new Way(wayId++);
+ incompleteWays.add(w);
+ w.setIncomplete(true);
+ ds.addPrimitive(w);
+ }
+ Assert.assertEquals(NUM_COMPLETE_WAYS + NUM_INCOMPLETE_WAYS, ds.getWays().size());
+
+ BBox planet = new BBox(-180, -90, 180, 90);
+ // incomplete ways should not be found with search
+ Assert.assertEquals(NUM_COMPLETE_WAYS, ds.searchWays(planet).size());
+ // incomplete ways are only retrieved via iterator or object reference
+ for (Way w : incompleteWays) {
+ Assert.assertTrue(ds.getWays().contains(w));
+ }
+
+ QuadBuckets<Way> qb = new QuadBuckets<>();
+ qb.addAll(ds.getWays());
+ int count = qb.size();
+ Assert.assertEquals(count, ds.getWays().size());
+ Iterator<Way> iter = qb.iterator();
+ while (iter.hasNext()) {
+ iter.next();
+ iter.remove();
+ count--;
+ Assert.assertEquals(count, qb.size());
+ }
+ Assert.assertEquals(0, qb.size());
}
}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java b/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java
index 40f253a..72f90fa 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java
@@ -75,6 +75,15 @@ public class RelationTest {
w1.addNode(n3);
Assert.assertEquals(w1.getBBox(), r1.getBBox());
Assert.assertEquals(w1.getBBox(), r2.getBBox());
+
+ // create incomplete node and add it to the relation, this must not change the bbox
+ BBox oldBBox = r2.getBBox();
+ Node n4 = new Node();
+ n4.setIncomplete(true);
+ ds.addPrimitive(n4);
+ r2.addMember(new RelationMember("", n4));
+
+ Assert.assertEquals(oldBBox, r2.getBBox());
}
@Test
@@ -129,4 +138,20 @@ public class RelationTest {
assertFalse(r.isMultipolygon());
assertEquals(OsmPrimitiveType.RELATION, r.getDisplayType());
}
+
+ /**
+ * Test that {@link Relation#cloneFrom} throws IAE for invalid arguments
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testCloneFromIAE() {
+ new Relation().cloneFrom(new Node());
+ }
+
+ /**
+ * Test that {@link Relation#load} throws IAE for invalid arguments
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testLoadIAE() {
+ new Relation().load(new NodeData());
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java b/test/unit/org/openstreetmap/josm/data/osm/StorageTest.java
similarity index 60%
copy from test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java
copy to test/unit/org/openstreetmap/josm/data/osm/StorageTest.java
index fcd9f64..c5deef1 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/StorageTest.java
@@ -10,9 +10,9 @@ import nl.jqno.equalsverifier.EqualsVerifier;
import nl.jqno.equalsverifier.Warning;
/**
- * Unit tests for class {@link BBox}.
+ * Unit tests for class {@link Storage}.
*/
-public class BBoxTest {
+public class StorageTest {
/**
* Setup test.
@@ -22,12 +22,14 @@ public class BBoxTest {
public JOSMTestRules test = new JOSMTestRules();
/**
- * Unit test of methods {@link BBox#equals} and {@link BBox#hashCode}.
+ * Unit test of methods {@link Storage#equals} and {@link Storage#hashCode}.
*/
@Test
public void testEqualsContract() {
- EqualsVerifier.forClass(BBox.class).usingGetClass()
+ EqualsVerifier.forClass(Storage.class).usingGetClass()
.suppress(Warning.NONFINAL_FIELDS)
+ .withIgnoredFields("arrayCopyNecessary", "hash", "mask", "modCount", "safeIterator", "size")
+ .withPrefabValues(Hash.class, Storage.<Integer>defaultHash(), Storage.<Boolean>defaultHash())
.verify();
}
}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/WayDataTest.java b/test/unit/org/openstreetmap/josm/data/osm/WayDataTest.java
index 57b6076..c5fe5da 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/WayDataTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/WayDataTest.java
@@ -10,8 +10,12 @@ import java.util.Arrays;
import org.junit.Assert;
import org.junit.Test;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
public class WayDataTest {
+
@Test
+ @SuppressFBWarnings(value = "OBJECT_DESERIALIZATION")
public void testSerializationForDragAndDrop() throws Exception {
final WayData data = new WayData();
data.setNodes(Arrays.asList(1415L, 9265L, 3589L, 7932L, 3846L));
diff --git a/test/unit/org/openstreetmap/josm/data/osm/WayTest.java b/test/unit/org/openstreetmap/josm/data/osm/WayTest.java
new file mode 100644
index 0000000..e6c63c5
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/WayTest.java
@@ -0,0 +1,73 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.coor.LatLon;
+
+/**
+ * Unit tests of the {@code Way} class.
+ * @since 11270
+ */
+public class WayTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ /**
+ * Test BBox calculation with Way
+ */
+ @Test
+ public void testBBox() {
+ DataSet ds = new DataSet();
+ Node n1 = new Node(1);
+ Node n2 = new Node(2);
+ Node n3 = new Node(3);
+ Node n4 = new Node(4);
+ n1.setIncomplete(true);
+ n2.setCoor(new LatLon(10, 10));
+ n3.setCoor(new LatLon(20, 20));
+ n4.setCoor(new LatLon(90, 180));
+ ds.addPrimitive(n1);
+ ds.addPrimitive(n2);
+ ds.addPrimitive(n3);
+ ds.addPrimitive(n4);
+ Way way = new Way(1);
+ assertFalse(way.getBBox().isValid());
+ way.setNodes(Arrays.asList(n1));
+ assertFalse(way.getBBox().isValid());
+ way.setNodes(Arrays.asList(n2));
+ assertTrue(way.getBBox().isValid());
+ way.setNodes(Arrays.asList(n1, n2));
+ assertTrue(way.getBBox().isValid());
+ assertEquals(way.getBBox(), new BBox(10, 10));
+ }
+
+ /**
+ * Test that {@link Way#cloneFrom} throws IAE for invalid arguments
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testCloneFromIAE() {
+ new Way().cloneFrom(new Node());
+ }
+
+ /**
+ * Test that {@link Way#load} throws IAE for invalid arguments
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testLoadIAE() {
+ new Way().load(new NodeData());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java b/test/unit/org/openstreetmap/josm/data/preferences/ListListSettingTest.java
similarity index 51%
copy from test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java
copy to test/unit/org/openstreetmap/josm/data/preferences/ListListSettingTest.java
index fcd9f64..891ff77 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java
+++ b/test/unit/org/openstreetmap/josm/data/preferences/ListListSettingTest.java
@@ -1,5 +1,5 @@
// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.osm;
+package org.openstreetmap.josm.data.preferences;
import org.junit.Rule;
import org.junit.Test;
@@ -7,27 +7,25 @@ import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
/**
- * Unit tests for class {@link BBox}.
+ * Test {@link ListListSetting}.
*/
-public class BBoxTest {
-
+public class ListListSettingTest {
/**
- * Setup test.
+ * This is a preference test
*/
@Rule
@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
- public JOSMTestRules test = new JOSMTestRules();
+ public JOSMTestRules test = new JOSMTestRules().preferences();
/**
- * Unit test of methods {@link BBox#equals} and {@link BBox#hashCode}.
+ * Unit test of methods {@link ListListSetting#equals} and {@link ListListSetting#hashCode}.
*/
@Test
public void testEqualsContract() {
- EqualsVerifier.forClass(BBox.class).usingGetClass()
- .suppress(Warning.NONFINAL_FIELDS)
+ EqualsVerifier.forClass(ListListSetting.class).usingGetClass()
+ .withIgnoredFields("isNew", "time")
.verify();
}
}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java b/test/unit/org/openstreetmap/josm/data/preferences/ListSettingTest.java
similarity index 52%
copy from test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java
copy to test/unit/org/openstreetmap/josm/data/preferences/ListSettingTest.java
index fcd9f64..ff7c9da 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java
+++ b/test/unit/org/openstreetmap/josm/data/preferences/ListSettingTest.java
@@ -1,5 +1,5 @@
// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.osm;
+package org.openstreetmap.josm.data.preferences;
import org.junit.Rule;
import org.junit.Test;
@@ -7,27 +7,25 @@ import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
/**
- * Unit tests for class {@link BBox}.
+ * Test {@link ListSetting}.
*/
-public class BBoxTest {
-
+public class ListSettingTest {
/**
- * Setup test.
+ * This is a preference test
*/
@Rule
@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
- public JOSMTestRules test = new JOSMTestRules();
+ public JOSMTestRules test = new JOSMTestRules().preferences();
/**
- * Unit test of methods {@link BBox#equals} and {@link BBox#hashCode}.
+ * Unit test of methods {@link ListSetting#equals} and {@link ListSetting#hashCode}.
*/
@Test
public void testEqualsContract() {
- EqualsVerifier.forClass(BBox.class).usingGetClass()
- .suppress(Warning.NONFINAL_FIELDS)
+ EqualsVerifier.forClass(ListSetting.class).usingGetClass()
+ .withIgnoredFields("isNew", "time")
.verify();
}
}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java b/test/unit/org/openstreetmap/josm/data/preferences/MapListSettingTest.java
similarity index 51%
copy from test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java
copy to test/unit/org/openstreetmap/josm/data/preferences/MapListSettingTest.java
index fcd9f64..1180d36 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java
+++ b/test/unit/org/openstreetmap/josm/data/preferences/MapListSettingTest.java
@@ -1,5 +1,5 @@
// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.osm;
+package org.openstreetmap.josm.data.preferences;
import org.junit.Rule;
import org.junit.Test;
@@ -7,27 +7,25 @@ import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
/**
- * Unit tests for class {@link BBox}.
+ * Test {@link MapListSetting}.
*/
-public class BBoxTest {
-
+public class MapListSettingTest {
/**
- * Setup test.
+ * This is a preference test
*/
@Rule
@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
- public JOSMTestRules test = new JOSMTestRules();
+ public JOSMTestRules test = new JOSMTestRules().preferences();
/**
- * Unit test of methods {@link BBox#equals} and {@link BBox#hashCode}.
+ * Unit test of methods {@link MapListSetting#equals} and {@link MapListSetting#hashCode}.
*/
@Test
public void testEqualsContract() {
- EqualsVerifier.forClass(BBox.class).usingGetClass()
- .suppress(Warning.NONFINAL_FIELDS)
+ EqualsVerifier.forClass(MapListSetting.class).usingGetClass()
+ .withIgnoredFields("isNew", "time")
.verify();
}
}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java b/test/unit/org/openstreetmap/josm/data/preferences/StringSettingTest.java
similarity index 52%
copy from test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java
copy to test/unit/org/openstreetmap/josm/data/preferences/StringSettingTest.java
index fcd9f64..8aa16d3 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java
+++ b/test/unit/org/openstreetmap/josm/data/preferences/StringSettingTest.java
@@ -1,5 +1,5 @@
// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.osm;
+package org.openstreetmap.josm.data.preferences;
import org.junit.Rule;
import org.junit.Test;
@@ -7,27 +7,25 @@ import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
/**
- * Unit tests for class {@link BBox}.
+ * Test {@link StringSetting}.
*/
-public class BBoxTest {
-
+public class StringSettingTest {
/**
- * Setup test.
+ * This is a preference test
*/
@Rule
@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
- public JOSMTestRules test = new JOSMTestRules();
+ public JOSMTestRules test = new JOSMTestRules().preferences();
/**
- * Unit test of methods {@link BBox#equals} and {@link BBox#hashCode}.
+ * Unit test of methods {@link StringSetting#equals} and {@link StringSetting#hashCode}.
*/
@Test
public void testEqualsContract() {
- EqualsVerifier.forClass(BBox.class).usingGetClass()
- .suppress(Warning.NONFINAL_FIELDS)
+ EqualsVerifier.forClass(StringSetting.class).usingGetClass()
+ .withIgnoredFields("isNew", "time")
.verify();
}
}
diff --git a/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java b/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java
index 43b20cd..f7cff7a 100644
--- a/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java
+++ b/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java
@@ -1,6 +1,7 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.projection;
+import java.security.SecureRandom;
import java.util.Random;
import org.junit.Assert;
@@ -19,7 +20,7 @@ public class EllipsoidTest {
*/
@Test
public void testLatLon2Cart2LatLon() {
- Random r = new Random(System.currentTimeMillis());
+ Random r = new SecureRandom();
double maxErrLat = 0, maxErrLon = 0;
Ellipsoid ellips = Ellipsoid.WGS84;
for (int num = 0; num < 1000; ++num) {
diff --git a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java
index 0e9fd2d..58f1b80 100644
--- a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java
+++ b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java
@@ -5,7 +5,6 @@ import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -13,6 +12,7 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
+import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -38,6 +38,8 @@ import org.openstreetmap.josm.gui.preferences.projection.CodeProjectionChoice;
import org.openstreetmap.josm.tools.Pair;
import org.openstreetmap.josm.tools.Utils;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
/**
* Test projections using reference data from external program.
*
@@ -71,9 +73,14 @@ public class ProjectionRefTest {
}
}
- static Random rand = new Random();
+ static Random rand = new SecureRandom();
- public static void main(String[] args) throws FileNotFoundException, IOException {
+ /**
+ * Program entry point.
+ * @param args no argument is expected
+ * @throws IOException in case of I/O error
+ */
+ public static void main(String[] args) throws IOException {
Collection<RefEntry> refs = readData();
refs = updateData(refs);
writeData(refs);
@@ -199,12 +206,12 @@ public class ProjectionRefTest {
}
/**
- * Run external cs2cs command from the PROJ.4 library to convert lat/lon to
- * east/north value.
+ * Run external cs2cs command from the PROJ.4 library to convert lat/lon to east/north value.
* @param def the proj.4 projection definition string
* @param ll the LatLon
* @return projected EastNorth or null in case of error
*/
+ @SuppressFBWarnings(value = "COMMAND_INJECTION")
private static EastNorth latlon2eastNorthProj4(String def, LatLon ll) {
List<String> args = new ArrayList<>();
args.add(CS2CS_EXE);
diff --git a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
index df84de2..2a8da91 100644
--- a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
+++ b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
@@ -11,6 +11,7 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
+import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -85,7 +86,7 @@ public class ProjectionRegressionTest {
}
}
- Random rand = new Random();
+ Random rand = new SecureRandom();
try (BufferedWriter out = new BufferedWriter(new OutputStreamWriter(
new FileOutputStream(PROJECTION_DATA_FILE), StandardCharsets.UTF_8))) {
out.write("# Data for test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java\n");
diff --git a/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java b/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java
index 9d5b259..8b184fb 100644
--- a/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java
+++ b/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java
@@ -1,6 +1,7 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.projection;
+import java.security.SecureRandom;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
@@ -17,7 +18,7 @@ import org.openstreetmap.josm.data.coor.LatLon;
*/
public class ProjectionTest {
- private static Random rand = new Random(System.currentTimeMillis());
+ private static Random rand = new SecureRandom();
boolean error;
String text;
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/ConditionalKeysTest.groovy b/test/unit/org/openstreetmap/josm/data/validation/tests/ConditionalKeysTest.groovy
deleted file mode 100644
index 2e9298a..0000000
--- a/test/unit/org/openstreetmap/josm/data/validation/tests/ConditionalKeysTest.groovy
+++ /dev/null
@@ -1,43 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.validation.tests
-
-import org.openstreetmap.josm.JOSMFixture
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
-
-class ConditionalKeysTest extends GroovyTestCase {
-
- ConditionalKeys test = new ConditionalKeys()
-
- @Override
- void setUp() {
- JOSMFixture.createUnitTestFixture().init();
- TaggingPresets.readFromPreferences()
- test.initialize()
- }
-
- void testKeyValid() {
- assert test.isKeyValid("maxspeed:conditional")
- assert test.isKeyValid("motor_vehicle:conditional")
- assert test.isKeyValid("bicycle:conditional")
- assert test.isKeyValid("overtaking:hgv:conditional")
- assert test.isKeyValid("maxspeed:hgv:backward:conditional")
- assert test.isKeyValid("oneway:backward:conditional")
- assert test.isKeyValid("fee:conditional")
- assert !test.isKeyValid("maxspeed:hgv:conditional:backward")
- }
-
- void testValueValid() {
- assert test.isValueValid("maxspeed:conditional", "120 @ (06:00-19:00)")
- assert !test.isValueValid("maxspeed:conditional", " @ (06:00-19:00)")
- assert !test.isValueValid("maxspeed:conditional", "120 (06:00-19:00)")
- assert !test.isValueValid("maxspeed:conditional", "120 @ ()")
- assert !test.isValueValid("maxspeed:conditional", "120 @ ")
- assert !test.isValueValid("maxspeed:conditional", "120 @ (06:00/19:00)")
- assert test.isValueValid("maxspeed:conditional", "120 @ (06:00-20:00); 100 @ (22:00-06:00)")
- assert test.isValueValid("motor_vehicle:conditional", "delivery @ (Mo-Fr 06:00-11:00,17:00-19:00;Sa 03:30-19:00)")
- assert test.isValueValid("motor_vehicle:conditional", "no @ (10:00-18:00 AND length>5)")
- assert !test.isValueValid("motor_vehicle:conditional", "foo @ (10:00-18:00 AND length>5)")
- assert !test.isValueValid("motor_vehicle:conditional", "no @ (10:00until18:00 AND length>5)")
- assert test.isValueValid("maxspeed:hgv:conditional", "60 @ (weight>7.5)")
- }
-}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/ConditionalKeysTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/ConditionalKeysTest.java
new file mode 100644
index 0000000..45534e0
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/ConditionalKeysTest.java
@@ -0,0 +1,63 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation.tests;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
+
+/**
+ * Unit test of {@link ConditionalKeys}.
+ */
+public class ConditionalKeysTest {
+
+ private final ConditionalKeys test = new ConditionalKeys();
+
+ /**
+ * Setup test
+ * @throws Exception if an error occurs
+ */
+ @Before
+ public void setUp() throws Exception {
+ JOSMFixture.createUnitTestFixture().init();
+ TaggingPresets.readFromPreferences();
+ test.initialize();
+ }
+
+ /**
+ * Unit test of {@link ConditionalKeys#isKeyValid}.
+ */
+ @Test
+ public void testKeyValid() {
+ assertTrue(test.isKeyValid("maxspeed:conditional"));
+ assertTrue(test.isKeyValid("motor_vehicle:conditional"));
+ assertTrue(test.isKeyValid("bicycle:conditional"));
+ assertTrue(test.isKeyValid("overtaking:hgv:conditional"));
+ assertTrue(test.isKeyValid("maxspeed:hgv:backward:conditional"));
+ assertTrue(test.isKeyValid("oneway:backward:conditional"));
+ assertTrue(test.isKeyValid("fee:conditional"));
+ assertFalse(test.isKeyValid("maxspeed:hgv:conditional:backward"));
+ }
+
+ /**
+ * Unit test of {@link ConditionalKeys#isValueValid}.
+ */
+ @Test
+ public void testValueValid() {
+ assertTrue(test.isValueValid("maxspeed:conditional", "120 @ (06:00-19:00)"));
+ assertFalse(test.isValueValid("maxspeed:conditional", " @ (06:00-19:00)"));
+ assertFalse(test.isValueValid("maxspeed:conditional", "120 (06:00-19:00)"));
+ assertFalse(test.isValueValid("maxspeed:conditional", "120 @ ()"));
+ assertFalse(test.isValueValid("maxspeed:conditional", "120 @ "));
+ assertFalse(test.isValueValid("maxspeed:conditional", "120 @ (06:00/19:00)"));
+ assertTrue(test.isValueValid("maxspeed:conditional", "120 @ (06:00-20:00); 100 @ (22:00-06:00)"));
+ assertTrue(test.isValueValid("motor_vehicle:conditional", "delivery @ (Mo-Fr 06:00-11:00,17:00-19:00;Sa 03:30-19:00)"));
+ assertTrue(test.isValueValid("motor_vehicle:conditional", "no @ (10:00-18:00 AND length>5)"));
+ assertFalse(test.isValueValid("motor_vehicle:conditional", "foo @ (10:00-18:00 AND length>5)"));
+ assertFalse(test.isValueValid("motor_vehicle:conditional", "no @ (10:00until18:00 AND length>5)"));
+ assertTrue(test.isValueValid("maxspeed:hgv:conditional", "60 @ (weight>7.5)"));
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/HighwaysTest.groovy b/test/unit/org/openstreetmap/josm/data/validation/tests/HighwaysTest.groovy
deleted file mode 100644
index 71ab7f3..0000000
--- a/test/unit/org/openstreetmap/josm/data/validation/tests/HighwaysTest.groovy
+++ /dev/null
@@ -1,77 +0,0 @@
-// License: GPL. See LICENSE file for details.
-package org.openstreetmap.josm.data.validation.tests
-
-import org.openstreetmap.josm.JOSMFixture
-import org.openstreetmap.josm.data.coor.LatLon
-import org.openstreetmap.josm.data.osm.DataSet
-import org.openstreetmap.josm.data.osm.Node
-import org.openstreetmap.josm.data.osm.Way
-
-class HighwaysTest extends GroovyTestCase {
-
- @Override
- void setUp() {
- JOSMFixture.createUnitTestFixture().init();
- }
-
- public static Way createTestSetting(String highway, String highwayLink) {
- def ds = new DataSet()
-
- def n00 = new Node(LatLon.ZERO)
- def n10 = new Node(new LatLon(1, 0))
- def n20 = new Node(new LatLon(2, 0))
- def n01 = new Node(new LatLon(0, 1))
- def n11 = new Node(new LatLon(1, 1))
- def n21 = new Node(new LatLon(2, 1))
-
- ds.addPrimitive(n00)
- ds.addPrimitive(n10)
- ds.addPrimitive(n20)
- ds.addPrimitive(n01)
- ds.addPrimitive(n11)
- ds.addPrimitive(n21)
-
- def major = new Way()
- major.addNode(n00)
- major.addNode(n10)
- major.addNode(n20)
- major.put("highway", highway)
- def link = new Way()
- link.addNode(n10)
- link.addNode(n11)
- link.put("highway", highwayLink)
- def unclassified = new Way()
- unclassified.addNode(n01)
- unclassified.addNode(n11)
- unclassified.addNode(n21)
- unclassified.put("highway", "unclassified")
-
- ds.addPrimitive(major)
- ds.addPrimitive(link)
- ds.addPrimitive(unclassified)
-
- return link
- }
-
- void testCombinations() {
- assert Highways.isHighwayLinkOkay(createTestSetting("primary", "primary_link"))
- assert Highways.isHighwayLinkOkay(createTestSetting("primary", "primary"))
- assert !Highways.isHighwayLinkOkay(createTestSetting("primary", "secondary_link"))
- assert !Highways.isHighwayLinkOkay(createTestSetting("secondary", "primary_link"))
- assert !Highways.isHighwayLinkOkay(createTestSetting("secondary", "tertiary_link"))
- assert Highways.isHighwayLinkOkay(createTestSetting("residential", "residential"))
- }
-
- void testSourceMaxSpeedUnitedKingdom() {
- def link = createTestSetting("primary", "primary")
- link.put("maxspeed", "60 mph")
- link.put("source:maxspeed", "UK:nsl_single")
- def test = new Highways()
- test.visit(link)
- assert test.errors.size() == 1
- def error = test.errors.get(0)
- assert error.isFixable()
- assert error.getFix().executeCommand()
- assert "GB:nsl_single".equals(link.get("source:maxspeed"))
- }
-}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/HighwaysTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/HighwaysTest.java
new file mode 100644
index 0000000..9e2de1f
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/HighwaysTest.java
@@ -0,0 +1,98 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.validation.TestError;
+
+/**
+ * Unit test of {@link HighwaysTest}.
+ */
+public class HighwaysTest {
+
+ /**
+ * Setup test.
+ */
+ @Before
+ public void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ private static Way createTestSetting(String highway, String highwayLink) {
+ DataSet ds = new DataSet();
+
+ Node n00 = new Node(LatLon.ZERO);
+ Node n10 = new Node(new LatLon(1, 0));
+ Node n20 = new Node(new LatLon(2, 0));
+ Node n01 = new Node(new LatLon(0, 1));
+ Node n11 = new Node(new LatLon(1, 1));
+ Node n21 = new Node(new LatLon(2, 1));
+
+ ds.addPrimitive(n00);
+ ds.addPrimitive(n10);
+ ds.addPrimitive(n20);
+ ds.addPrimitive(n01);
+ ds.addPrimitive(n11);
+ ds.addPrimitive(n21);
+
+ Way major = new Way();
+ major.addNode(n00);
+ major.addNode(n10);
+ major.addNode(n20);
+ major.put("highway", highway);
+ Way link = new Way();
+ link.addNode(n10);
+ link.addNode(n11);
+ link.put("highway", highwayLink);
+ Way unclassified = new Way();
+ unclassified.addNode(n01);
+ unclassified.addNode(n11);
+ unclassified.addNode(n21);
+ unclassified.put("highway", "unclassified");
+
+ ds.addPrimitive(major);
+ ds.addPrimitive(link);
+ ds.addPrimitive(unclassified);
+
+ return link;
+ }
+
+ /**
+ * Unit test of {@link Highways#isHighwayLinkOkay}.
+ */
+ @Test
+ public void testCombinations() {
+ assertTrue(Highways.isHighwayLinkOkay(createTestSetting("primary", "primary_link")));
+ assertTrue(Highways.isHighwayLinkOkay(createTestSetting("primary", "primary")));
+ assertFalse(Highways.isHighwayLinkOkay(createTestSetting("primary", "secondary_link")));
+ assertFalse(Highways.isHighwayLinkOkay(createTestSetting("secondary", "primary_link")));
+ assertFalse(Highways.isHighwayLinkOkay(createTestSetting("secondary", "tertiary_link")));
+ assertTrue(Highways.isHighwayLinkOkay(createTestSetting("residential", "residential")));
+ }
+
+ /**
+ * Test source:maxspeed in United Kingdom.
+ */
+ @Test
+ public void testSourceMaxSpeedUnitedKingdom() {
+ Way link = createTestSetting("primary", "primary");
+ link.put("maxspeed", "60 mph");
+ link.put("source:maxspeed", "UK:nsl_single");
+ Highways test = new Highways();
+ test.visit(link);
+ assertEquals(1, test.getErrors().size());
+ TestError error = test.getErrors().get(0);
+ assertTrue(error.isFixable());
+ assertTrue(error.getFix().executeCommand());
+ assertEquals("GB:nsl_single", link.get("source:maxspeed"));
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.groovy b/test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.groovy
deleted file mode 100644
index e5ce793..0000000
--- a/test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.groovy
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.openstreetmap.josm.data.validation.tests
-
-import org.openstreetmap.josm.JOSMFixture
-import org.openstreetmap.josm.data.osm.OsmUtils
-
-class LanesTest extends GroovyTestCase {
-
- Lanes lanes = new Lanes()
-
- @Override
- void setUp() {
- JOSMFixture.createUnitTestFixture().init()
- lanes.initialize()
- lanes.startTest(null)
- }
-
- void testLanesCount() {
- assert lanes.getLanesCount("") == 0
- assert lanes.getLanesCount("left") == 1
- assert lanes.getLanesCount("left|right") == 2
- assert lanes.getLanesCount("yes|no|yes") == 3
- assert lanes.getLanesCount("yes||") == 3
- }
-
- void test1() {
- lanes.check(OsmUtils.createPrimitive("way turn:lanes=left|right change:lanes=only_left|not_right|yes"))
- assert lanes.errors.get(0).getMessage() == "Number of lane dependent values inconsistent"
- }
-
- void test2() {
- lanes.check(OsmUtils.createPrimitive("way width:lanes:forward=1|2|3 psv:lanes:forward=no|designated"))
- assert lanes.errors.get(0).getMessage() == "Number of lane dependent values inconsistent in forward direction"
- }
-
- void test3() {
- lanes.check(OsmUtils.createPrimitive("way change:lanes:forward=yes|no turn:lanes:backward=left|right|left"))
- assert lanes.errors.isEmpty()
- }
-
- void test4() {
- lanes.check(OsmUtils.createPrimitive("way turn:lanes:forward=left|right change:lanes:forward=yes|no|yes width:backward=1|2|3"))
- assert lanes.errors.get(0).getMessage() == "Number of lane dependent values inconsistent in forward direction"
- }
-
- void test5() {
- lanes.check(OsmUtils.createPrimitive("way lanes:forward=5 turn:lanes:forward=left|right"))
- assert lanes.errors.get(0).getMessage() == "Number of lanes:forward greater than *:lanes:forward"
- }
-
- void test6() {
- lanes.check(OsmUtils.createPrimitive("way lanes:forward=foo|bar turn:lanes:forward=foo+bar"))
- assert lanes.errors.isEmpty()
- }
-
- void test7() {
- lanes.check(OsmUtils.createPrimitive("way lanes=3 lanes:forward=3 lanes:backward=7"))
- assert lanes.errors.get(0).getMessage() == "Number of lanes:forward+lanes:backward greater than lanes"
- }
-
- void test8() {
- lanes.check(OsmUtils.createPrimitive("way destination:country:lanes=X|Y;Z|none destination:ref:lanes=xyz|| destination:sign:lanes=none|airport|none"))
- assert lanes.errors.isEmpty()
- }
-
- void test9() {
- lanes.check(OsmUtils.createPrimitive("way highway=secondary lanes=2 source:lanes=survey"))
- assert lanes.errors.isEmpty()
- }
-}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.java
new file mode 100644
index 0000000..7e419bc
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/LanesTest.java
@@ -0,0 +1,96 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.OsmUtils;
+
+/**
+ * Unit tests of {@link Lanes}.
+ */
+public class LanesTest {
+
+ private final Lanes lanes = new Lanes();
+
+ /**
+ * Setup test.
+ * @throws Exception if an error occurs
+ */
+ @Before
+ public void setUp() throws Exception {
+ JOSMFixture.createUnitTestFixture().init();
+ lanes.initialize();
+ lanes.startTest(null);
+ }
+
+ /**
+ * Unit test of {@link Lanes#getLanesCount}.
+ */
+ @Test
+ public void testLanesCount() {
+ assertEquals(0, Lanes.getLanesCount(""));
+ assertEquals(1, Lanes.getLanesCount("left"));
+ assertEquals(2, Lanes.getLanesCount("left|right"));
+ assertEquals(3, Lanes.getLanesCount("yes|no|yes"));
+ assertEquals(3, Lanes.getLanesCount("yes||"));
+ }
+
+ @Test
+ public void test1() {
+ lanes.check(OsmUtils.createPrimitive("way turn:lanes=left|right change:lanes=only_left|not_right|yes"));
+ assertEquals("Number of lane dependent values inconsistent", lanes.getErrors().get(0).getMessage());
+ }
+
+ @Test
+ public void test2() {
+ lanes.check(OsmUtils.createPrimitive("way width:lanes:forward=1|2|3 psv:lanes:forward=no|designated"));
+ assertEquals("Number of lane dependent values inconsistent in forward direction", lanes.getErrors().get(0).getMessage());
+ }
+
+ @Test
+ public void test3() {
+ lanes.check(OsmUtils.createPrimitive("way change:lanes:forward=yes|no turn:lanes:backward=left|right|left"));
+ assertTrue(lanes.getErrors().isEmpty());
+ }
+
+ @Test
+ public void test4() {
+ lanes.check(OsmUtils.createPrimitive("way turn:lanes:forward=left|right change:lanes:forward=yes|no|yes width:backward=1|2|3"));
+ assertEquals("Number of lane dependent values inconsistent in forward direction", lanes.getErrors().get(0).getMessage());
+ }
+
+ @Test
+ public void test5() {
+ lanes.check(OsmUtils.createPrimitive("way lanes:forward=5 turn:lanes:forward=left|right"));
+ assertEquals("Number of lanes:forward greater than *:lanes:forward", lanes.getErrors().get(0).getMessage());
+ }
+
+ @Test
+ public void test6() {
+ lanes.check(OsmUtils.createPrimitive("way lanes:forward=foo|bar turn:lanes:forward=foo+bar"));
+ assertTrue(lanes.getErrors().isEmpty());
+ }
+
+ @Test
+ public void test7() {
+ lanes.check(OsmUtils.createPrimitive("way lanes=3 lanes:forward=3 lanes:backward=7"));
+ assertEquals("Number of lanes:forward+lanes:backward greater than lanes", lanes.getErrors().get(0).getMessage());
+ }
+
+ @Test
+ public void test8() {
+ lanes.check(OsmUtils.createPrimitive(
+ "way destination:country:lanes=X|Y;Z|none destination:ref:lanes=xyz|| destination:sign:lanes=none|airport|none"));
+ assertTrue(lanes.getErrors().isEmpty());
+ }
+
+ @Test
+ public void test9() {
+ lanes.check(OsmUtils.createPrimitive("way highway=secondary lanes=2 source:lanes=survey"));
+ assertTrue(lanes.getErrors().isEmpty());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java
index 0a7d91a..3fb4521 100644
--- a/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java
@@ -48,9 +48,10 @@ public class MultipolygonTestTest {
/**
* Non-regression test for bug #10469.
+ * @throws Exception if an exception occurs
*/
@Test
- public void testTicket10469() {
+ public void testTicket10469() throws Exception {
MULTIPOLYGON_TEST.initialize();
MULTIPOLYGON_TEST.startTest(null);
@@ -83,6 +84,6 @@ public class MultipolygonTestTest {
public void testMultipolygonFile() throws Exception {
ValidatorTestUtils.testSampleFile("data_nodist/multipolygon.osm",
ds -> ds.getRelations().stream().filter(Relation::isMultipolygon).collect(Collectors.toList()),
- name -> name.startsWith("06") || name.startsWith("07"), MULTIPOLYGON_TEST, RELATION_TEST);
+ name -> name.startsWith("06") || name.startsWith("07") || name.startsWith("08"), MULTIPOLYGON_TEST, RELATION_TEST);
}
}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.groovy b/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.groovy
deleted file mode 100644
index 61e4902..0000000
--- a/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.groovy
+++ /dev/null
@@ -1,142 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.validation.tests
-
-import static org.openstreetmap.josm.data.osm.OsmUtils.createPrimitive
-
-import org.openstreetmap.josm.JOSMFixture
-import org.openstreetmap.josm.data.osm.Relation
-import org.openstreetmap.josm.data.osm.RelationMember
-import org.openstreetmap.josm.data.osm.Way
-import org.openstreetmap.josm.data.validation.TestError
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
-
-class RelationCheckerTest extends GroovyTestCase {
-
- @Override
- void setUp() {
- JOSMFixture.createUnitTestFixture().init();
- getRelationChecker()
- }
-
- static def RelationChecker getRelationChecker() {
- def checker = new RelationChecker()
- TaggingPresets.readFromPreferences()
- checker.initialize()
- return checker
- }
-
- static def List<TestError> testRelation(Relation r) {
- def checker = getRelationChecker()
- checker.visit(r)
- return checker.getErrors()
- }
-
- static def Relation createRelation(String tags) {
- return (Relation) createPrimitive("relation "+ tags)
- }
-
- void testUnknownType() {
- def errors = testRelation(createRelation("type=foobar"))
- assert errors.size() >= 1
- assert errors.get(0).getMessage() == "Relation type is unknown"
- }
-
- void testEmpty() {
- def errors = testRelation(createRelation("type=multipolygon"))
- assert errors.size() == 1
- assert errors.get(0).getMessage() == "Relation is empty"
- }
-
- void testNormal() {
- def r = createRelation("type=multipolygon")
- r.addMember(new RelationMember("outer", new Way()))
- r.addMember(new RelationMember("inner", new Way()))
- assert testRelation(r).isEmpty()
- }
-
- void testOuter2() {
- def r = createRelation("type=multipolygon")
- r.addMember(new RelationMember("outer", new Way()))
- r.addMember(new RelationMember("outer2", new Way()))
-
- def errors = testRelation(r)
- assert errors.size() == 1
- assert errors.get(0).getDescription() == "Role outer2 unknown in templates outer/inner"
- }
-
- void testRestrictionViaMissing() {
- def r = createRelation("type=restriction")
- r.addMember(new RelationMember("from", new Way()))
- r.addMember(new RelationMember("to", new Way()))
-
- def errors = testRelation(r)
- assert errors.size() == 1
- assert errors.get(0).getDescription() == "Role via missing"
- }
-
- void testRestrictionViaRelation() {
- def r = createRelation("type=restriction")
- r.addMember(new RelationMember("from", new Way()))
- r.addMember(new RelationMember("to", new Way()))
- r.addMember(new RelationMember("via", new Relation()))
-
- def errors = testRelation(r)
- assert errors.size() == 1
- assert errors.get(0).getDescription() == "Role member type relation does not match accepted list of node/way in template Turn Restriction"
- }
-
- void testRestrictionTwoFrom() {
- def r = createRelation("type=restriction")
- r.addMember(new RelationMember("from", new Way()))
- r.addMember(new RelationMember("from", new Way()))
- r.addMember(new RelationMember("to", new Way()))
- r.addMember(new RelationMember("via", new Way()))
-
- def errors = testRelation(r)
- assert errors.size() == 1
- assert errors.get(0).getDescription() == "Number of from roles too high (2)"
- }
-
- void testRestrictionEmpty() {
- def r = createRelation("type=restriction")
- r.addMember(new RelationMember("from", new Way()))
- r.addMember(new RelationMember("to", new Way()))
- r.addMember(new RelationMember("via", new Way()))
- r.addMember(new RelationMember("", new Way()))
-
- def errors = testRelation(r)
- assert errors.size() == 1
- assert errors.get(0).getDescription().startsWith("Empty role type found when expecting one of")
- }
-
- void testPowerMemberExpression() {
- def r = createRelation("type=route route=power")
- r.addMember(new RelationMember("", new Way()))
-
- def errors = testRelation(r)
- assert errors.size() == 1
- assert errors.get(0).getDescription() == "Role member does not match expression power in template Power Route"
- }
-
- void testRouteMemberExpression() {
- def r = createRelation("type=route route=tram public_transport:version=2")
- r.addMember(new RelationMember("", createPrimitive("way railway=tram")))
- r.addMember(new RelationMember("stop", createPrimitive("node public_transport=stop_position tram=yes")))
- r.addMember(new RelationMember("platform", createPrimitive("node public_transport=platform tram=yes")))
- assert testRelation(r).size() == 0
-
- r.addMember(new RelationMember("", createPrimitive("way no-rail-way=yes")))
- assert testRelation(r).size() == 1
- assert testRelation(r).get(0).getDescription() == "Role member does not match expression railway in template Public Transport Route (Rail)"
-
- r.removeMember(3)
- r.addMember(new RelationMember("stop", createPrimitive("way no-rail-way=yes")))
- assert testRelation(r).size() == 1
- assert testRelation(r).get(0).getDescription() == "Role member type way does not match accepted list of node in template Public Transport Route (Rail)"
-
- r.removeMember(3)
- r.addMember(new RelationMember("stop", createPrimitive("node public_transport=stop_position bus=yes")))
- assert testRelation(r).size() == 1
- assert testRelation(r).get(0).getDescription() == "Role member does not match expression public_transport=stop_position && (train=yes || subway=yes || monorail=yes || tram=yes || light_rail=yes) in template Public Transport Route (Rail)"
- }
-}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.java
new file mode 100644
index 0000000..48c894c
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.java
@@ -0,0 +1,166 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.openstreetmap.josm.data.osm.OsmUtils.createPrimitive;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
+
+public class RelationCheckerTest {
+
+ /**
+ * Setup test.
+ */
+ @Before
+ public void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ getRelationChecker();
+ }
+
+ private static RelationChecker getRelationChecker() {
+ RelationChecker checker = new RelationChecker();
+ TaggingPresets.readFromPreferences();
+ checker.initialize();
+ return checker;
+ }
+
+ private static List<TestError> testRelation(Relation r) {
+ RelationChecker checker = getRelationChecker();
+ checker.visit(r);
+ return checker.getErrors();
+ }
+
+ private static Relation createRelation(String tags) {
+ return (Relation) createPrimitive("relation "+ tags);
+ }
+
+ @Test
+ public void testUnknownType() {
+ List<TestError> errors = testRelation(createRelation("type=foobar"));
+ assertTrue(errors.size() >= 1);
+ assertEquals("Relation type is unknown", errors.get(0).getMessage());
+ }
+
+ @Test
+ public void testEmpty() {
+ List<TestError> errors = testRelation(createRelation("type=multipolygon"));
+ assertEquals(1, errors.size());
+ assertEquals("Relation is empty", errors.get(0).getMessage());
+ }
+
+ @Test
+ public void testNormal() {
+ Relation r = createRelation("type=multipolygon");
+ r.addMember(new RelationMember("outer", new Way()));
+ r.addMember(new RelationMember("inner", new Way()));
+ assertTrue(testRelation(r).isEmpty());
+ }
+
+ @Test
+ public void testOuter2() {
+ Relation r = createRelation("type=multipolygon");
+ r.addMember(new RelationMember("outer", new Way()));
+ r.addMember(new RelationMember("outer2", new Way()));
+
+ List<TestError> errors = testRelation(r);
+ assertEquals(1, errors.size());
+ assertEquals("Role outer2 unknown in templates outer/inner", errors.get(0).getDescription());
+ }
+
+ @Test
+ public void testRestrictionViaMissing() {
+ Relation r = createRelation("type=restriction");
+ r.addMember(new RelationMember("from", new Way()));
+ r.addMember(new RelationMember("to", new Way()));
+
+ List<TestError> errors = testRelation(r);
+ assertEquals(1, errors.size());
+ assertEquals("Role via missing", errors.get(0).getDescription());
+ }
+
+ @Test
+ public void testRestrictionViaRelation() {
+ Relation r = createRelation("type=restriction");
+ r.addMember(new RelationMember("from", new Way()));
+ r.addMember(new RelationMember("to", new Way()));
+ r.addMember(new RelationMember("via", new Relation()));
+
+ List<TestError> errors = testRelation(r);
+ assertEquals(1, errors.size());
+ assertEquals("Role member type relation does not match accepted list of node/way in template Turn Restriction",
+ errors.get(0).getDescription());
+ }
+
+ @Test
+ public void testRestrictionTwoFrom() {
+ Relation r = createRelation("type=restriction");
+ r.addMember(new RelationMember("from", new Way()));
+ r.addMember(new RelationMember("from", new Way()));
+ r.addMember(new RelationMember("to", new Way()));
+ r.addMember(new RelationMember("via", new Way()));
+
+ List<TestError> errors = testRelation(r);
+ assertEquals(1, errors.size());
+ assertEquals("Number of from roles too high (2)", errors.get(0).getDescription());
+ }
+
+ @Test
+ public void testRestrictionEmpty() {
+ Relation r = createRelation("type=restriction");
+ r.addMember(new RelationMember("from", new Way()));
+ r.addMember(new RelationMember("to", new Way()));
+ r.addMember(new RelationMember("via", new Way()));
+ r.addMember(new RelationMember("", new Way()));
+
+ List<TestError> errors = testRelation(r);
+ assertEquals(1, errors.size());
+ assertTrue(errors.get(0).getDescription().startsWith("Empty role type found when expecting one of"));
+ }
+
+ @Test
+ public void testPowerMemberExpression() {
+ Relation r = createRelation("type=route route=power");
+ r.addMember(new RelationMember("", new Way()));
+
+ List<TestError> errors = testRelation(r);
+ assertEquals(1, errors.size());
+ assertEquals("Role member does not match expression power in template Power Route", errors.get(0).getDescription());
+ }
+
+ @Test
+ public void testRouteMemberExpression() {
+ Relation r = createRelation("type=route route=tram public_transport:version=2");
+ r.addMember(new RelationMember("", createPrimitive("way railway=tram")));
+ r.addMember(new RelationMember("stop", createPrimitive("node public_transport=stop_position tram=yes")));
+ r.addMember(new RelationMember("platform", createPrimitive("node public_transport=platform tram=yes")));
+ assertTrue(testRelation(r).isEmpty());
+
+ r.addMember(new RelationMember("", createPrimitive("way no-rail-way=yes")));
+ assertEquals(1, testRelation(r).size());
+ assertEquals("Role member does not match expression railway in template Public Transport Route (Rail)",
+ testRelation(r).get(0).getDescription());
+
+ r.removeMember(3);
+ r.addMember(new RelationMember("stop", createPrimitive("way no-rail-way=yes")));
+ assertEquals(1, testRelation(r).size());
+ assertEquals("Role member type way does not match accepted list of node in template Public Transport Route (Rail)",
+ testRelation(r).get(0).getDescription());
+
+ r.removeMember(3);
+ r.addMember(new RelationMember("stop", createPrimitive("node public_transport=stop_position bus=yes")));
+ assertEquals(1, testRelation(r).size());
+ assertEquals("Role member does not match expression public_transport=stop_position && "+
+ "(train=yes || subway=yes || monorail=yes || tram=yes || light_rail=yes) in template Public Transport Route (Rail)",
+ testRelation(r).get(0).getDescription());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/SimilarNamedWaysTest.groovy b/test/unit/org/openstreetmap/josm/data/validation/tests/SimilarNamedWaysTest.groovy
deleted file mode 100644
index e2d285b..0000000
--- a/test/unit/org/openstreetmap/josm/data/validation/tests/SimilarNamedWaysTest.groovy
+++ /dev/null
@@ -1,107 +0,0 @@
-// License: GPL. See LICENSE file for details.
-package org.openstreetmap.josm.data.validation.tests
-
-import static org.junit.Assert.assertEquals
-
-import org.openstreetmap.josm.JOSMFixture
-import org.openstreetmap.josm.data.coor.LatLon
-import org.openstreetmap.josm.data.osm.DataSet
-import org.openstreetmap.josm.data.osm.Node
-import org.openstreetmap.josm.data.osm.Way
-import org.openstreetmap.josm.data.validation.TestError
-
-class SimilarNamedWaysTest extends GroovyTestCase {
-
- SimilarNamedWays test = new SimilarNamedWays()
-
- @Override
- void setUp() {
- JOSMFixture.createUnitTestFixture().init();
- }
-
- public static List<TestError> testWays(String namea, String nameb) {
- def ds = new DataSet()
-
- def n00 = new Node(LatLon.ZERO)
- def n10 = new Node(new LatLon(1, 0))
- def n20 = new Node(new LatLon(2, 0))
- def n30 = new Node(new LatLon(3, 0))
- def n40 = new Node(new LatLon(4, 0))
-
- ds.addPrimitive(n00)
- ds.addPrimitive(n10)
- ds.addPrimitive(n20)
- ds.addPrimitive(n30)
- ds.addPrimitive(n40)
-
- def waya = new Way()
- waya.addNode(n00)
- waya.addNode(n10)
- waya.addNode(n20)
- waya.put("name", namea)
- def wayb = new Way()
- wayb.addNode(n20)
- wayb.addNode(n30)
- wayb.addNode(n40)
- wayb.put("name", nameb)
-
- ds.addPrimitive(waya)
- ds.addPrimitive(wayb)
-
- assert waya.isUsable()
- assert wayb.isUsable()
-
- def t = new SimilarNamedWays()
- t.startTest(null)
- t.visit(waya)
- t.visit(wayb)
- return t.errors
- }
-
- void testCombinations() {
- assert testWays("Church Street", "Water Street").isEmpty()
- assert !testWays("Main Street", "Maim Street").isEmpty()
- assert !testWays("First Street", "Frist Street").isEmpty()
-
- assert testWays("1st Street", "2nd Street").isEmpty()
- assert testWays("First Avenue", "Second Avenue").isEmpty()
- assert testWays("West Main Street", "East Main Street").isEmpty()
- assert testWays("A Street", "B Street").isEmpty()
- }
-
- void checkSimilarity(String message, String name1, String name2, boolean expected) {
- boolean actual = test.similaryName(name1, name2);
- assertEquals(message, expected, actual);
- }
-
- void testSimilarNames() {
- checkSimilarity("same string", "Testname", "Testname", false);
- checkSimilarity("different case", "Testname", "TestName", true);
- checkSimilarity("typo", "Testname", "Testxame", true);
- checkSimilarity("missing char", "Testname", "Testame", true);
- checkSimilarity("additional char", "Testname", "Testxname", true);
- checkSimilarity("2 changes", "Testname", "Tostxname", true);
- checkSimilarity("3 changes", "Testname", "Tostxnam", false);
-
- // regular expression rule
- checkSimilarity("same number", "track 1", "track 1", false);
- checkSimilarity("different number", "track 1", "track 2", false);
- checkSimilarity("different number length", "track 9", "track 10", false);
- checkSimilarity("multiple numbers", "track 8 - 9", "track 10 - 11", false);
-
- checkSimilarity("1st and 2nd", "1st Street", "2nd Street", false);
- checkSimilarity("1st case", "1St Street", "1st Street", true);
- checkSimilarity("1st and 2nd case", "1St Street", "2nd Street", true);
- checkSimilarity("3rd and 4th", "2rd Street", "4th Street", false);
-
- // synonyms
- checkSimilarity("east and west", "East Foothill Drive", "West Foothill Drive", false);
- checkSimilarity("east and west case", "east Foothill Drive", "West Foothill Drive", true);
- checkSimilarity("first and second", "First Street", "Second Street", false);
- checkSimilarity("first and second case", "First Street", "second Street", true);
- checkSimilarity("first and second typo", "Forst Street", "Second Street", true);
- checkSimilarity("first and second typo2", "First Street", "Socond Street", true);
- checkSimilarity("first and second 2 changes", "First Street", "Soconds Street", true);
- checkSimilarity("first and second 3 changes", "First Street", "Soconds Stret", false);
- }
-}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/SimilarNamedWaysTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/SimilarNamedWaysTest.java
new file mode 100644
index 0000000..9bd2472
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/SimilarNamedWaysTest.java
@@ -0,0 +1,121 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.validation.TestError;
+
+/**
+ * Unit test of {@link SimilarNamedWays}
+ */
+public class SimilarNamedWaysTest {
+
+ private final SimilarNamedWays test = new SimilarNamedWays();
+
+ /**
+ * Setup test
+ */
+ @Before
+ public void setUp() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ private static List<TestError> testWays(String namea, String nameb) {
+ DataSet ds = new DataSet();
+
+ Node n00 = new Node(LatLon.ZERO);
+ Node n10 = new Node(new LatLon(1, 0));
+ Node n20 = new Node(new LatLon(2, 0));
+ Node n30 = new Node(new LatLon(3, 0));
+ Node n40 = new Node(new LatLon(4, 0));
+
+ ds.addPrimitive(n00);
+ ds.addPrimitive(n10);
+ ds.addPrimitive(n20);
+ ds.addPrimitive(n30);
+ ds.addPrimitive(n40);
+
+ Way waya = new Way();
+ waya.addNode(n00);
+ waya.addNode(n10);
+ waya.addNode(n20);
+ waya.put("name", namea);
+ Way wayb = new Way();
+ wayb.addNode(n20);
+ wayb.addNode(n30);
+ wayb.addNode(n40);
+ wayb.put("name", nameb);
+
+ ds.addPrimitive(waya);
+ ds.addPrimitive(wayb);
+
+ assertTrue(waya.isUsable());
+ assertTrue(wayb.isUsable());
+
+ SimilarNamedWays t = new SimilarNamedWays();
+ t.startTest(null);
+ t.visit(waya);
+ t.visit(wayb);
+ return t.getErrors();
+ }
+
+ @Test
+ public void testCombinations() {
+ assertTrue(testWays("Church Street", "Water Street").isEmpty());
+ assertFalse(testWays("Main Street", "Maim Street").isEmpty());
+ assertFalse(testWays("First Street", "Frist Street").isEmpty());
+
+ assertTrue(testWays("1st Street", "2nd Street").isEmpty());
+ assertTrue(testWays("First Avenue", "Second Avenue").isEmpty());
+ assertTrue(testWays("West Main Street", "East Main Street").isEmpty());
+ assertTrue(testWays("A Street", "B Street").isEmpty());
+ }
+
+ private void checkSimilarity(String message, String name1, String name2, boolean expected) {
+ boolean actual = test.similaryName(name1, name2);
+ assertEquals(message, expected, actual);
+ }
+
+ @Test
+ public void testSimilarNames() {
+ checkSimilarity("same string", "Testname", "Testname", false);
+ checkSimilarity("different case", "Testname", "TestName", true);
+ checkSimilarity("typo", "Testname", "Testxame", true);
+ checkSimilarity("missing char", "Testname", "Testame", true);
+ checkSimilarity("additional char", "Testname", "Testxname", true);
+ checkSimilarity("2 changes", "Testname", "Tostxname", true);
+ checkSimilarity("3 changes", "Testname", "Tostxnam", false);
+
+ // regular expression rule
+ checkSimilarity("same number", "track 1", "track 1", false);
+ checkSimilarity("different number", "track 1", "track 2", false);
+ checkSimilarity("different number length", "track 9", "track 10", false);
+ checkSimilarity("multiple numbers", "track 8 - 9", "track 10 - 11", false);
+
+ checkSimilarity("1st and 2nd", "1st Street", "2nd Street", false);
+ checkSimilarity("1st case", "1St Street", "1st Street", true);
+ checkSimilarity("1st and 2nd case", "1St Street", "2nd Street", true);
+ checkSimilarity("3rd and 4th", "2rd Street", "4th Street", false);
+
+ // synonyms
+ checkSimilarity("east and west", "East Foothill Drive", "West Foothill Drive", false);
+ checkSimilarity("east and west case", "east Foothill Drive", "West Foothill Drive", true);
+ checkSimilarity("first and second", "First Street", "Second Street", false);
+ checkSimilarity("first and second case", "First Street", "second Street", true);
+ checkSimilarity("first and second typo", "Forst Street", "Second Street", true);
+ checkSimilarity("first and second typo2", "First Street", "Socond Street", true);
+ checkSimilarity("first and second 2 changes", "First Street", "Soconds Street", true);
+ checkSimilarity("first and second 3 changes", "First Street", "Soconds Stret", false);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java b/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java
index 5ba61ae..324d0a2 100644
--- a/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java
@@ -8,12 +8,10 @@ import static org.junit.Assert.assertNull;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collection;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
import org.junit.BeforeClass;
import org.junit.Test;
import org.openstreetmap.josm.JOSMFixture;
@@ -25,6 +23,8 @@ import org.openstreetmap.josm.plugins.PluginInformation;
import org.openstreetmap.josm.plugins.PluginListParseException;
import org.openstreetmap.josm.plugins.PluginListParser;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
/**
* Unit tests of {@link MainApplication} class.
*/
@@ -38,6 +38,7 @@ public class MainApplicationTest {
JOSMFixture.createUnitTestFixture().init(true);
}
+ @SuppressFBWarnings(value = "DM_DEFAULT_ENCODING")
private void testShow(final String arg, String expected) throws InterruptedException, IOException {
PrintStream old = System.out;
try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
@@ -48,10 +49,10 @@ public class MainApplicationTest {
MainApplication.main(new String[] {arg});
}
};
- t.run();
+ t.start();
t.join();
System.out.flush();
- assertEquals(expected, baos.toString().trim());
+ assertEquals(expected, baos.toString(StandardCharsets.UTF_8.name()).trim());
} finally {
System.setOut(old);
}
@@ -84,11 +85,8 @@ public class MainApplicationTest {
final String old = System.getProperty("josm.plugins");
try {
System.setProperty("josm.plugins", "buildings_tools,plastic_laf");
- SplashProgressMonitor monitor = new SplashProgressMonitor("foo", new ChangeListener() {
- @Override
- public void stateChanged(ChangeEvent e) {
- // Do nothing
- }
+ SplashProgressMonitor monitor = new SplashProgressMonitor("foo", e -> {
+ // Do nothing
});
Collection<PluginInformation> plugins = MainApplication.updateAndLoadEarlyPlugins(null, monitor);
if (plugins.isEmpty()) {
diff --git a/test/unit/org/openstreetmap/josm/gui/NavigatableComponentTest.java b/test/unit/org/openstreetmap/josm/gui/NavigatableComponentTest.java
index 594f542..d023d7c 100644
--- a/test/unit/org/openstreetmap/josm/gui/NavigatableComponentTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/NavigatableComponentTest.java
@@ -31,7 +31,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
*/
public class NavigatableComponentTest {
- private final class NavigatableComponentMock extends NavigatableComponent {
+ private static final class NavigatableComponentMock extends NavigatableComponent {
@Override
public Point getLocationOnScreen() {
return new Point(30, 40);
diff --git a/test/unit/org/openstreetmap/josm/gui/datatransfer/importers/OsmLinkPasterTest.java b/test/unit/org/openstreetmap/josm/gui/datatransfer/importers/OsmLinkPasterTest.java
index 09ecf57..941b4ab 100644
--- a/test/unit/org/openstreetmap/josm/gui/datatransfer/importers/OsmLinkPasterTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/datatransfer/importers/OsmLinkPasterTest.java
@@ -1,12 +1,12 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.datatransfer.importers;
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import org.junit.Rule;
import org.junit.Test;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -24,26 +24,13 @@ public class OsmLinkPasterTest {
public JOSMTestRules test = new JOSMTestRules();
/**
- * Test of {@link OsmLinkPaster#parseIds(String)}
+ * Test of {@link OsmLinkPaster#parseLatLon(String)}
*/
@Test
- public void testParseIds() {
- assertArrayEquals(new Object[] {new SimplePrimitiveId(1234, OsmPrimitiveType.NODE) },
- OsmLinkPaster.parseIds("http://www.openstreetmap.org/node/1234").toArray());
- assertArrayEquals(new Object[] {new SimplePrimitiveId(1234, OsmPrimitiveType.WAY) },
- OsmLinkPaster.parseIds("http://www.openstreetmap.org/way/1234").toArray());
- assertArrayEquals(new Object[] {new SimplePrimitiveId(1234, OsmPrimitiveType.RELATION) },
- OsmLinkPaster.parseIds("http://www.openstreetmap.org/relation/1234").toArray());
-
- assertArrayEquals(new Object[] {new SimplePrimitiveId(1234, OsmPrimitiveType.NODE) },
- OsmLinkPaster.parseIds("http://www.osm.org/node/1234").toArray());
- assertArrayEquals(new Object[] {new SimplePrimitiveId(1234, OsmPrimitiveType.WAY) },
- OsmLinkPaster.parseIds("http://osm.org/way/1234").toArray());
- assertArrayEquals(new Object[] {new SimplePrimitiveId(1234, OsmPrimitiveType.RELATION) },
- OsmLinkPaster.parseIds("https://www.openstreetmap.org/relation/1234").toArray());
-
- assertArrayEquals(new Object[0], OsmLinkPaster.parseIds("http://www.openstreetmap.org/xx/1234").toArray());
- assertArrayEquals(new Object[0], OsmLinkPaster.parseIds("http://www.openstreetmap.org/way/1234x").toArray());
- assertArrayEquals(new Object[0], OsmLinkPaster.parseIds("").toArray());
+ public void testParseLatLon() {
+ assertEquals(new LatLon(51.71873, 8.76164),
+ OsmLinkPaster.parseLatLon("https://www.openstreetmap.org/#map=17/51.71873/8.76164"));
+ assertNull(OsmLinkPaster.parseLatLon("http://www.openstreetmap.org/"));
+ assertNull(OsmLinkPaster.parseLatLon("foo-bar"));
}
}
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java
index 0ec8804..0056f12 100644
--- a/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java
@@ -22,6 +22,7 @@ import org.openstreetmap.josm.TestUtils;
import org.openstreetmap.josm.data.gpx.GpxData;
import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.projection.Projections;
import org.openstreetmap.josm.gui.widgets.HtmlPanel;
import org.openstreetmap.josm.io.GpxReaderTest;
@@ -191,6 +192,14 @@ public class GpxLayerTest {
}
/**
+ * Test that {@link GpxLayer#mergeFrom} throws IAE for invalid arguments
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testMergeFromIAE() {
+ new GpxLayer(new GpxData()).mergeFrom(new OsmDataLayer(new DataSet(), "", null));
+ }
+
+ /**
* Unit test of {@link GpxLayer#paint}.
* @throws Exception if any error occurs
*/
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java
index 6921f02..a50f849 100644
--- a/test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java
@@ -42,7 +42,7 @@ public class MainLayerManagerTest extends LayerManagerTest {
}
}
- protected class AbstractTestOsmLayer extends OsmDataLayer {
+ protected static class AbstractTestOsmLayer extends OsmDataLayer {
public AbstractTestOsmLayer() {
super(new DataSet(), "OSM layer", null);
}
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java
index 52c5618..a08bb52 100644
--- a/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java
@@ -3,7 +3,6 @@ package org.openstreetmap.josm.gui.layer;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -191,13 +190,11 @@ public class OsmDataLayerTest {
@Test
public void testGetMenuEntries() {
OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
- boolean mode = ExpertToggleAction.isExpert();
- ExpertToggleAction.getInstance().actionPerformed(null);
- assertNotEquals(mode, ExpertToggleAction.isExpert());
- assertEquals(ExpertToggleAction.isExpert() ? 16 : 13, layer.getMenuEntries().length);
- ExpertToggleAction.getInstance().actionPerformed(null);
- assertEquals(mode, ExpertToggleAction.isExpert());
- assertEquals(ExpertToggleAction.isExpert() ? 16 : 13, layer.getMenuEntries().length);
+ ExpertToggleAction.getInstance().setExpert(true);
+ assertEquals(16, layer.getMenuEntries().length);
+
+ ExpertToggleAction.getInstance().setExpert(false);
+ assertEquals(13, layer.getMenuEntries().length);
}
/**
@@ -261,4 +258,19 @@ public class OsmDataLayerTest {
assertEquals("Data Layer 147", layer1.getName());
assertEquals("Data Layer 148", layer2.getName());
}
+
+ @Test
+ public void testLayerUnnumberedName() {
+ final OsmDataLayer layer = new OsmDataLayer(new DataSet(), "Data Layer ", null);
+ assertEquals("Data Layer ", layer.getName());
+ }
+
+ /**
+ * Non-regression test for ticket #13985
+ */
+ @Test
+ public void testLayerNameDoesFinish() {
+ final OsmDataLayer layer = new OsmDataLayer(new DataSet(), "Data Layer from GeoJSON: foo.geojson", null);
+ assertEquals("Data Layer from GeoJSON: foo.geojson", layer.getName());
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java
index eb90cac..ac189b7 100644
--- a/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java
@@ -13,7 +13,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer.Loader;
import org.openstreetmap.josm.io.GpxReader;
import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -56,4 +58,12 @@ public class GeoImageLayerTest {
assertEquals("<html>1 image loaded. 0 were found to be GPS tagged.</html>", layer.getToolTipText());
}
}
+
+ /**
+ * Test that {@link GeoImageLayer#mergeFrom} throws IAE for invalid arguments
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testMergeFromIAE() {
+ new GeoImageLayer(null, null).mergeFrom(new OsmDataLayer(new DataSet(), "", null));
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java b/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java
index 17bdae2..6c2431a 100644
--- a/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java
+++ b/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java
@@ -19,7 +19,6 @@ import java.security.cert.X509Certificate;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
@@ -29,6 +28,8 @@ import org.junit.Test;
import org.openstreetmap.josm.JOSMFixture;
import org.openstreetmap.josm.Main;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
/**
* Unit tests for Remote Control
*/
@@ -76,15 +77,18 @@ public class RemoteControlTest {
TrustManager[] trustAllCerts = new TrustManager[] {
new X509TrustManager() {
@Override
+ @SuppressFBWarnings(value = "WEAK_TRUST_MANAGER")
public X509Certificate[] getAcceptedIssuers() {
return new X509Certificate[0];
}
@Override
+ @SuppressFBWarnings(value = "WEAK_TRUST_MANAGER")
public void checkClientTrusted(X509Certificate[] certs, String authType) {
}
@Override
+ @SuppressFBWarnings(value = "WEAK_TRUST_MANAGER")
public void checkServerTrusted(X509Certificate[] certs, String authType) {
}
}
@@ -96,12 +100,7 @@ public class RemoteControlTest {
HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
// Create all-trusting host name verifier
- HostnameVerifier allHostsValid = new HostnameVerifier() {
- @Override
- public boolean verify(String hostname, SSLSession session) {
- return true;
- }
- };
+ HostnameVerifier allHostsValid = (hostname, session) -> true;
// Install the all-trusting host verifier
HttpsURLConnection.setDefaultHostnameVerifier(allHostsValid);
diff --git a/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java b/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java
index 87bf617..8a1de4e 100644
--- a/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java
+++ b/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java
@@ -42,7 +42,7 @@ public class SessionReaderTest {
private List<Layer> testRead(String sessionFileName) throws IOException, IllegalDataException {
boolean zip = sessionFileName.endsWith(".joz");
- File file = new File(getSessionDataDir()+"/"+sessionFileName);
+ File file = new File(getSessionDataDir(), sessionFileName);
SessionReader reader = new SessionReader();
reader.loadSession(file, zip, null);
return reader.getLayers();
diff --git a/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java b/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
index 3f31fea..82c780c 100644
--- a/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
+++ b/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
@@ -34,7 +34,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
* @author Michael Zangl
*/
public class JOSMTestRules implements TestRule {
- private int timeout = 10 * 1000;
+ private int timeout = isDebugMode() ? -1 : 10 * 1000;
private TemporaryFolder josmHome;
private boolean usePreferences = false;
private APIType useAPI = APIType.NONE;
@@ -59,7 +59,7 @@ public class JOSMTestRules implements TestRule {
* @return this instance, for easy chaining
*/
public JOSMTestRules timeout(int millis) {
- timeout = millis;
+ timeout = isDebugMode() ? -1 : millis;
return this;
}
@@ -352,4 +352,9 @@ public class JOSMTestRules implements TestRule {
}
}
}
+
+ private boolean isDebugMode() {
+ return java.lang.management.ManagementFactory.getRuntimeMXBean().
+ getInputArguments().toString().indexOf("-agentlib:jdwp") > 0;
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/tools/AlphanumComparatorTest.groovy b/test/unit/org/openstreetmap/josm/tools/AlphanumComparatorTest.groovy
deleted file mode 100644
index a88a86b..0000000
--- a/test/unit/org/openstreetmap/josm/tools/AlphanumComparatorTest.groovy
+++ /dev/null
@@ -1,18 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.tools
-
-class AlphanumComparatorTest extends GroovyTestCase {
-
- void testNumeric() {
- def lst = Arrays.asList("1", "20", "-1", "00999", "100")
- Collections.sort(lst, AlphanumComparator.getInstance())
- assert lst == Arrays.asList("-1", "1", "20", "100", "00999")
- }
-
- void testMixed() {
- def lst = Arrays.asList("b1", "b20", "a5", "a00999", "a100")
- Collections.sort(lst, AlphanumComparator.getInstance())
- assert lst == Arrays.asList("a5", "a100", "a00999", "b1", "b20")
- }
-
-}
diff --git a/test/unit/org/openstreetmap/josm/tools/AlphanumComparatorTest.java b/test/unit/org/openstreetmap/josm/tools/AlphanumComparatorTest.java
new file mode 100644
index 0000000..c7745f3
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/tools/AlphanumComparatorTest.java
@@ -0,0 +1,36 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+/**
+ * Unit tests of {@link AlphanumComparator}.
+ */
+public class AlphanumComparatorTest {
+
+ /**
+ * Test numeric strings.
+ */
+ @Test
+ public void testNumeric() {
+ List<String> lst = Arrays.asList("1", "20", "-1", "00999", "100");
+ Collections.sort(lst, AlphanumComparator.getInstance());
+ assertEquals(Arrays.asList("-1", "1", "20", "100", "00999"), lst);
+ }
+
+ /**
+ * Test mixed character strings.
+ */
+ @Test
+ public void testMixed() {
+ List<String> lst = Arrays.asList("b1", "b20", "a5", "a00999", "a100");
+ Collections.sort(lst, AlphanumComparator.getInstance());
+ assertEquals(Arrays.asList("a5", "a100", "a00999", "b1", "b20"), lst);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/tools/I18nTest.groovy b/test/unit/org/openstreetmap/josm/tools/I18nTest.groovy
deleted file mode 100644
index 96c5bd5..0000000
--- a/test/unit/org/openstreetmap/josm/tools/I18nTest.groovy
+++ /dev/null
@@ -1,10 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.tools
-
-class I18nTest extends GroovyTestCase {
- void testEscape() {
- def foobar = "{foo'bar}"
- assert I18n.escape(foobar) == "'{'foo''bar'}'"
- assert I18n.tr(I18n.escape(foobar)) == foobar
- }
-}
diff --git a/test/unit/org/openstreetmap/josm/tools/I18nTest.java b/test/unit/org/openstreetmap/josm/tools/I18nTest.java
new file mode 100644
index 0000000..e703705
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/tools/I18nTest.java
@@ -0,0 +1,22 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+/**
+ * Unit tests of {@link I18n}.
+ */
+public class I18nTest {
+
+ /**
+ * Unit test of {@link I18n#escape}.
+ */
+ @Test
+ public void testEscape() {
+ String foobar = "{foo'bar}";
+ assertEquals("'{'foo''bar'}'", I18n.escape(foobar));
+ assertEquals(foobar, I18n.tr(I18n.escape(foobar)));
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/tools/LoggingTest.java b/test/unit/org/openstreetmap/josm/tools/LoggingTest.java
index 22c8c4c..4ba9879 100644
--- a/test/unit/org/openstreetmap/josm/tools/LoggingTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/LoggingTest.java
@@ -4,6 +4,7 @@ package org.openstreetmap.josm.tools;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -17,6 +18,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
/**
* @author michael
*
@@ -72,11 +75,13 @@ public class LoggingTest {
testLogCaptured(level, result -> assertEquals(expected, result), printMessage);
}
+ @SuppressFBWarnings(value = "NP_NONNULL_PARAM_VIOLATION")
private void testLogCaptured(Level level, Consumer<String> expectedTester, Runnable printMessage) {
Logging.setLogLevel(level);
captured = null;
printMessage.run();
+ assertNotNull(captured);
expectedTester.accept(captured.getMessage());
assertEquals(level, captured.getLevel());
diff --git a/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java b/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java
index 9ecf4a2..91fca72 100644
--- a/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java
@@ -2,19 +2,44 @@
package org.openstreetmap.josm.tools;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
/**
* Unit tests of {@link OsmUrlToBounds} class.
*/
public class OsmUrlToBoundsTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Test for {@link OsmUrlToBounds#positionToBounds}.
+ */
+ @Test
+ public void testPositionToBounds() {
+ Assert.assertEquals(new Bounds(51.7167359,8.7573485,51.720724,8.7659315),
+ OsmUrlToBounds.positionToBounds(51.71873, 8.76164, 17));
+ Assert.assertEquals(new Bounds(40.8609329,-75.7523458,40.8633671,-75.7480542),
+ OsmUrlToBounds.positionToBounds(40.86215, -75.75020, 18));
+ }
+
/**
* data for {@link #testParse}
*/
private static final ParseTestItem[] parseTestData = {
new ParseTestItem("https://www.openstreetmap.org", null),
+ new ParseTestItem("geo:12.34,56.78?z=9",
+ OsmUrlToBounds.positionToBounds(12.34, 56.78, 9)),
new ParseTestItem("https://www.openstreetmap.org/?bbox=-0.489,51.28,0.236,51.686",
new Bounds(51.28, -0.489, 51.686, 0.236)),
new ParseTestItem("https://www.openstreetmap.org/?minlon=-0.489&minlat=51.28&maxlon=0.236&maxlat=51.686",
@@ -76,4 +101,14 @@ public class OsmUrlToBoundsTest {
Assert.assertEquals(item.url, item.bounds, bounds);
}
}
+
+ /**
+ * Test for {@link OsmUrlToBounds#getZoom}.
+ */
+ @Test
+ public void testGetZoom() {
+ Assert.assertEquals(4, OsmUrlToBounds.getZoom(OsmUrlToBounds.positionToBounds(0, 0, 4)));
+ Assert.assertEquals(10, OsmUrlToBounds.getZoom(OsmUrlToBounds.positionToBounds(5, 5, 10)));
+ Assert.assertEquals(18, OsmUrlToBounds.getZoom(OsmUrlToBounds.positionToBounds(40, 20, 18)));
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/tools/RightAndLefthandTrafficTest.java b/test/unit/org/openstreetmap/josm/tools/RightAndLefthandTrafficTest.java
new file mode 100644
index 0000000..8bb833e
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/tools/RightAndLefthandTrafficTest.java
@@ -0,0 +1,126 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import static org.junit.Assert.fail;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link RightAndLefthandTraffic} class.
+ */
+public class RightAndLefthandTrafficTest {
+ /**
+ * Test rules.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules rules = new JOSMTestRules().platform().projection().commands();
+
+ /**
+ * Test of {@link RightAndLefthandTraffic#isRightHandTraffic} method.
+ */
+ @Test
+ public void testIsRightHandTraffic() {
+ check(true, "Paris", 48.8567, 2.3508);
+ check(true, "Berlin", 52.5167, 13.383);
+ check(true, "New York", 40.7127, -74.0059);
+ check(true, "Papeete", -17.5419, -149.5617);
+ check(true, "Guantanamo", 19.912, -75.209);
+ check(true, "Guadeloupe", 16.243, -61.533);
+ check(true, "Martinique", 14.604, -61.069);
+ check(true, "Madagascar", -20.119, 46.316);
+ check(true, "Shangai", 31.196, 121.36);
+ check(true, "Gibraltar", 36.141244, -5.347369);
+ check(true, "British Indian Ocean Territory", -7.3, 72.4);
+
+ check(false, "London", 51.507222, -0.1275);
+ check(false, "Valetta (Malta)", 35.897778, 14.5125);
+ check(false, "Jersey", 49.19, -2.11);
+ check(false, "Isle of Man", 54.25, -4.5);
+ check(false, "Dublin (Ireland)", 53.347778, -6.259722);
+ check(false, "Guernsey", 49.45, -2.6);
+ check(false, "Nicosia (Cyprus)", 35.166667, 33.366667);
+ check(false, "Georgetown (Guyana)", 6.8, -58.166667);
+ check(false, "Paramaribo (Suriname)", 5.866667, -55.166667);
+ check(false, "Anguilla", 18.22723, -63.04899);
+ check(false, "Antigua and Barbuda", 17.05, -61.8);
+ check(false, "Bahamas", 24.25, -76);
+ check(false, "Barbados", 13.166667, -59.55);
+ check(false, "British Virgin Islands", 18.5, -64.5);
+ check(false, "Cayman Islands", 19.5, -80.5);
+ check(false, "Dominica", 15.416667, -61.333333);
+ check(false, "Grenada", 12.116667, -61.666667);
+ check(false, "Jamaica", 18, -77);
+ check(false, "Montserrat", 16.75, -62.2);
+ check(false, "Saint Kitts and Nevis", 17.333333, -62.75);
+ check(false, "Saint Lucia", 13.883333, -60.966667);
+ check(false, "Saint Vincent and the Grenadines", 13.25, -61.2);
+ check(false, "Trinidad and Tobago", 11.249285, -60.652557);
+ check(false, "Turks and Caicos Islands", 21.75, -71.583333);
+ check(false, "United States Virgin Islands", 18.35, -64.933333);
+ check(false, "Bermuda", 32.333333, -64.75);
+ check(false, "Falkland Islands", -51.683333, -59.166667);
+ check(false, "Saint Helena, Ascension and Tristan da Cunha", -15.933, -5.717);
+ check(false, "South Georgia and the South Sandwich Islands", -54.25, -36.75);
+ check(false, "Maldives", 3.2, 73.22);
+ check(false, "Mauritius", -20.2, 57.5);
+ check(false, "Seychelles", -4.583333, 55.666667);
+ check(false, "Bangladesh", 23.8, 90.3);
+ check(false, "Bhutan", 27.417, 90.435);
+ check(false, "Brunei", 4.5, 114.666667);
+ check(false, "East Timor", -8.833333, 125.916667);
+ check(false, "Hong Kong", 22.3, 114.2);
+ check(false, "Indonesia", -5, 120);
+ check(false, "India", 21, 78);
+ check(false, "Japan", 35, 136);
+ check(false, "Macau", 22.166667, 113.55);
+ check(false, "Malaysia", 2.5, 112.5);
+ check(false, "Nepal", 28.166667, 84.25);
+ check(false, "Pakistan", 30, 70);
+ check(false, "Singapore", 1.3, 103.8);
+ check(false, "Sri Lanka", 7, 81);
+ check(false, "Thailand", 15.4, 101.3);
+ check(false, "Botswana", -24.658333, 25.908333);
+ check(false, "Kenya", 1, 38);
+ check(false, "Lesotho", -29.6, 28.3);
+ check(false, "Malawi", -13.5, 34);
+ check(false, "Mauritius", -20.2, 57.5);
+ check(false, "Mozambique", -18.25, 35);
+ check(false, "Namibia", -22, 17);
+ check(false, "South Africa", -30, 25);
+ check(false, "Swaziland", -26.5, 31.5);
+ check(false, "Tanzania", -6.307, 34.854);
+ check(false, "Uganda", 1, 32);
+ check(false, "Zambia", -15, 30);
+ check(false, "Zimbabwe", -20, 30);
+ check(false, "Australia", -27, 133);
+ check(false, "Christmas Island", -10.483333, 105.633333);
+ check(false, "Cocos (Keeling) Islands", -12.116667, 96.9);
+ check(false, "Cook Islands", -21.233333, -159.766667);
+ check(false, "Fiji", -18, 179);
+ check(false, "Kiribati", 1.416667, 173);
+ check(false, "Nauru", -0.533333, 166.933333);
+ check(false, "New Zealand", -42, 174);
+ check(false, "Niue", -19.05, -169.916667);
+ check(false, "Norfolk Island", -29.033333, 167.95);
+ check(false, "Papua New Guinea", -6, 147);
+ check(false, "Pitcairn Islands", -25.066667, -130.1);
+ check(false, "Solomon Islands", -8, 159);
+ check(false, "Samoa", -13.583333, -172.333333);
+ check(false, "Tokelau", -9.166667, -171.833333);
+ check(false, "Tonga", -20, -175);
+ check(false, "Tuvalu", -8, 178);
+ }
+
+ private static void check(boolean expected, String name, double lat, double lon) {
+ boolean actual = RightAndLefthandTraffic.isRightHandTraffic(new LatLon(lat, lon));
+ if (actual != expected) {
+ fail(name);
+ }
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/tools/TerritoriesTest.java b/test/unit/org/openstreetmap/josm/tools/TerritoriesTest.java
new file mode 100644
index 0000000..7ade6f7
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/tools/TerritoriesTest.java
@@ -0,0 +1,37 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link Territories} class.
+ */
+public class TerritoriesTest {
+ /**
+ * Test rules.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules rules = new JOSMTestRules().platform().projection().commands();
+
+ /**
+ * Test of {@link Territories#getIso3166Codes} method.
+ */
+ @Test
+ public void testGetIso3166Codes() {
+ check("Paris", new LatLon(48.8567, 2.3508), "EU", "FR", "FX");
+ }
+
+ private static void check(String name, LatLon ll, String ... expectedCodes) {
+ for (String e : expectedCodes) {
+ assertTrue(name + " " + e, Territories.isIso3166Code(e, ll));
+ }
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/tools/UtilsTest.java b/test/unit/org/openstreetmap/josm/tools/UtilsTest.java
index eaba1ff..3945a13 100644
--- a/test/unit/org/openstreetmap/josm/tools/UtilsTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/UtilsTest.java
@@ -3,15 +3,19 @@ package org.openstreetmap.josm.tools;
import static org.junit.Assert.assertEquals;
+import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.testutils.JOSMTestRules;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
/**
* Unit tests of {@link Utils} class.
*/
@@ -19,6 +23,8 @@ public class UtilsTest {
/**
* Use default, basic test rules.
*/
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
public JOSMTestRules rules = new JOSMTestRules();
/**
@@ -159,4 +165,13 @@ public class UtilsTest {
assertEquals("<ul><li>1</li><li>2</li></ul>", Utils.joinAsHtmlUnorderedList(items));
assertEquals("<ul></ul>", Utils.joinAsHtmlUnorderedList(Collections.emptyList()));
}
+
+ /**
+ * Tests if readBytesFromStream handles null streams (might happen when there is no data on error stream)
+ * @throws IOException in case of I/O error
+ */
+ @Test
+ public void testNullStreamForReadBytesFromStream() throws IOException {
+ assertEquals("Empty on null stream", 0, Utils.readBytesFromStream(null).length);
+ }
}
diff --git a/tools/findbugs/josm-filter.xml b/tools/findbugs/josm-filter.xml
index fcf3612..629a76d 100644
--- a/tools/findbugs/josm-filter.xml
+++ b/tools/findbugs/josm-filter.xml
@@ -1,6 +1,28 @@
<FindBugsFilter>
<Match>
+ <Bug pattern="DM_EXIT" />
+ </Match>
+ <Match>
+ <Bug pattern="DMI_HARDCODED_ABSOLUTE_FILENAME" />
+ </Match>
+ <Match>
+ <Bug pattern="EQ_DOESNT_OVERRIDE_EQUALS" />
+ </Match>
+ <Match>
+ <Bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE" />
+ </Match>
+ <Match>
+ <Bug pattern="SE_BAD_FIELD" />
+ </Match>
+ <Match>
+ <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED" />
+ </Match>
+ <Match>
+ <Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" />
+ </Match>
+
+ <Match>
<Class name="~com.*" />
</Match>
<Match>
--
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